Cherry-picked upstream version 0.9.0+20150829

cme fix dpkg-control Added linker flags -Wl,--as-needed upstream signing key added and used in watchfile
9 years ago · 4e843ed8b5
parent 3ff9aecf26
commit 4e843ed8b5
5 changed files with 105 additions and 43 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,9 +1,13 @@
-lxqt-globalkeys (0.9.0+20150806-2) UNRELEASED; urgency=medium
+lxqt-globalkeys (0.9.0+20150829-1) unstable; urgency=medium

-  * .gitignore fixed
-  * removed breaks/replaces 
+  * Cherry-picked upstream version 0.9.0+20150829
+  * Fixed .gitignore
+  * Removed breaks/replaces 
+  * cme fix dpkg-control
+  * Added linker flags -Wl,--as-needed
+  * upstream signing key added and used in watchfile

- -- Alf Gaida <agaida@siduction.org>  Sun, 23 Aug 2015 22:40:22 +0200
+ -- Alf Gaida <agaida@siduction.org>  Wed, 02 Sep 2015 21:28:59 +0200

 lxqt-globalkeys (0.9.0+20150806-1) unstable; urgency=low

--- a/debian/control
+++ b/debian/control
@ -1,32 +1,29 @@
 Source: lxqt-globalkeys
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Uploaders: Alf Gaida <agaida@siduction.org>,
+           ChangZhuo Chen (陳昌倬) <czchen@gmail.com>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-Uploaders:
- Alf Gaida <agaida@siduction.org>,
- ChangZhuo Chen (陳昌倬) <czchen@gmail.com>,
- Andrew Lee (李健秋) <ajqlee@debian.org>
-Build-Depends:
- cmake (>= 3.0.2),
- debhelper (>= 9),
- libkf5windowsystem-dev (>= 5.9.0),
- liblxqt0-dev (>= 0.9.0),
- libqt5x11extras5-dev (>= 5.3),
- libqt5xdg-dev (>= 1.2.0),
- libx11-dev,
- pkg-config,
- qttools5-dev (>= 5.3),
- qttools5-dev-tools (>= 5.3),
+Build-Depends: cmake (>= 3.0.2),
+               debhelper (>= 9),
+               libkf5windowsystem-dev,
+               liblxqt0-dev,
+               libqt5x11extras5-dev,
+               libqt5xdg-dev,
+               libx11-dev,
+               pkg-config,
+               qttools5-dev,
+               qttools5-dev-tools
 Standards-Version: 3.9.6
-Homepage: https://github.com/lxde/lxqt-globalkeys
-Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-globalkeys.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-globalkeys.git
+Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-globalkeys.git
+Homepage: https://github.com/lxde/lxqt-globalkeys

 Package: lxqt-globalkeys
 Architecture: any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: daemon used to register global keyboard shortcuts (appl.)
 Daemon used to register global keyboard shortcuts.
 .
@ -35,10 +32,9 @@ Description: daemon used to register global keyboard shortcuts (appl.)
 Package: liblxqt-globalkeys0
 Architecture: any
 Section: libs
-Depends:
- ${misc:Pre-Depends},
- ${misc:Depends},
- ${shlibs:Depends},
+Depends: ${misc:Pre-Depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: daemon used to register global keyboard shortcuts (shared libs)
 Daemon used to register global keyboard shortcuts.
 .
@ -47,10 +43,9 @@ Description: daemon used to register global keyboard shortcuts (shared libs)
 Package: liblxqt-globalkeys0-dev
 Architecture: any
 Section: libdevel
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- liblxqt-globalkeys0 (= ${binary:Version}),
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         liblxqt-globalkeys0 (= ${binary:Version})
 Description: daemon used to register global keyboard shortcuts (dev files)
 Daemon used to register global keyboard shortcuts.
 .
@ -59,11 +54,10 @@ Description: daemon used to register global keyboard shortcuts (dev files)
 Package: liblxqt-globalkeys-ui0
 Architecture: any
 Section: libs
-Depends:
- ${misc:Pre-Depends},
- ${misc:Depends},
- ${shlibs:Depends},
- liblxqt-globalkeys0 (= ${binary:Version}),
+Depends: ${misc:Pre-Depends},
+         ${misc:Depends},
+         ${shlibs:Depends},
+         liblxqt-globalkeys0 (= ${binary:Version})
 Description: daemon used to register global keyboard shortcuts (ui files)
 Daemon used to register global keyboard shortcuts.
 .
@ -72,10 +66,9 @@ Description: daemon used to register global keyboard shortcuts (ui files)
 Package: liblxqt-globalkeys-ui0-dev
 Architecture: any
 Section: libdevel
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- liblxqt-globalkeys-ui0 (= ${binary:Version}),
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         liblxqt-globalkeys-ui0 (= ${binary:Version})
 Description: daemon used to register global keyboard shortcuts (ui dev files)
 Daemon used to register global keyboard shortcuts.
 .
--- a/debian/rules
+++ b/debian/rules
@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1

+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed

 %:
 	dh ${@} --buildsystem cmake --parallel
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U
+WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA
+Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/
+OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3
+7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE
+FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb
+ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4
+Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7
+ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6
+ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC
+iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB
+tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC
+Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a
+SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ
+OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb
+sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF
+UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho
+P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu
+6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn
+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
+=fF8P
+-----END PGP PUBLIC KEY BLOCK-----
--- a/debian/watch
+++ b/debian/watch
@ -1,2 +1,3 @@
 version=3
-https://github.com/lxde/lxqt-globalkeys/releases .*/([\d\.]+).tar.gz
+opts="pgpsigurlmangle=s/$/.asc/" \
+    https://github.com/lxde/lxqt-globalkeys/releases .*/([\d\.]+).tar.gz