r49286 - in /desktop/unstable/gnome-online-accounts/debian: changelog control control.in gnome-online-accounts.docs gnome-online-accounts.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Jul 8 12:05:57 UTC 2016


Author: biebl
Date: Fri Jul  8 12:05:57 2016
New Revision: 49286

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

Added:
    desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.docs
Modified:
    desktop/unstable/gnome-online-accounts/debian/changelog
    desktop/unstable/gnome-online-accounts/debian/control
    desktop/unstable/gnome-online-accounts/debian/control.in
    desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.install
    desktop/unstable/gnome-online-accounts/debian/rules

Modified: desktop/unstable/gnome-online-accounts/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-online-accounts/debian/changelog?rev=49286&op=diff
==============================================================================
--- desktop/unstable/gnome-online-accounts/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-online-accounts/debian/changelog	[utf-8] Fri Jul  8 12:05:57 2016
@@ -1,6 +1,7 @@
 gnome-online-accounts (3.20.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 08 Jul 2016 13:33:27 +0200
 

Modified: desktop/unstable/gnome-online-accounts/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-online-accounts/debian/control?rev=49286&op=diff
==============================================================================
--- desktop/unstable/gnome-online-accounts/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-online-accounts/debian/control	[utf-8] Fri Jul  8 12:05:57 2016
@@ -7,8 +7,7 @@
 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 (>= 0.4.93~),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gnome-common,
                gnome-pkg-tools (>= 0.10),

Modified: desktop/unstable/gnome-online-accounts/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-online-accounts/debian/control.in?rev=49286&op=diff
==============================================================================
--- desktop/unstable/gnome-online-accounts/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-online-accounts/debian/control.in	[utf-8] Fri Jul  8 12:05:57 2016
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.93~),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gnome-common,
                gnome-pkg-tools (>= 0.10),

Added: desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.docs?rev=49286&op=file
==============================================================================
--- desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.docs	(added)
+++ desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.docs	[utf-8] Fri Jul  8 12:05:57 2016
@@ -0,0 +1,2 @@
+NEWS
+README

Modified: desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.install?rev=49286&op=diff
==============================================================================
--- desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.install	[utf-8] (original)
+++ desktop/unstable/gnome-online-accounts/debian/gnome-online-accounts.install	[utf-8] Fri Jul  8 12:05:57 2016
@@ -1,6 +1,6 @@
 /usr/lib/*/goa-1.0/web-extensions/libgoawebextension.so
-usr/lib/gnome-online-accounts/goa-daemon
-usr/lib/gnome-online-accounts/goa-identity-service
+usr/lib/*/gnome-online-accounts/goa-daemon
+usr/lib/*/gnome-online-accounts/goa-identity-service
 usr/share/dbus-1/services/org.gnome.Identity.service
 usr/share/dbus-1/services/org.gnome.OnlineAccounts.service
 usr/share/icons

Modified: desktop/unstable/gnome-online-accounts/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-online-accounts/debian/rules?rev=49286&op=diff
==============================================================================
--- desktop/unstable/gnome-online-accounts/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-online-accounts/debian/rules	[utf-8] Fri Jul  8 12:05:57 2016
@@ -1,33 +1,31 @@
 #!/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_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
+%:
+	dh $@ --with autoreconf,gir,gnome
 
-GNOME_MODULE := gnome-online-accounts
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir=\$${libdir}/gnome-online-accounts \
+		--enable-gtk-doc \
+		--enable-kerberos \
+		--enable-media-server \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-windows-live \
+		--enable-google \
+		--enable-owncloud \
+		--enable-pocket \
+		--enable-imap-smtp \
+		--enable-exchange \
+		--enable-foursquare
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+override_dh_install:
+	dh_install --list-missing
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
-  --enable-kerberos \
-  --enable-media-server \
-  --enable-facebook \
-  --enable-flickr \
-  --enable-windows-live \
-  --enable-google \
-  --enable-owncloud \
-  --enable-pocket \
-  --enable-imap-smtp \
-  --enable-exchange \
-  --enable-foursquare
+override_dh_makeshlibs:
+	dh_makeshlibs -V -- -c4
 
-# List any files which are not installed
-common-binary-post-install-arch:: list-missing




More information about the pkg-gnome-commits mailing list