r54621 - in /desktop/unstable/vte2.91/debian: changelog control.in libvte-2.91-0-udeb.install libvte-2.91-0.docs libvte-2.91-common.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Oct 31 11:45:13 UTC 2017 

Author: biebl
Date: Tue Oct 31 11:45:13 2017
New Revision: 54621

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

Added:
    desktop/unstable/vte2.91/debian/libvte-2.91-0.docs
Modified:
    desktop/unstable/vte2.91/debian/changelog
    desktop/unstable/vte2.91/debian/control.in
    desktop/unstable/vte2.91/debian/libvte-2.91-0-udeb.install
    desktop/unstable/vte2.91/debian/libvte-2.91-common.install
    desktop/unstable/vte2.91/debian/rules

Modified: desktop/unstable/vte2.91/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/changelog?rev=54621&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/changelog	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/changelog	[utf-8] Tue Oct 31 11:45:13 2017
@@ -1,3 +1,9 @@
+vte2.91 (0.50.1-2) UNRELEASED; urgency=medium
+
+  * Convert from cdbs to dh
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 31 Oct 2017 12:44:49 +0100
+
 vte2.91 (0.50.1-1) unstable; urgency=medium
 
   * New upstream release

Modified: desktop/unstable/vte2.91/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/control.in?rev=54621&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/control.in	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/control.in	[utf-8] Tue Oct 31 11:45:13 2017
@@ -4,8 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 4.1.1
-Build-Depends: cdbs (>= 0.4.93~),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                gperf,
                dh-autoreconf,

Modified: desktop/unstable/vte2.91/debian/libvte-2.91-0-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/libvte-2.91-0-udeb.install?rev=54621&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/libvte-2.91-0-udeb.install	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/libvte-2.91-0-udeb.install	[utf-8] Tue Oct 31 11:45:13 2017
@@ -1 +1 @@
-usr/lib/libvte*.so.*
+usr/lib/*/libvte*.so.*

Added: desktop/unstable/vte2.91/debian/libvte-2.91-0.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/libvte-2.91-0.docs?rev=54621&op=file
==============================================================================
--- desktop/unstable/vte2.91/debian/libvte-2.91-0.docs	(added)
+++ desktop/unstable/vte2.91/debian/libvte-2.91-0.docs	[utf-8] Tue Oct 31 11:45:13 2017
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README

Modified: desktop/unstable/vte2.91/debian/libvte-2.91-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/libvte-2.91-common.install?rev=54621&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/libvte-2.91-common.install	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/libvte-2.91-common.install	[utf-8] Tue Oct 31 11:45:13 2017
@@ -1,3 +1,3 @@
+etc/profile.d/
 usr/share/locale
-debian/xterm usr/share/vte/termcap-2.91/
-etc/profile.d/
+../../../debian/xterm usr/share/vte/termcap-2.91/

Modified: desktop/unstable/vte2.91/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/rules?rev=54621&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/rules	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/rules	[utf-8] Tue Oct 31 11:45:13 2017
@@ -1,55 +1,58 @@
 #!/usr/bin/make -f
 
-libvte2.91N := $(shell sed -rn 's/^Package:[[:space:]]*(libvte-[0-9\.-]+)[[:space:]]*$$/\1/p' debian/control)
-udeb := $(libvte2.91N)-udeb
+LIB_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libvte-[0-9\.-]+)[[:space:]]*$$/\1/p' debian/control)
+UDEB_PKG := $(LIB_PKG)-udeb
+
 GNOME_MODULE = vte
 
-DEB_BUILDDIR = debian/build
-DEB_MAKE_FLAVORS = main udeb
-
-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-get-source.mk
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-# Ensure at build time that the library has no dependencies on undefined
-# symbols, and speed up loading.
-DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-include /usr/share/dpkg/default.mk
+%:
+	dh $@ --with autoreconf,gnome,gir
 
-DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvte2.91N)
-DEB_DH_MAKESHLIBS_ARGS_$(libvte2.91N) += --add-udeb=$(udeb) -- -c4
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_CONFIGURE_FLAGS_main += \
-	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+CONFFLAGS_deb = \
 	--enable-glade-catalogue \
 	--enable-gtk-doc \
 	--enable-introspection \
 	--with-gnutls
 
-# FIXME: not honoured
-#DEB_CONFIGURE_EXTRA_FLAGS_main += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-
-DEB_CONFIGURE_FLAGS_udeb += \
+CONFFLAGS_udeb = \
 	--disable-gtk-doc \
 	--without-gnutls
 
-DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp
-DEB_MAKE_DESTDIRSKEL_udeb = $(CURDIR)/debian/tmp/udeb
+override_dh_auto_configure:
+	dh_auto_configure --builddirectory=build-deb -- $(CONFFLAGS_deb)
+	dh_auto_configure --builddirectory=build-udeb -- $(CONFFLAGS_udeb)
 
-DEB_DH_INSTALL_ARGS_$(udeb) += --sourcedir=debian/tmp/udeb
+override_dh_auto_build:
+	dh_auto_build --builddirectory=build-deb
+	dh_auto_build --builddirectory=build-udeb
 
-# FIXME: not honoured
-#CFLAGS_udeb += $(CFLAGS) -Os
-CFLAGS += $(if $(findstring udeb,$(cdbs_make_curflavor)),-Os)
+override_dh_auto_install:
+	dh_auto_install --builddirectory=build-deb \
+		--destdir=debian/tmp/deb
+	dh_auto_install --builddirectory=build-udeb \
+		--destdir=debian/tmp/udeb
 
-binary-install/libvte-2.91-common::
+override_dh_auto_clean:
+	dh_auto_clean --builddirectory=build-deb
+	dh_auto_clean --builddirectory=build-udeb
+
+override_dh_clean:
+	dh_clean
+	rm -f src/app.c
+
+override_dh_makeshlibs:
+	dh_makeshlibs -p$(LIB_PKG) --add-udeb=$(UDEB_PKG) -- -c4
+	dh_makeshlibs --remaining-packages
+
+override_dh_install:
+	dh_install -p$(UDEB_PKG) --sourcedir=debian/tmp/udeb
+	dh_install --remaining --sourcedir=debian/tmp/deb --list-missing
 	mv debian/libvte-2.91-common/etc/profile.d/vte.sh \
 		debian/libvte-2.91-common/etc/profile.d/vte-2.91.sh
-
-# List any files which are not installed
-common-binary-post-install-arch:: list-missing

More information about the pkg-gnome-commits mailing list