r49728 - in /desktop/unstable/cogl/debian: changelog control control.in libcogl20.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Aug 29 22:31:55 2016
New Revision: 49728

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

Added:
    desktop/unstable/cogl/debian/libcogl20.docs
Modified:
    desktop/unstable/cogl/debian/changelog
    desktop/unstable/cogl/debian/control
    desktop/unstable/cogl/debian/control.in
    desktop/unstable/cogl/debian/rules

Modified: desktop/unstable/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/changelog?rev=49728&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/changelog	[utf-8] (original)
+++ desktop/unstable/cogl/debian/changelog	[utf-8] Mon Aug 29 22:31:55 2016
@@ -7,6 +7,7 @@
   * New upstream release.
   * Drop 0001-kms-winsys-don-t-wait-for-a-flip-when-page-flipping-.patch,
     merged upstream.
+  * Convert from cdbs to dh.
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 06 Jul 2016 01:10:21 -0400
 

Modified: desktop/unstable/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control?rev=49728&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control	[utf-8] (original)
+++ desktop/unstable/cogl/debian/control	[utf-8] Mon Aug 29 22:31:55 2016
@@ -6,9 +6,8 @@
 Section: libs
 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>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
 Build-Depends: debhelper (>= 9),
-               cdbs (>= 0.4.93~),
                dh-autoreconf,
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.13),

Modified: desktop/unstable/cogl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control.in?rev=49728&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control.in	[utf-8] (original)
+++ desktop/unstable/cogl/debian/control.in	[utf-8] Mon Aug 29 22:31:55 2016
@@ -4,7 +4,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@, Rico Tzschichholz <ricotz at ubuntu.com>
 Build-Depends: debhelper (>= 9),
-               cdbs (>= 0.4.93~),
                dh-autoreconf,
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.13),

Added: desktop/unstable/cogl/debian/libcogl20.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/libcogl20.docs?rev=49728&op=file
==============================================================================
--- desktop/unstable/cogl/debian/libcogl20.docs	(added)
+++ desktop/unstable/cogl/debian/libcogl20.docs	[utf-8] Mon Aug 29 22:31:55 2016
@@ -0,0 +1,2 @@
+NEWS
+README

Modified: desktop/unstable/cogl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/rules?rev=49728&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/rules	[utf-8] (original)
+++ desktop/unstable/cogl/debian/rules	[utf-8] Mon Aug 29 22:31:55 2016
@@ -1,45 +1,39 @@
 #!/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/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-GNOME_MODULE = cogl
-
-DEB_DH_MAKESHLIBS_ARGS_libcogl20 += -V -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcogl-path20 += -V -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcogl-pango20 += -V -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcogl-gles2-20 += -V -- -c4
-
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-	--enable-gtk-doc \
-	--enable-gdk-pixbuf \
-	--enable-cogl-pango \
-	--enable-introspection=yes \
-	--enable-gl=yes \
-	--enable-cogl-gst=yes
-
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
-        DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gles2
+CONFFLAGS = --with-default-driver=gles2
 else
-        DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gl
+CONFFLAGS = --with-default-driver=gl
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--enable-xlib-egl-platform=yes \
-	--enable-cogl-gles2=yes \
-	--with-gles2-libname=libGLESv2.so.2 \
-	--enable-gles2=yes
-
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-DEB_CONFIGURE_EXTRA_FLAGS += \
+CONFFLAGS += \
 	--enable-wayland-egl-platform \
 	--enable-wayland-egl-server \
-	--enable-kms-egl-platform=yes
+	--enable-kms-egl-platform
 endif
 
-common-binary-predeb-arch:: list-missing
+%:
+	dh $@ --with autoreconf,gir,gnome
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-gtk-doc \
+		--enable-gdk-pixbuf \
+		--enable-cogl-pango \
+		--enable-introspection \
+		--enable-gl \
+		--enable-cogl-gst \
+		--enable-xlib-egl-platform \
+		--enable-cogl-gles2 \
+		--enable-gles2 \
+		--with-gles2-libname=libGLESv2.so.2 \
+		$(CONFFLAGS)
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V -- -c4
+
+override_dh_install:
+	dh_install --list-missing