r48391 - in /packages/unstable/gnome-software/debian: gnome-software.gsettings-override.in rules

mak at users.alioth.debian.org mak at users.alioth.debian.org
Mon Apr 25 18:18:17 UTC 2016


Author: mak
Date: Mon Apr 25 18:18:17 2016
New Revision: 48391

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48391
Log:
Enable ODRS, set provenance via GSettings

Added:
    packages/unstable/gnome-software/debian/gnome-software.gsettings-override.in
Modified:
    packages/unstable/gnome-software/debian/rules

Added: packages/unstable/gnome-software/debian/gnome-software.gsettings-override.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-software/debian/gnome-software.gsettings-override.in?rev=48391&op=file
==============================================================================
--- packages/unstable/gnome-software/debian/gnome-software.gsettings-override.in	(added)
+++ packages/unstable/gnome-software/debian/gnome-software.gsettings-override.in	[utf-8] Mon Apr 25 18:18:17 2016
@@ -0,0 +1,2 @@
+[org.gnome.software]
+official-sources=['@DISTRO at -*']

Modified: packages/unstable/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-software/debian/rules?rev=48391&op=diff
==============================================================================
--- packages/unstable/gnome-software/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-software/debian/rules	[utf-8] Mon Apr 25 18:18:17 2016
@@ -3,7 +3,8 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GS_CONFIGURE_FLAGS = --libdir=/usr/lib \
-		--disable-silent-rules
+		--disable-silent-rules \
+		--enable-odrs
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	# Enable Limba support on Linux
@@ -13,6 +14,13 @@
 	ifneq (,$(findstring $(DEB_BUILD_ARCH), amd64 arm64 armhf i386))
 		GS_CONFIGURE_FLAGS += --enable-firmware
 	endif
+endif
+
+DISTRO_ID = debian
+ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+	DISTRO_ID = ubuntu
+else ifeq (yes,$(shell dpkg-vendor --derives-from Tanglu && echo yes))
+	DISTRO_ID = tanglu
 endif
 
 # Install target dir
@@ -27,6 +35,13 @@
 override_dh_auto_install:
 	dh_auto_install --destdir=$(INSTALLDIR)
 	rm -f $(INSTALLDIR)/usr/lib/gs-plugins-?/libgs_plugin_fedora*
+ifneq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+	rm -f $(INSTALLDIR)/usr/lib/gs-plugins-?/libgs_plugin_ubuntu*
+endif
+
+override_dh_installgsettings:
+	sed 's/@DISTRO@/$(DISTRO_ID)/g' debian/gnome-software.gsettings-override.in > debian/gnome-software.gsettings-override
+	dh_installgsettings
 
 override_dh_install:
 	dh_install -X.a -X.la --list-missing
@@ -35,3 +50,8 @@
 	dh_makeshlibs -Xlibgs_plugin
 
 override_dh_auto_test:
+	# DISABLED
+
+override_dh_clean:
+	rm -f debian/gnome-software.gsettings-override
+	dh_clean




More information about the pkg-gnome-commits mailing list