r50454 - in /desktop/unstable/totem/debian: changelog control control.in docs gir1.2-totem-1.0.install libtotem-dev.install libtotem0.install patches/disable-gtkdoc-check.patch patches/series rules totem-plugins.install

ah at users.alioth.debian.org ah at users.alioth.debian.org
Tue Sep 13 16:30:29 UTC 2016 

Author: ah
Date: Tue Sep 13 16:30:29 2016
New Revision: 50454

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50454
Log:
* Convert from cdbs to dh
* Add debian/patches/disable-gtkdoc-check.patch to avoid failing make check

Added:
    desktop/unstable/totem/debian/docs
    desktop/unstable/totem/debian/patches/disable-gtkdoc-check.patch
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/control
    desktop/unstable/totem/debian/control.in
    desktop/unstable/totem/debian/gir1.2-totem-1.0.install
    desktop/unstable/totem/debian/libtotem-dev.install
    desktop/unstable/totem/debian/libtotem0.install
    desktop/unstable/totem/debian/patches/series
    desktop/unstable/totem/debian/rules
    desktop/unstable/totem/debian/totem-plugins.install

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog	[utf-8] (original)
+++ desktop/unstable/totem/debian/changelog	[utf-8] Tue Sep 13 16:30:29 2016
@@ -1,3 +1,10 @@
+totem (3.21.91-2) UNRELEASED; urgency=medium
+
+  * Convert from cdbs to dh
+  * Add debian/patches/disable-gtkdoc-check.patch to avoid failing make check
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 13 Sep 2016 16:59:54 +0200
+
 totem (3.21.91-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control	[utf-8] (original)
+++ desktop/unstable/totem/debian/control	[utf-8] Tue Sep 13 16:30:29 2016
@@ -8,7 +8,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9.20160114),
-               cdbs (>= 0.4.90),
                dpkg-dev (>= 1.16.1),
                autotools-dev,
                dh-autoreconf,

Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in	[utf-8] (original)
+++ desktop/unstable/totem/debian/control.in	[utf-8] Tue Sep 13 16:30:29 2016
@@ -4,7 +4,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9.20160114),
-               cdbs (>= 0.4.90),
                dpkg-dev (>= 1.16.1),
                autotools-dev,
                dh-autoreconf,

Added: desktop/unstable/totem/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/docs?rev=50454&op=file
==============================================================================
--- desktop/unstable/totem/debian/docs	(added)
+++ desktop/unstable/totem/debian/docs	[utf-8] Tue Sep 13 16:30:29 2016
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README

Modified: desktop/unstable/totem/debian/gir1.2-totem-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/gir1.2-totem-1.0.install?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/gir1.2-totem-1.0.install	[utf-8] (original)
+++ desktop/unstable/totem/debian/gir1.2-totem-1.0.install	[utf-8] Tue Sep 13 16:30:29 2016
@@ -1 +1 @@
-usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/

Modified: desktop/unstable/totem/debian/libtotem-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/libtotem-dev.install?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/libtotem-dev.install	[utf-8] (original)
+++ desktop/unstable/totem/debian/libtotem-dev.install	[utf-8] Tue Sep 13 16:30:29 2016
@@ -1,4 +1,4 @@
 usr/include/totem/1.0/
-usr/lib/libtotem.so
-usr/lib/pkgconfig/
+usr/lib/*/libtotem.so
+usr/lib/*/pkgconfig/
 usr/share/gir-1.0/

