r50152 - in /desktop/unstable/cheese/debian: changelog cheese.docs cheese.install control control.in docs rules

Tue Sep 6 20:17:07 UTC 2016

Author: biebl
Date: Tue Sep  6 20:17:07 2016
New Revision: 50152

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

Added:
    desktop/unstable/cheese/debian/cheese.docs
      - copied, changed from r50151, desktop/unstable/cheese/debian/docs
Removed:
    desktop/unstable/cheese/debian/docs
Modified:
    desktop/unstable/cheese/debian/changelog
    desktop/unstable/cheese/debian/cheese.install
    desktop/unstable/cheese/debian/control
    desktop/unstable/cheese/debian/control.in
    desktop/unstable/cheese/debian/rules

Modified: desktop/unstable/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/changelog?rev=50152&op=diff
==============================================================================

--- desktop/unstable/cheese/debian/changelog	[utf-8] (original)
+++ desktop/unstable/cheese/debian/changelog	[utf-8] Tue Sep  6 20:17:07 2016
@@ -6,6 +6,7 @@
 
   [ Michael Biebl ]
   * New upstream release.
+  * Convert from cdbs to dh.
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 22 Jun 2016 15:46:17 -0400
 

Copied: desktop/unstable/cheese/debian/cheese.docs (from r50151, desktop/unstable/cheese/debian/docs)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/cheese.docs?rev=50152&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/docs	[utf-8] (original)
+++ desktop/unstable/cheese/debian/cheese.docs	[utf-8] Tue Sep  6 20:17:07 2016
@@ -1 +1,3 @@
+AUTHORS
+NEWS
 README

Modified: desktop/unstable/cheese/debian/cheese.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/cheese.install?rev=50152&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/cheese.install	[utf-8] (original)
+++ desktop/unstable/cheese/debian/cheese.install	[utf-8] Tue Sep  6 20:17:07 2016
@@ -3,4 +3,4 @@
 usr/share/man
 usr/share/appdata/*.appdata.xml
 usr/share/dbus-1/services/*.service
-usr/lib/cheese/gnome-camera-service
+usr/lib/*/cheese/gnome-camera-service

Modified: desktop/unstable/cheese/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/control?rev=50152&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/control	[utf-8] (original)
+++ desktop/unstable/cheese/debian/control	[utf-8] Tue Sep  6 20:17:07 2016
@@ -6,14 +6,14 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Standards-Version: 3.9.8
 Homepage: https://wiki.gnome.org/Apps/Cheese
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cheese/
-Build-Depends: cdbs (>= 0.4.93~),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
+               xvfb, xauth,
                docbook-xsl,
                gnome-common,
                gnome-pkg-tools (>= 0.10),

Modified: desktop/unstable/cheese/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/control.in?rev=50152&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/control.in	[utf-8] (original)
+++ desktop/unstable/cheese/debian/control.in	[utf-8] Tue Sep  6 20:17:07 2016
@@ -7,8 +7,7 @@
 Homepage: https://wiki.gnome.org/Apps/Cheese
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/cheese/
-Build-Depends: cdbs (>= 0.4.93~),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                docbook-xsl,
                gnome-common,

Modified: desktop/unstable/cheese/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/rules?rev=50152&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/rules	[utf-8] (original)
+++ desktop/unstable/cheese/debian/rules	[utf-8] Tue Sep  6 20:17:07 2016
@@ -1,22 +1,29 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.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
 
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-common-binary-post-install-arch:: list-missing
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+%:
+	dh $@ --with autoreconf,gnome,gir
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir=\$${libdir}/cheese
 
-clean::
+override_dh_install:
+	dh_install --list-missing
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V -- -c4
+
+override_dh_clean:
+	dh_clean
 	rm -rf *vala.stamp
 	rm -rf src/*.c
+
+# Disable test-suite, requires a working GL/EGL environment
+override_dh_auto_test:


