r48978 - in /desktop/unstable/gedit/debian: changelog control control.in gedit-dev.dirs gedit.docs gedit.install rules

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

Author: jbicha-guest
Date: Thu Jun  2 02:38:33 2016
New Revision: 48978

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48978
Log:
* Switch from cdbs to dh
* Enable all hardening flags * Enable parallel building

Removed:
    desktop/unstable/gedit/debian/gedit-dev.dirs
Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/control
    desktop/unstable/gedit/debian/control.in
    desktop/unstable/gedit/debian/gedit.docs
    desktop/unstable/gedit/debian/gedit.install
    desktop/unstable/gedit/debian/rules

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=48978&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog	[utf-8] Thu Jun  2 02:38:33 2016
@@ -1,7 +1,13 @@
 gedit (3.20.2-2) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * debian/control.in: Drop gnome-icon-theme from the dependencies, do not
     force an icon theme and rely on the one installed by the metapackages
+
+  [ Jeremy Bicha ]
+  * Switch from cdbs to dh
+  * Enable all hardening flags
+  * Enable parallel building
 
  -- Laurent Bigonville <bigon at debian.org>  Fri, 20 May 2016 22:25:14 +0200
 

Modified: desktop/unstable/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control?rev=48978&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control	[utf-8] (original)
+++ desktop/unstable/gedit/debian/control	[utf-8] Thu Jun  2 02:38:33 2016
@@ -7,8 +7,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.90),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                autotools-dev,

Modified: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=48978&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gedit/debian/control.in	[utf-8] Thu Jun  2 02:38:33 2016
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.90),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                autotools-dev,

Modified: desktop/unstable/gedit/debian/gedit.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/gedit.docs?rev=48978&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/gedit.docs	[utf-8] (original)
+++ desktop/unstable/gedit/debian/gedit.docs	[utf-8] Thu Jun  2 02:38:33 2016
@@ -1 +1,2 @@
+NEWS
 README

Modified: desktop/unstable/gedit/debian/gedit.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/gedit.install?rev=48978&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/gedit.install	[utf-8] (original)
+++ desktop/unstable/gedit/debian/gedit.install	[utf-8] Thu Jun  2 02:38:33 2016
@@ -1,5 +1,4 @@
 usr/bin/gedit
-usr/lib/gedit/gedit/gedit-bugreport.sh /usr/share/gedit/
 usr/lib/*/gedit/girepository-1.0/
 usr/lib/*/gedit/plugins/*.plugin
 usr/lib/*/gedit/plugins/*.so

Modified: desktop/unstable/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/rules?rev=48978&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/rules	[utf-8] (original)
+++ desktop/unstable/gedit/debian/rules	[utf-8] Thu Jun  2 02:38:33 2016
@@ -1,26 +1,21 @@
 #!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.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-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_PYTHON3_MODULE_PACKAGES = gedit
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND= -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-binary-install/gedit::
-	cd debian/gedit/usr/share/gedit && mv gedit-bugreport.sh gedit-bugreport
+%:
+	dh $@ --parallel --with autoreconf,gnome,python3
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-gtk-doc
+
+override_dh_install:
+	dh_install
+	mv debian/tmp/usr/lib/x86_64-linux-gnu/gedit/gedit-bugreport.sh \
+		debian/gedit/usr/share/gedit/gedit-bugreport
 	chmod 755 debian/gedit/usr/share/bug/gedit/script
+
+override_dh_python3:
 	dh_python3 -pgedit
 	dh_python3 -pgedit /usr/lib/*/gedit/plugins
-
-LDFLAGS += -Wl,-O1 -Wl,--as-needed
-
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
-	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-
-DEB_DH_MAKESHLIBS_ARGS_gedit += -X/usr/lib/$(DEB_HOST_MULTIARCH)/gedit
-
-DEB_DH_GIREPOSITORY_ARGS_gedit += -ldebian/tmp/usr/share/gedit/gir-1.0 /usr/lib/$(DEB_HOST_MULTIARCH)/gedit/girepository-1.0