Lubuntu/qtermwidget-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cmake install directories (Closes: #880389)

Browse Source 
Thanks Andreas Beckmann <anbe@debian.org> for spotting this.
Removed superflous whitespaces from changelog
This commit is contained in:
Alf Gaida 2017-10-31 15:34:10 +01:00
parent 914a21ece4
commit 12afdf6fc7
5 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
debian/changelog vendored
View File

@ -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.
@ -11,14 +19,14 @@ qtermwidget (0.8.0-1) experimental; urgency=medium
qtermwidget (0.7.1-7) unstable; urgency=medium
* Fixed symbols for powerpcspe
* Fixed symbols for powerpcspe
-- Alf Gaida <agaida@siduction.org> Sun, 24 Sep 2017 14:05:24 +0200
qtermwidget (0.7.1-6) unstable; urgency=medium
* Fixed symbols for all but powerpcspe - missed build deps and
i don't want to guess.
i don't want to guess.
-- Alf Gaida <agaida@siduction.org> Tue, 05 Sep 2017 23:56:54 +0200
@ -28,7 +36,7 @@ qtermwidget (0.7.1-5) unstable; urgency=medium
(currently fixed amd64 and i386) (Closes: #874187)
Thanks Adrian Bunk for spotting this.
* bumped Standards to 4.1.0 - no changes needed
* fix some colons and not needed versions in d/control
* fix some colons and not needed versions in d/control
-- Alf Gaida <agaida@siduction.org> Tue, 05 Sep 2017 16:55:18 +0200
@ -58,7 +66,7 @@ qtermwidget (0.7.1-2) unstable; urgency=medium
qtermwidget (0.7.1-1) unstable; urgency=medium
* Cherry-picking upstream release 0.7.1.
* Cherry-picking upstream release 0.7.1.
* Fixed Symbols
* Removed build dependency liblxqt0-dev
* Activate new UTF8 processing in rules
@ -76,7 +84,7 @@ qtermwidget (0.7.0-4) unstable; urgency=medium
- qtermwidget5-data marked as Multi-Arch: foreign
- libqtermwidget5-0 marked as Multi-Arch: same
- libqtermwidget5-0-dev marked as Multi-Arch: same
* Simplified optional symbols
* Simplified optional symbols
-- Alf Gaida <agaida@siduction.org> Tue, 18 Oct 2016 21:16:57 +0200
@ -111,7 +119,7 @@ qtermwidget (0.6.0+20160108-6) unstable; urgency=medium
qtermwidget (0.6.0+20160108-5) unstable; urgency=medium
* Rework some symbols
* Rework some symbols
-- Alf Gaida <agaida@siduction.org> Sat, 14 May 2016 02:01:05 +0200
@ -123,7 +131,7 @@ qtermwidget (0.6.0+20160108-4) unstable; urgency=medium
qtermwidget (0.6.0+20160108-3) unstable; urgency=medium
* Fixed symbols for -03, thanks vorlon (Closes: #819225)
* Fixed symbols for -03, thanks vorlon (Closes: #819225)
* Bump standards to 3.9.7
* Use secured VCS-links
* Added hardening =+ all to rules
@ -171,7 +179,7 @@ qtermwidget (0.6.0+20150709-4) unstable; urgency=medium
qtermwidget (0.6.0+20150709-3) experimental; urgency=medium
* reduce symbols mess again
* reduce symbols mess again
-- Alf Gaida <agaida@siduction.org> Thu, 29 Oct 2015 00:09:51 +0100

2
debian/control vendored
View File

@ -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
View File

@ -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
View 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
View File

@ -0,0 +1 @@
fix-cmake-installdir.patch