Preparing the upcoming release, switch to experimental

Added build dependency libqt5xdgiconloader-dev, set
minimum versions
Bumped Standards to 3.9.8, no changes needed
Fixed VCS-Fields, use https and plain /git/
Added Recommends lxqt-globalkeys-l10n
Fixed copyright Format field
Bumped copyright years
Don't install translations
Added translation control to rules
Set CMAKE_BUILD_TYPE=RelWithDebInfo
Exported LC_ALL=C.UTF-8, make builds reproducible
Added hardening options to rules
Fixed .gitignore
Removed Patches, applied upstream

debian/.gitignore

@@ -1,6 +1,7 @@
 /*.debhelper
 /*.log
 /*.substvars
+/debhelper-build-stamp
 /files
 
 /lxqt-globalkeys/

debian/changelog

@@ -1,3 +1,23 @@
+lxqt-globalkeys (0.10.0-6) experimental; urgency=medium
+
+  * Preparing the upcoming release, switch to experimental
+  * Added build dependency libqt5xdgiconloader-dev, set
+    minimum versions
+  * Bumped Standards to 3.9.8, no changes needed
+  * Fixed VCS-Fields, use https and plain /git/
+  * Added Recommends lxqt-globalkeys-l10n
+  * Fixed copyright Format field
+  * Bumped copyright years
+  * Don't install translations
+  * Added translation control to rules
+  * Set CMAKE_BUILD_TYPE=RelWithDebInfo
+  * Exported LC_ALL=C.UTF-8, make builds reproducible
+  * Added hardening options to rules
+  * Fixed .gitignore
+  * Removed Patches, applied upstream
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 17 Jul 2016 14:55:55 +0200
+
 lxqt-globalkeys (0.10.0-5) unstable; urgency=medium
 
   * use static_cast for errno

debian/control

@@ -8,22 +8,24 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                cmake (>= 3.0.2),
                libkf5windowsystem-dev,
-               liblxqt0-dev (>= 0.10.0),
+               liblxqt0-dev (>= 0.10.96~),
                libqt5x11extras5-dev,
-               libqt5xdg-dev (>= 1.3.0),
+               libqt5xdg-dev (>= 1.3.1~),
+               libqt5xdgiconloader-dev (>= 1.3.1~),
                libx11-dev,
                pkg-config,
                qttools5-dev,
                qttools5-dev-tools
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-globalkeys.git/?h=debian/sid
+Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/lxqt-globalkeys.git/?h=debian/experimental
-Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-globalkeys.git -b debian/sid
+Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-globalkeys.git -b debian/experimental
 Homepage: https://github.com/lxde/lxqt-globalkeys
 
 Package: lxqt-globalkeys
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Recommends: lxqt-globalkeys-l10n
 Description: daemon used to register global keyboard shortcuts (appl.)
  Daemon used to register global keyboard shortcuts.
  .

debian/copyright

@@ -1,14 +1,14 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name:lxqt-globalkeys
 Source: https://github.com/lxde/lxqt-globalkeys
 
 Files: *
-Copyright: 2012-2015 LXQt team
+Copyright: 2012-2016 LXQt team
            2010-2012 Razor team
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014-2015 Alf Gaida <agaida@siduction.org>
+Copyright: 2014-2016 Alf Gaida <agaida@siduction.org>
            2015      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+
 

debian/gbp.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian/sid
+debian-branch = debian/experimental
 upstream-branch = upstream/latest
 pristine-tar = True
 

debian/lxqt-globalkeys.install

@@ -4,4 +4,3 @@ usr/bin/lxqt-globalkeysd
 #shortcuts
 usr/bin/lxqt-config-globalkeyshortcuts
 usr/share/applications/lxqt-config-globalkeyshortcuts.desktop
-usr/share/lxqt/translations/lxqt-config-globalkeyshortcuts/

debian/patches/error_t.patch

@@ -1,61 +0,0 @@
-Description: cast return values to error_t
-Author: Alf Gaida <agaida@siduction.org>
-
-Bug: <url in upstream bugtracker>
-Last-Update: 2015-12-27
-
---- lxqt-globalkeys-0.10.0.orig/daemon/pipe_utils.cpp
-+++ lxqt-globalkeys-0.10.0/daemon/pipe_utils.cpp
-@@ -39,10 +39,10 @@ void initBothPipeEnds(int fd[2])
- 
- error_t createPipe(int fd[2])
- {
--    error_t result = 0;
-+    error_t result = static_cast<error_t>(0);
-     if (pipe(fd) < 0)
-     {
--        result = errno;
-+        result = static_cast<error_t>( errno);
-     }
-     if (!result)
-     {
-@@ -59,16 +59,16 @@ error_t readAll(int fd, void *data, size
-         ssize_t bytes_read = read(fd, data, length);
-         if (bytes_read < 0)
-         {
--            return errno;
-+            return static_cast<error_t>( errno);
-         }
-         if (!bytes_read)
-         {
--            return -1;
-+            return static_cast<error_t>( -1);
-         }
-         data = reinterpret_cast<char *>(data) + bytes_read;
-         length -= bytes_read;
-     }
--    return 0;
-+    return static_cast<error_t>(0);
- }
- 
- error_t writeAll(int fd, const void *data, size_t length)
-@@ -78,16 +78,16 @@ error_t writeAll(int fd, const void *dat
-         ssize_t bytes_written = write(fd, data, length);
-         if (bytes_written < 0)
-         {
--            return errno;
-+            return static_cast<error_t>( errno);
-         }
-         if (!bytes_written)
-         {
--            return -1;
-+            return static_cast<error_t>( -1);
-         }
-         data = reinterpret_cast<const char *>(data) + bytes_written;
-         length -= bytes_written;
-     }
--    return 0;
-+    return static_cast<error_t>( 0);
- }
- 
- void closeBothPipeEnds(int fd[2])

debian/patches/series

@@ -1 +0,0 @@
-error_t.patch

debian/rules

@@ -1,9 +1,17 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+export LC_ALL=C.UTF-8
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh ${@} --buildsystem cmake \
 		--parallel \
 		--fail-missing
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-DPULL_TRANSLATIONS=OFF\
+		-DUPDATE_TRANSLATIONS=OFF\
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo