r52691 - in /desktop/experimental/gnome-software/debian: changelog control control.in rules

[laney at users.alioth.debian.org]

Author: laney
Date: Tue Jul 25 11:58:55 2017
New Revision: 52691

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52691
Log:
New upstream release 3.25.4

Modified:
    desktop/experimental/gnome-software/debian/changelog
    desktop/experimental/gnome-software/debian/control
    desktop/experimental/gnome-software/debian/control.in
    desktop/experimental/gnome-software/debian/rules

Modified: desktop/experimental/gnome-software/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/changelog?rev=52691&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-software/debian/changelog	[utf-8] Tue Jul 25 11:58:55 2017
@@ -1,3 +1,13 @@
+gnome-software (3.25.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release 3.25.4
+  * debian/rules: Switch to debhelper's meson buildsystem instead of calling
+    meson directly ourselves.
+  * debian/rules: Use dh_missing --fail-missing instead of dh_install.
+  * debian/control{,.in}: Bump debhelper BD to 10.4 for the above.
+
+ -- Iain Lane <laney at debian.org>  Tue, 25 Jul 2017 11:18:49 +0100
+
 gnome-software (3.25.3-1) experimental; urgency=medium
 
   * New upstream release 3.25.3

Modified: desktop/experimental/gnome-software/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/control?rev=52691&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-software/debian/control	[utf-8] Tue Jul 25 11:58:55 2017
@@ -10,7 +10,7 @@
            Iain Lane <laney at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: appstream,
                appstream-util,
-               debhelper (>= 9.0.0),
+               debhelper (>= 10.4),
                docbook-xsl,
                gnome-pkg-tools (>= 0.10),
                gsettings-desktop-schemas-dev (>= 3.18),

Modified: desktop/experimental/gnome-software/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/control.in?rev=52691&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-software/debian/control.in	[utf-8] Tue Jul 25 11:58:55 2017
@@ -6,7 +6,7 @@
            @GNOME_TEAM@
 Build-Depends: appstream,
                appstream-util,
-               debhelper (>= 9.0.0),
+               debhelper (>= 10.4),
                docbook-xsl,
                gnome-pkg-tools (>= 0.10),
                gsettings-desktop-schemas-dev (>= 3.18),

Modified: desktop/experimental/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-software/debian/rules?rev=52691&op=diff
==============================================================================
--- desktop/experimental/gnome-software/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-software/debian/rules	[utf-8] Tue Jul 25 11:58:55 2017
@@ -38,25 +38,17 @@
 	DISTRO_ID = pureos
 endif
 
-# Install target dir
-INSTALLDIR = $(CURDIR)/debian/tmp
-
 %:
-	dh $@ --with gnome
+	dh $@ --with gnome --buildsystem=meson
 
 override_dh_auto_configure:
-	meson build-deb $(GS_CONFIGURE_FLAGS) \
-			--prefix=/usr \
-			--libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-software/ \
-			--sysconfdir=/etc
-
-override_dh_auto_build:
-	ninja -v -C build-deb
+	dh_auto_configure -- --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-software/ \
+			     $(GS_CONFIGURE_FLAGS)
 
 override_dh_auto_install:
-	DESTDIR=$(INSTALLDIR) ninja -v -C build-deb install
+	dh_auto_install
 ifneq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
-	rm -f $(INSTALLDIR)/usr/lib/*/gs-plugins-*/libgs_plugin_ubuntu*
+	rm -f debian/tmp/usr/lib/*/gs-plugins-*/libgs_plugin_ubuntu*
 endif
 
 override_dh_installgsettings:
@@ -69,7 +61,10 @@
 	rm -f debian/tmp/usr/lib/*/gs-plugins-*/*.a
 	rm -f debian/tmp/usr/lib/*/gs-plugins-*/*.la
 	rm -f debian/tmp/usr/lib/*/gs-plugins-*/libgs_plugin_fedora*
-	dh_install --fail-missing
+	dh_install
+
+override_dh_missing:
+	dh_missing --fail-missing
 
 	# These files are split out to separate packages
 	rm -f debian/gnome-software/usr/lib/*/gs-plugins-*/libgs_plugin_flatpak*