Fixed cmake install directories (Closes: #880389)
Thanks Andreas Beckmann <anbe@debian.org> for spotting this. Removed superflous whitespaces from changelog
This commit is contained in:
parent
914a21ece4
commit
12afdf6fc7
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,3 +1,11 @@
|
||||
qtermwidget (0.8.0-2) experimental; urgency=medium
|
||||
|
||||
* Fixed cmake install directories (Closes: #880389)
|
||||
Thanks Andreas Beckmann <anbe@debian.org> for spotting this.
|
||||
* Removed superflous whitespaces from changelog
|
||||
|
||||
-- Alf Gaida <agaida@siduction.org> Tue, 31 Oct 2017 15:18:42 +0100
|
||||
|
||||
qtermwidget (0.8.0-1) experimental; urgency=medium
|
||||
|
||||
* Cherry-picking upstream release 0.8.0.
|
||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 10),
|
||||
lxqt-build-tools (>= 0.4.0),
|
||||
qtbase5-dev
|
||||
Standards-Version: 4.1.1
|
||||
Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/qtermwidget.git/?h=debian/experimental
|
||||
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/qtermwidget.git/?h=debian/experimental
|
||||
Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/qtermwidget.git -b debian/experimental
|
||||
Homepage: https://github.com/lxde/qtermwidget
|
||||
|
||||
|
4
debian/libqtermwidget5-0-dev.install
vendored
4
debian/libqtermwidget5-0-dev.install
vendored
@ -3,5 +3,5 @@ usr/include
|
||||
usr/lib/*/libqtermwidget5.so
|
||||
usr/lib/*/pkgconfig/qtermwidget5.pc
|
||||
|
||||
usr/share/cmake/qtermwidget5/*.cmake
|
||||
|
||||
#usr/share/cmake/qtermwidget5/*.cmake
|
||||
usr/lib/*/cmake/qtermwidget5/*.cmake
|
||||
|
33
debian/patches/fix-cmake-installdir.patch
vendored
Normal file
33
debian/patches/fix-cmake-installdir.patch
vendored
Normal file
@ -0,0 +1,33 @@
|
||||
Description: Install cmake files arch-dependend
|
||||
That will prevent file conflicts described at #880389
|
||||
Author: Alf Gaida <agaida@siduction.org>
|
||||
|
||||
Last-Update: 2017-10-31
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -213,13 +213,13 @@
|
||||
|
||||
install(FILES
|
||||
"${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-config-version.cmake"
|
||||
- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
||||
install(EXPORT
|
||||
"${QTERMWIDGET_LIBRARY_NAME}-targets"
|
||||
- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
||||
@@ -263,7 +263,7 @@
|
||||
|
||||
install(FILES
|
||||
"${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-config.cmake"
|
||||
- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${QTERMWIDGET_LIBRARY_NAME}"
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
1
debian/patches/series
vendored
Normal file
1
debian/patches/series
vendored
Normal file
@ -0,0 +1 @@
|
||||
fix-cmake-installdir.patch
|
Loading…
x
Reference in New Issue
Block a user