r51212 - in /packages/unstable/gconfmm2.6/debian: changelog compat control control.in libgconfmm-2.6-1v5.docs libgconfmm-2.6-doc.docs rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sat Oct 1 14:33:07 UTC 2016


Author: biebl
Date: Sat Oct  1 14:33:06 2016
New Revision: 51212

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51212
Log:
* Convert from cdbs to dh.
* Bump debhelper compat level to 10.

Added:
    packages/unstable/gconfmm2.6/debian/libgconfmm-2.6-1v5.docs
      - copied, changed from r51211, packages/unstable/gconfmm2.6/debian/libgconfmm-2.6-doc.docs
Removed:
    packages/unstable/gconfmm2.6/debian/libgconfmm-2.6-doc.docs
Modified:
    packages/unstable/gconfmm2.6/debian/changelog
    packages/unstable/gconfmm2.6/debian/compat
    packages/unstable/gconfmm2.6/debian/control
    packages/unstable/gconfmm2.6/debian/control.in
    packages/unstable/gconfmm2.6/debian/rules

Modified: packages/unstable/gconfmm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gconfmm2.6/debian/changelog?rev=51212&op=diff
==============================================================================
--- packages/unstable/gconfmm2.6/debian/changelog	[utf-8] (original)
+++ packages/unstable/gconfmm2.6/debian/changelog	[utf-8] Sat Oct  1 14:33:06 2016
@@ -7,6 +7,8 @@
   * Switch to dpkg source format 3.0 (quilt).
   * Set pkg-gnome-maintainers at lists.alioth.debian.org as Maintainer.
   * Drop obsolete DM-Upload-Allowed: yes field.
+  * Convert from cdbs to dh.
+  * Bump debhelper compat level to 10.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 01 Oct 2016 15:55:47 +0200
 

Modified: packages/unstable/gconfmm2.6/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gconfmm2.6/debian/compat?rev=51212&op=diff
==============================================================================
--- packages/unstable/gconfmm2.6/debian/compat	[utf-8] (original)
+++ packages/unstable/gconfmm2.6/debian/compat	[utf-8] Sat Oct  1 14:33:06 2016
@@ -1 +1 @@
-6
+10

Modified: packages/unstable/gconfmm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gconfmm2.6/debian/control?rev=51212&op=diff
==============================================================================
--- packages/unstable/gconfmm2.6/debian/control	[utf-8] (original)
+++ packages/unstable/gconfmm2.6/debian/control	[utf-8] Sat Oct  1 14:33:06 2016
@@ -10,10 +10,7 @@
 Homepage: http://www.gtkmm.org/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gconfmm2.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gconfmm2.6
-Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 6),
-               dh-autoreconf,
-               dpkg-dev (>= 1.14.16),
+Build-Depends: debhelper (>= 10),
                gnome-pkg-tools (>= 0.11),
                libgconf2-dev (>= 2.4.0),
                libglibmm-2.4-dev (>= 2.44.0-2),

Modified: packages/unstable/gconfmm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gconfmm2.6/debian/control.in?rev=51212&op=diff
==============================================================================
--- packages/unstable/gconfmm2.6/debian/control.in	[utf-8] (original)
+++ packages/unstable/gconfmm2.6/debian/control.in	[utf-8] Sat Oct  1 14:33:06 2016
@@ -6,10 +6,7 @@
 Homepage: http://www.gtkmm.org/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gconfmm2.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gconfmm2.6
-Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 6),
-               dh-autoreconf,
-               dpkg-dev (>= 1.14.16),
+Build-Depends: debhelper (>= 10),
                gnome-pkg-tools (>= 0.11),
                libgconf2-dev (>= 2.4.0),
                libglibmm-2.4-dev (>= 2.44.0-2),

Copied: packages/unstable/gconfmm2.6/debian/libgconfmm-2.6-1v5.docs (from r51211, packages/unstable/gconfmm2.6/debian/libgconfmm-2.6-doc.docs)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gconfmm2.6/debian/libgconfmm-2.6-1v5.docs?rev=51212&op=diff
==============================================================================
--- packages/unstable/gconfmm2.6/debian/libgconfmm-2.6-doc.docs	[utf-8] (original)
+++ packages/unstable/gconfmm2.6/debian/libgconfmm-2.6-1v5.docs	[utf-8] Sat Oct  1 14:33:06 2016
@@ -1,3 +1,3 @@
 AUTHORS
 NEWS
-docs
+README

Modified: packages/unstable/gconfmm2.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gconfmm2.6/debian/rules?rev=51212&op=diff
==============================================================================
--- packages/unstable/gconfmm2.6/debian/rules	[utf-8] (original)
+++ packages/unstable/gconfmm2.6/debian/rules	[utf-8] Sat Oct  1 14:33:06 2016
@@ -1,33 +1,28 @@
 #!/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/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
 
 GNOME_MODULE := gconfmm
 
 SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgconfmm-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)
-DOC_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgconfmm-[[:digit:]\.]+-doc)[[:space:]]*$$/\1/p' debian/control)
 SHVER := 2.24.0
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-export AUTOHEADER := true
+%:
+	dh $@ --with gnome
 
-DEB_DH_AUTORECONF_ARGS := autoreconf -- -f -i -I scripts
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
-DEB_INSTALL_DOCS_$(DOC_PKG) += -XMakefile -XDoxyfile
-DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-build/$(DOC_PKG)::
-	$(MAKE) -C docs/reference
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=\$${prefix}/lib \
+		--enable-static
 
-install/$(DOC_PKG)::
-	$(MAKE) -C examples clean
+override_dh_makeshlibs:
+	dh_makeshlibs -V"$(SHARED_PKG) (>= $(SHVER))"
+
+# Don't compress doxygen tag files
+override_dh_compress:
+	dh_compress -X.tag




More information about the pkg-gnome-commits mailing list