r49117 - in /packages/unstable/eog-plugins/debian: changelog control control.in rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Jun 22 20:29:46 UTC 2016


Author: biebl
Date: Wed Jun 22 20:29:46 2016
New Revision: 49117

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

Modified:
    packages/unstable/eog-plugins/debian/changelog
    packages/unstable/eog-plugins/debian/control
    packages/unstable/eog-plugins/debian/control.in
    packages/unstable/eog-plugins/debian/rules

Modified: packages/unstable/eog-plugins/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/changelog?rev=49117&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/changelog	[utf-8] (original)
+++ packages/unstable/eog-plugins/debian/changelog	[utf-8] Wed Jun 22 20:29:46 2016
@@ -2,6 +2,7 @@
 
   * Install plugins into multiarch paths. Bump dependency on eog to
     (>= 3.20.3-1~) accordingly.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 22 Jun 2016 22:10:22 +0200
 

Modified: packages/unstable/eog-plugins/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/control?rev=49117&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/control	[utf-8] (original)
+++ packages/unstable/eog-plugins/debian/control	[utf-8] Wed Jun 22 20:29:46 2016
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs,
+Build-Depends: debhelper (>= 9),
                gnome-pkg-tools (>= 0.11),
-               debhelper (>= 9),
                autotools-dev,
                intltool (>= 0.40.0),
                libglib2.0-dev (>= 2.38.0),

Modified: packages/unstable/eog-plugins/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/control.in?rev=49117&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/control.in	[utf-8] (original)
+++ packages/unstable/eog-plugins/debian/control.in	[utf-8] Wed Jun 22 20:29:46 2016
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
+Build-Depends: debhelper (>= 9),
                gnome-pkg-tools (>= 0.11),
-               debhelper (>= 9),
                autotools-dev,
                intltool (>= 0.40.0),
                libglib2.0-dev (>= 2.38.0),

Modified: packages/unstable/eog-plugins/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/rules?rev=49117&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/rules	[utf-8] (original)
+++ packages/unstable/eog-plugins/debian/rules	[utf-8] Wed Jun 22 20:29:46 2016
@@ -1,23 +1,30 @@
 #!/usr/bin/make -f
 
 DISABLE_UPDATE_UPLOADERS := 1
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.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,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_eog-plugins := --no-act
-DEB_CONFIGURE_EXTRA_FLAGS += --with-plugins=all --enable-python --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-clean::
+%:
+	dh $@ --with gnome,python3
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--with-plugins=all \
+		--enable-python
+
+override_dh_gnome_clean:
+	dh_gnome_clean --no-control
 	plugins_desc_script="/^ @PLUGINS_DESCRIPTION@\$$/ c \\$$(find . -iname \*.desktop.in | while read f; do cat $$f | awk -f debian/desktop2description.awk; done | sed 's/.*/  &\\/'; echo " ")"; \
 		sed \
 			-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
 			-e "$$plugins_desc_script" \
 			debian/control.in > debian/control
 
-binary-install/eog-plugins::
-	dh_python3 -p$(cdbs_curpkg) --no-ext-rename /usr/lib/$(DEB_HOST_MULTIARCH)/eog/plugins
-	find debian/$(cdbs_curpkg) -name '*.la' -print -delete
+override_dh_install:
+	dh_install
+	find debian/eog-plugins -name '*.la' -print -delete
+
+override_dh_python3:
+	dh_python3 --no-ext-rename /usr/lib/$(DEB_HOST_MULTIARCH)/eog/plugins




More information about the pkg-gnome-commits mailing list