r50274 - in /packages/unstable/rhythmbox/debian: changelog control control.in rhythmbox-plugins.install rhythmbox.docs rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sat Sep 10 16:22:28 UTC 2016


Author: biebl
Date: Sat Sep 10 16:22:26 2016
New Revision: 50274

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

Added:
    packages/unstable/rhythmbox/debian/rhythmbox.docs
Modified:
    packages/unstable/rhythmbox/debian/changelog
    packages/unstable/rhythmbox/debian/control
    packages/unstable/rhythmbox/debian/control.in
    packages/unstable/rhythmbox/debian/rhythmbox-plugins.install   (contents, props changed)
    packages/unstable/rhythmbox/debian/rules

Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=50274&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog	[utf-8] Sat Sep 10 16:22:26 2016
@@ -6,6 +6,7 @@
 
   [ Michael Biebl ]
   * New upstream release.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 10 Sep 2016 16:54:15 +0200
 

Modified: packages/unstable/rhythmbox/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control?rev=50274&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control	[utf-8] Sat Sep 10 16:22:26 2016
@@ -8,9 +8,9 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Homepage: https://wiki.gnome.org/Apps/Rhythmbox
-Build-Depends: cdbs (>= 0.4.90~),
-               debhelper (>= 9.20160114),
+Build-Depends: debhelper (>= 9.20160114),
                dh-autoreconf,
+               dh-exec,
                dh-python (>= 1.20130903),
                gnome-pkg-tools (>= 0.6),
                libgirepository1.0-dev (>= 0.10.0),

Modified: packages/unstable/rhythmbox/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control.in?rev=50274&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control.in	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control.in	[utf-8] Sat Sep 10 16:22:26 2016
@@ -4,9 +4,9 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Homepage: https://wiki.gnome.org/Apps/Rhythmbox
-Build-Depends: cdbs (>= 0.4.90~),
-               debhelper (>= 9.20160114),
+Build-Depends: debhelper (>= 9.20160114),
                dh-autoreconf,
+               dh-exec,
                dh-python (>= 1.20130903),
                gnome-pkg-tools (>= 0.6),
                libgirepository1.0-dev (>= 0.10.0),

Modified: packages/unstable/rhythmbox/debian/rhythmbox-plugins.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-plugins.install?rev=50274&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-plugins.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rhythmbox-plugins.install	[utf-8] Sat Sep 10 16:22:26 2016
@@ -1,5 +1,6 @@
+#!/usr/bin/dh-exec
 usr/lib/mozilla/plugins/librhythmbox-itms-detection-plugin.so
-usr/lib/rhythmbox/plugins/android
+[linux-any] usr/lib/rhythmbox/plugins/android
 usr/lib/rhythmbox/plugins/artsearch
 usr/lib/rhythmbox/plugins/audiocd
 usr/lib/rhythmbox/plugins/audioscrobbler
@@ -20,7 +21,7 @@
 usr/share/rhythmbox/plugins/magnatune
 usr/lib/rhythmbox/plugins/mmkeys
 usr/lib/rhythmbox/plugins/mpris
-usr/lib/rhythmbox/plugins/mtpdevice
+[linux-any] usr/lib/rhythmbox/plugins/mtpdevice
 usr/lib/rhythmbox/plugins/notification
 usr/lib/rhythmbox/plugins/power-manager
 usr/lib/rhythmbox/plugins/python-console

Propchange: packages/unstable/rhythmbox/debian/rhythmbox-plugins.install
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/unstable/rhythmbox/debian/rhythmbox.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox.docs?rev=50274&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox.docs	(added)
+++ packages/unstable/rhythmbox/debian/rhythmbox.docs	[utf-8] Sat Sep 10 16:22:26 2016
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+THANKS

Modified: packages/unstable/rhythmbox/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rules?rev=50274&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rules	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rules	[utf-8] Sat Sep 10 16:22:26 2016
@@ -1,41 +1,41 @@
 #!/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-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_DH_AUTORECONF_ARGS := --as-needed ./autogen.sh
+%:
+	dh $@ --with autoreconf,gir,gnome,python3
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-lirc \
-                             --enable-gtk-doc \
-                             --disable-visualizer
+override_dh_autoreconf:
+	dh_autoreconf --as-needed ./autogen.sh
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-DEB_CONFIGURE_EXTRA_FLAGS += --without-hal --with-gudev
+CONFFLAGS = --with-gudev
 else
-DEB_CONFIGURE_EXTRA_FLAGS += --without-hal --without-gudev
+CONFFLAGS = --without-gudev
 endif
 
-ifneq ($(DEB_HOST_ARCH_OS),linux)
-# Linux specific, needs hal/gudev
-DEB_DH_INSTALL_ARGS_rhythmbox-plugins += -Xmtpdevice -Xandroid
-endif
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=\$${prefix}/lib \
+		--libexecdir=\$${libdir}/rhythmbox \
+		--enable-lirc \
+		--enable-gtk-doc \
+		--disable-visualizer \
+		--without-hal \
+		$(CONFFLAGS)
 
-# exclude plugins from shlibs generation
-DEB_DH_MAKESHLIBS_ARGS_rhythmbox-plugins += --no-act
-DEB_DH_MAKESHLIBS_ARGS_rhythmbox-plugin-cdrecorder += --no-act
-DEB_DH_MAKESHLIBS_ARGS_librhythmbox-core10 += -V -- -c4
+override_dh_install:
+	find debian/tmp -name '*.a' -delete
+	find debian/tmp -name '*.la' -delete
+	dh_install --fail-missing -Xsample-plugins
 
-$(patsubst %,binary-post-install/%,$(DEB_PACKAGES)) ::
-	find debian/$(cdbs_curpkg) -name '*.a' -delete
-	find debian/$(cdbs_curpkg) -name '*.la' -delete
-	dh_python3 --no-ext-rename -p$(cdbs_curpkg) /usr/lib/rhythmbox
+override_dh_python3:
+	dh_python3 --no-ext-rename /usr/lib/rhythmbox
 
-# Fail if there are any files which are not installed
-DEB_DH_INSTALL_ARGS += --fail-missing -X.la -Xsample-plugins
+override_dh_strip:
+	dh_strip --dbgsym-migration='rhythmbox-dbg (<< 3.3.1-1~)'
 
-DEB_DH_STRIP_ARGS := --dbgsym-migration='rhythmbox-dbg (<< 3.3.1-1~)'
+override_dh_makeshlibs:
+	dh_makeshlibs -prhythmbox-plugins --no-act
+	dh_makeshlibs -prhythmbox-plugin-cdrecorder --no-act
+	dh_makeshlibs --remaining-packages -V -- -c4




More information about the pkg-gnome-commits mailing list