Modified: desktop/unstable/totem/debian/libtotem0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/libtotem0.install?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/libtotem0.install	[utf-8] (original)
+++ desktop/unstable/totem/debian/libtotem0.install	[utf-8] Tue Sep 13 16:30:29 2016
@@ -1 +1 @@
-usr/lib/libtotem.so.*
+usr/lib/*/libtotem.so.*

Added: desktop/unstable/totem/debian/patches/disable-gtkdoc-check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/disable-gtkdoc-check.patch?rev=50454&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/disable-gtkdoc-check.patch	(added)
+++ desktop/unstable/totem/debian/patches/disable-gtkdoc-check.patch	[utf-8] Tue Sep 13 16:30:29 2016
@@ -0,0 +1,21 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: disable gtkdoc-check
+
+This avoids failing make check
+
+--- a/docs/reference/Makefile.am
++++ b/docs/reference/Makefile.am
+@@ -141,9 +141,9 @@
+ # e.g. EXTRA_DIST += version.xml.in
+ EXTRA_DIST += version.xml.in
+ 
+-if ENABLE_GTK_DOC
+-TESTS_ENVIRONMENT = cd $(builddir) &&
+-TESTS = $(GTKDOC_CHECK)
+-endif
++#if ENABLE_GTK_DOC
++#TESTS_ENVIRONMENT = cd $(builddir) &&
++#TESTS = $(GTKDOC_CHECK)
++#endif
+ 
+ -include $(top_srcdir)/git.mk

Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series	[utf-8] Tue Sep 13 16:30:29 2016
@@ -1 +1,2 @@
 lower-clutter-gtk.patch
+disable-gtkdoc-check.patch

Modified: desktop/unstable/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/rules?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/rules	[utf-8] (original)
+++ desktop/unstable/totem/debian/rules	[utf-8] Tue Sep 13 16:30:29 2016
@@ -5,30 +5,38 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/dpkg/buildflags.mk
 
-include /usr/share/cdbs/1/rules/autoreconf.mk
-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-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+%:
+	dh $@ --with gnome,gir,autoreconf
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--enable-vala=yes \
-	--disable-run-in-source-tree \
-	PYTHON=/usr/bin/python3
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_DH_STRIP_ARGS := --dbgsym-migration='totem-dbg (<< 3.20.1-1~)'
-DEB_DH_MAKESHLIBS_ARGS += -Xplugins/
-DEB_DH_GIREPOSITORY_ARGS += -lsrc
-DEB_DH_MAKESHLIBS_ARGS_totem += -X/usr/lib/nautilus/
-DEB_DH_MAKESHLIBS_ARGS_libtotem0 += -V'libtotem0 (>= $(DEB_VERSION)), libtotem0 (<< $(DEB_GNOME_NEXTVERSION))'
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-gtk-doc \
+		--enable-vala=yes \
+		--disable-run-in-source-tree \
+		PYTHON=/usr/bin/python3
 
-binary-install/totem-plugins::
+override_dh_strip:
+	dh_strip --dbgsym-migration='totem-dbg (<< 3.20.1-1~)'
+
+override_dh_makeshlibs:
+
+	dh_makeshlibs -p totem -X/usr/lib/nautilus/ -Xplugins/
+	dh_makeshlibs -p libtotem0 \
+		-V "libtotem0 (>= $(shell dpkg-parsechangelog --show-field=Version)), libtotem0 (<< $(shell sed -ne '/^gnome:NextVersion=/ s/.*=// p' debian/libtotem0.substvars))" -Xplugins/
+	dh_makeshlibs --remaining-packages -Xplugins/
+
+override_dh_girepository:
+	dh_girepository -lsrc
+
+override_dh_python3:
 	dh_python3 --no-ext-rename -ptotem-plugins /usr/lib/totem/plugins
+	dh_python3 --remaining-packages
 
-common-binary-predeb-arch::
-	find debian -name '*.a' -delete
-	find debian -name '*.la' -delete
+override_dh_install:
+	find debian -name '*.a' -o -name '*.la' -delete
+	dh_install

Modified: desktop/unstable/totem/debian/totem-plugins.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/totem-plugins.install?rev=50454&op=diff
==============================================================================
--- desktop/unstable/totem/debian/totem-plugins.install	[utf-8] (original)
+++ desktop/unstable/totem/debian/totem-plugins.install	[utf-8] Tue Sep 13 16:30:29 2016
@@ -1,24 +1,24 @@
 # Needs porting
-# usr/lib/totem/plugins/bbc
-usr/lib/totem/plugins/apple-trailers
-usr/lib/totem/plugins/autoload-subtitles
-usr/lib/totem/plugins/brasero-disc-recorder
-#usr/lib/totem/plugins/chapters
-usr/lib/totem/plugins/dbus
-usr/lib/totem/plugins/gromit
-usr/lib/totem/plugins/im-status
-usr/lib/totem/plugins/lirc
-usr/lib/totem/plugins/media-player-keys
-usr/lib/totem/plugins/ontop
-usr/lib/totem/plugins/opensubtitles
-usr/lib/totem/plugins/properties
-usr/lib/totem/plugins/pythonconsole
-usr/lib/totem/plugins/recent
-usr/lib/totem/plugins/rotation
-usr/lib/totem/plugins/save-file
-usr/lib/totem/plugins/screensaver
-usr/lib/totem/plugins/screenshot
-usr/lib/totem/plugins/skipto
-usr/lib/totem/plugins/variable-rate
-usr/lib/totem/plugins/vimeo
-usr/lib/totem/plugins/zeitgeist-dp
+# usr/lib/*/totem/plugins/bbc
+usr/lib/*/totem/plugins/apple-trailers
+usr/lib/*/totem/plugins/autoload-subtitles
+usr/lib/*/totem/plugins/brasero-disc-recorder
+#usr/lib/*/totem/plugins/chapters
+usr/lib/*/totem/plugins/dbus
+usr/lib/*/totem/plugins/gromit
+usr/lib/*/totem/plugins/im-status
+usr/lib/*/totem/plugins/lirc
+usr/lib/*/totem/plugins/media-player-keys
+usr/lib/*/totem/plugins/ontop
+usr/lib/*/totem/plugins/opensubtitles
+usr/lib/*/totem/plugins/properties
+usr/lib/*/totem/plugins/pythonconsole
+usr/lib/*/totem/plugins/recent
+usr/lib/*/totem/plugins/rotation
+usr/lib/*/totem/plugins/save-file
+usr/lib/*/totem/plugins/screensaver
+usr/lib/*/totem/plugins/screenshot
+usr/lib/*/totem/plugins/skipto
+usr/lib/*/totem/plugins/variable-rate
+usr/lib/*/totem/plugins/vimeo
+usr/lib/*/totem/plugins/zeitgeist-dp

More information about the pkg-gnome-commits mailing list