r50422 - in /desktop/unstable/vino/debian: changelog control control.in docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Sep 13 14:39:56 2016
New Revision: 50422

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

Modified:
    desktop/unstable/vino/debian/changelog
    desktop/unstable/vino/debian/control
    desktop/unstable/vino/debian/control.in
    desktop/unstable/vino/debian/docs
    desktop/unstable/vino/debian/rules

Modified: desktop/unstable/vino/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/changelog?rev=50422&op=diff
==============================================================================
--- desktop/unstable/vino/debian/changelog	[utf-8] (original)
+++ desktop/unstable/vino/debian/changelog	[utf-8] Tue Sep 13 14:39:56 2016
@@ -4,6 +4,7 @@
   * Add Build-Depends on libice-dev and libsm-dev as per configure.ac.
   * Add Build-Depends on systemd on Linux to get the correct path for the
     systemd user unit directory.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 13 Sep 2016 16:20:23 +0200
 

Modified: desktop/unstable/vino/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/control?rev=50422&op=diff
==============================================================================
--- desktop/unstable/vino/debian/control	[utf-8] (original)
+++ desktop/unstable/vino/debian/control	[utf-8] Tue Sep 13 14:39:56 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.41),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.50.0),
                libavahi-client-dev (>= 0.6),

Modified: desktop/unstable/vino/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/control.in?rev=50422&op=diff
==============================================================================
--- desktop/unstable/vino/debian/control.in	[utf-8] (original)
+++ desktop/unstable/vino/debian/control.in	[utf-8] Tue Sep 13 14:39:56 2016
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.50.0),
                libavahi-client-dev (>= 0.6),

Modified: desktop/unstable/vino/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/docs?rev=50422&op=diff
==============================================================================
--- desktop/unstable/vino/debian/docs	[utf-8] (original)
+++ desktop/unstable/vino/debian/docs	[utf-8] Tue Sep 13 14:39:56 2016
@@ -1,2 +1,3 @@
+AUTHORS
 NEWS
 README

Modified: desktop/unstable/vino/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/rules?rev=50422&op=diff
==============================================================================
--- desktop/unstable/vino/debian/rules	[utf-8] (original)
+++ desktop/unstable/vino/debian/rules	[utf-8] Tue Sep 13 14:39:56 2016
@@ -1,21 +1,24 @@
 #! /usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.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-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS +=	\
-	--enable-ipv6		\
-	--with-avahi		\
-	--with-jpeg		\
-	--with-libnotify	\
-	--with-gcrypt		\
-	--with-gnutls		\
-	--with-gnome-keyring	\
-	--with-telepathy	\
-	--with-zlib
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-# drop unneeded ELF deps
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+%:
+	dh $@ --with autoreconf,gnome
 
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir=\$${libdir}/vino \
+		--enable-ipv6 \
+		--with-avahi \
+		--with-jpeg \
+		--with-libnotify \
+		--with-gcrypt \
+		--with-gnutls \
+		--with-gnome-keyring \
+		--with-telepathy \
+		--with-zlib