r49065 - in /desktop/unstable/librsvg/debian: changelog control control.in librsvg2-2.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Jun 13 19:03:22 2016
New Revision: 49065

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

Added:
    desktop/unstable/librsvg/debian/librsvg2-2.docs
Modified:
    desktop/unstable/librsvg/debian/changelog
    desktop/unstable/librsvg/debian/control
    desktop/unstable/librsvg/debian/control.in
    desktop/unstable/librsvg/debian/rules

Modified: desktop/unstable/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/changelog?rev=49065&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/changelog	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/changelog	[utf-8] Mon Jun 13 19:03:22 2016
@@ -3,6 +3,7 @@
   * New upstream release.
   * Drop 01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch, this
     has been fixed upstream for good.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Mon, 13 Jun 2016 16:23:19 +0200
 

Modified: desktop/unstable/librsvg/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/control?rev=49065&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/control	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/control	[utf-8] Mon Jun 13 19:03:22 2016
@@ -6,9 +6,8 @@
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.93),
-               debhelper (>= 9),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
+Build-Depends: debhelper (>= 9),
                dh-autoreconf (>= 4),
                libxml2-dev (>= 2.7.0),
                libglib2.0-dev (>= 2.24.0),

Modified: desktop/unstable/librsvg/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/control.in?rev=49065&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/control.in	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/control.in	[utf-8] Mon Jun 13 19:03:22 2016
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.93),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf (>= 4),
                libxml2-dev (>= 2.7.0),
                libglib2.0-dev (>= 2.24.0),

Added: desktop/unstable/librsvg/debian/librsvg2-2.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/librsvg2-2.docs?rev=49065&op=file
==============================================================================
--- desktop/unstable/librsvg/debian/librsvg2-2.docs	(added)
+++ desktop/unstable/librsvg/debian/librsvg2-2.docs	[utf-8] Mon Jun 13 19:03:22 2016
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+TODO

Modified: desktop/unstable/librsvg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/rules?rev=49065&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/rules	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/rules	[utf-8] Mon Jun 13 19:03:22 2016
@@ -1,36 +1,31 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/autoreconf.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
 
-ifeq ($(DEB_BUILD_ARCH),alpha)
-   CFLAGS += -mieee
-endif
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_AUTORECONF_ARGS += --as-needed
+%:
+	dh $@ --with autoreconf,gnome,gir
 
-LIBRSVG2_PKG := librsvg2-2
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	--enable-pixbuf-loader \
-	--enable-introspection \
-	--enable-vala \
-	--enable-gtk-doc \
-	$(NULL)
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-pixbuf-loader \
+		--enable-introspection \
+		--enable-vala \
+		--enable-gtk-doc
 
-DEB_DH_MAKESHLIBS_ARGS_$(LIBRSVG2_PKG) += -V -- -c4
-DEB_DH_MAKESHLIBS_ARGS_librsvg2-common = --no-act
+override_dh_makeshlibs:
+	dh_makeshlibs -V -- -c4
 
-binary-install/librsvg2-common::
-	sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" debian/$(cdbs_curpkg).postinst.in > \
-		debian/$(cdbs_curpkg).postinst
+override_dh_install:
+	dh_install
+	sed -e "s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" debian/librsvg2-common.postinst.in > \
+		debian/librsvg2-common.postinst
 
-clean::
+override_dh_clean:
+	dh_clean
 	rm -f debian/librsvg2-common.postinst