r49960 - in /desktop/unstable/gnome-terminal/debian: changelog control.in gnome-terminal.docs rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Sep 1 15:04:34 UTC 2016


Author: biebl
Date: Thu Sep  1 15:04:33 2016
New Revision: 49960

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

Added:
    desktop/unstable/gnome-terminal/debian/gnome-terminal.docs
Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/control.in
    desktop/unstable/gnome-terminal/debian/rules

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=49960&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Thu Sep  1 15:04:33 2016
@@ -1,6 +1,7 @@
 gnome-terminal (3.21.90-2) UNRELEASED; urgency=medium
 
   * Upload to unstable.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 01 Sep 2016 15:30:22 +0200
 

Modified: desktop/unstable/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control.in?rev=49960&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control.in	[utf-8] Thu Sep  1 15:04:33 2016
@@ -4,8 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.8
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                dh-exec,
                gnome-common,

Added: desktop/unstable/gnome-terminal/debian/gnome-terminal.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/gnome-terminal.docs?rev=49960&op=file
==============================================================================
--- desktop/unstable/gnome-terminal/debian/gnome-terminal.docs	(added)
+++ desktop/unstable/gnome-terminal/debian/gnome-terminal.docs	[utf-8] Thu Sep  1 15:04:33 2016
@@ -0,0 +1,2 @@
+AUTHORS
+NEWS

Modified: desktop/unstable/gnome-terminal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/rules?rev=49960&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/rules	[utf-8] Thu Sep  1 15:04:33 2016
@@ -1,28 +1,34 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-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/cdbs/1/rules/autoreconf.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
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-distro-packaging
+%:
+	dh $@ --with autoreconf,gnome
+
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-    DEB_CONFIGURE_EXTRA_FLAGS += --disable-search-provider
+CONFFLAGS = --disable-search-provider
 endif
 
-# this is a plugin (loadable module), not version "nautilus" of libterminal
-# https://bugs.debian.org/204975
-DEB_DH_MAKESHLIBS_ARGS_ALL = -X/usr/lib/nautilus/extensions-3.0/libterminal-nautilus.so
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=\$${prefix}/lib \
+		--libexecdir=\$${libdir}/gnome-terminal \
+		--enable-distro-packaging \
+		$(CONFFLAGS)
 
-build/gnome-terminal::
+override_dh_auto_build:
+	dh_auto_build
 	/usr/bin/docbook-to-man debian/gnome-terminal.sgml > debian/gnome-terminal.1
 
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f debian/gnome-terminal.1
+
+override_dh_install:
+	dh_install --list-missing




More information about the pkg-gnome-commits mailing list