r49541 - in /desktop/unstable/gnome-system-monitor/debian: changelog control control.in docs manpages rules

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Wed Aug 17 16:01:23 2016
New Revision: 49541

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49541
Log:
Convert from cdbs to dh

Add debian/manpages and debian/docs
Enable parallel builds and hardening flags

Added:
    desktop/unstable/gnome-system-monitor/debian/docs
    desktop/unstable/gnome-system-monitor/debian/manpages
Modified:
    desktop/unstable/gnome-system-monitor/debian/changelog
    desktop/unstable/gnome-system-monitor/debian/control
    desktop/unstable/gnome-system-monitor/debian/control.in
    desktop/unstable/gnome-system-monitor/debian/rules

Modified: desktop/unstable/gnome-system-monitor/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/changelog?rev=49541&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/changelog	[utf-8] Wed Aug 17 16:01:23 2016
@@ -1,3 +1,11 @@
+gnome-system-monitor (3.20.1-2) UNRELEASED; urgency=medium
+
+  * Convert from cdbs to dh
+  * Add debian/manpages and debian/docs
+  * Enable parallel builds and hardening flags
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 17 Aug 2016 11:56:51 -0400
+
 gnome-system-monitor (3.20.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-system-monitor/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control?rev=49541&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/control	[utf-8] Wed Aug 17 16:01:23 2016
@@ -8,7 +8,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: appstream-util,
-               cdbs,
                debhelper (>= 9),
                desktop-file-utils,
                dh-autoreconf,

Modified: desktop/unstable/gnome-system-monitor/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control.in?rev=49541&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/control.in	[utf-8] Wed Aug 17 16:01:23 2016
@@ -4,7 +4,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: appstream-util,
-               cdbs,
                debhelper (>= 9),
                desktop-file-utils,
                dh-autoreconf,

Added: desktop/unstable/gnome-system-monitor/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/docs?rev=49541&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/docs	(added)
+++ desktop/unstable/gnome-system-monitor/debian/docs	[utf-8] Wed Aug 17 16:01:23 2016
@@ -0,0 +1 @@
+NEWS

Added: desktop/unstable/gnome-system-monitor/debian/manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/manpages?rev=49541&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/manpages	(added)
+++ desktop/unstable/gnome-system-monitor/debian/manpages	[utf-8] Wed Aug 17 16:01:23 2016
@@ -0,0 +1 @@
+debian/gnome-system-monitor.1

Modified: desktop/unstable/gnome-system-monitor/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/rules?rev=49541&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/rules	[utf-8] Wed Aug 17 16:01:23 2016
@@ -1,28 +1,30 @@
 #!/usr/bin/make -f
 export AUTOPOINT = true
- 
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-wnck
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-	DEB_CONFIGURE_EXTRA_FLAGS += --enable-systemd
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	ENABLE_SYSTEMD := --enable-systemd
 endif
 
-DEB_INSTALL_MANPAGES_gnome-system-monitor += debian/gnome-system-monitor.1
+%:
+	dh $@ --parallel --with autoreconf,gnome
 
-build/gnome-system-monitor::
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-wnck $(ENABLE_SYSTEMD)
+
+override_dh_auto_build:
+	dh_auto_build
 	docbook-to-man debian/gnome-system-monitor.sgml \
-		> debian/gnome-system-monitor.1
+		> debian/gnome-system-monitor.1	
 
-clean::
+override_dh_auto_clean:
 	-rm -f debian/gnome-system-monitor.1
 	-rm -f intltool-extract intltool-merge intltool-update
 	-rm -f po/.intltool-merge-cache