r39456 - in /desktop/unstable/gnome-documents/debian: changelog compat control control.in rules
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Tue Sep 3 16:34:16 UTC 2013
Author: jbicha-guest
Date: Tue Sep 3 16:34:14 2013
New Revision: 39456
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39456
Log:
* Use dh7 style rules instead of cdbs
* Bump dh compat to 9
* debian/control.in:
- Build-depend on desktop-file-utils
- Depend on gir1.2-webkit-3.0 (Closes: #721641)
Modified:
desktop/unstable/gnome-documents/debian/changelog
desktop/unstable/gnome-documents/debian/compat
desktop/unstable/gnome-documents/debian/control
desktop/unstable/gnome-documents/debian/control.in
desktop/unstable/gnome-documents/debian/rules
Modified: desktop/unstable/gnome-documents/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/changelog?rev=39456&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/changelog [utf-8] Tue Sep 3 16:34:14 2013
@@ -2,7 +2,11 @@
[ Jeremy Bicha ]
* New upstream release
- * Depend on gir1.2-webkit-3.0 (Closes: #721641)
+ * Use dh7 style rules instead of cdbs
+ * Bump dh compat to 9
+ * debian/control.in:
+ - Build-depend on desktop-file-utils
+ - Depend on gir1.2-webkit-3.0 (Closes: #721641)
-- Michael Biebl <biebl at debian.org> Tue, 03 Sep 2013 17:12:18 +0200
Modified: desktop/unstable/gnome-documents/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/compat?rev=39456&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/compat [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/compat [utf-8] Tue Sep 3 16:34:14 2013
@@ -1 +1 @@
-8
+9
Modified: desktop/unstable/gnome-documents/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control?rev=39456&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control [utf-8] Tue Sep 3 16:34:14 2013
@@ -2,15 +2,14 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: gnome-documents
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.41),
- dh-autoreconf,
- debhelper (>= 8),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Build-Depends: dh-autoreconf,
+ debhelper (>= 9),
+ desktop-file-utils,
gnome-pkg-tools (>= 0.10),
gnome-common,
gobject-introspection (>= 1.31.6),
Modified: desktop/unstable/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control.in?rev=39456&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control.in [utf-8] Tue Sep 3 16:34:14 2013
@@ -2,10 +2,10 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.41),
- dh-autoreconf,
- debhelper (>= 8),
+Uploaders: @GNOME_TEAM@
+Build-Depends: dh-autoreconf,
+ debhelper (>= 9),
+ desktop-file-utils,
gnome-pkg-tools (>= 0.10),
gnome-common,
gobject-introspection (>= 1.31.6),
Modified: desktop/unstable/gnome-documents/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/rules?rev=39456&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/rules [utf-8] Tue Sep 3 16:34:14 2013
@@ -1,23 +1,25 @@
#!/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
+export DEB_LDFLAGS_MAINT_APPEND= -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_AUTORECONF_ARGS := --as-needed
+%:
+ dh $@ --parallel --with autoreconf,gnome
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-getting-started
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
-DEB_DH_MAKESHLIBS_ARGS += -X/usr/lib/gnome-documents
-DEB_DH_GIREPOSITORY_ARGS_ALL += -ldebian/gnome-documents/usr/share/gnome-documents/gir-1.0 /usr/lib/gnome-documents/ /usr/lib/gnome-documents/girepository-1.0/
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --enable-getting-started
-# List any files which are not installed
-common-binary-post-install-arch:: list-missing
+override_dh_install:
+ # Since dh_install -X.la isn't working...
+ find -name *.la -delete
+ dh_install -X.la
-binary-install/gnome-documents::
- find debian/$(cdbs_curpkg) -name '*.la' -delete
+override_dh_girepository:
+ dh_girepository -X/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-documents \
+ -ldebian/gnome-documents/usr/share/gnome-documents/gir-1.0 \
+ /usr/lib/$(DEB_HOST_MULTIARCH)/gnome-documents/ /usr/lib/$(DEB_HOST_MULTIARCH)/gnome-documents/girepository-1.0/
+
More information about the pkg-gnome-commits
mailing list