r50242 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Sep 10 00:56:31 2016
New Revision: 50242

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50242
Log:
Use idiomatic variables from default.mk dpkg include.
Bump Build-Depends on dpkg-dev to (>= 1.16.1).

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/control
    desktop/unstable/gtk+2.0/debian/control.in
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=50242&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog	[utf-8] Sat Sep 10 00:56:31 2016
@@ -8,6 +8,8 @@
     libgail-common. This was originally achieved via a .shlibs file but since
     we use a .symbols file nowadays, move this over there.
   * Remove an old shlibs.local hack which doesn't seem necessary anymore.
+  * Use idiomatic variables from default.mk dpkg include.
+    Bump Build-Depends on dpkg-dev to (>= 1.16.1).
 
  -- Michael Biebl <biebl at debian.org>  Sat, 10 Sep 2016 02:25:29 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=50242&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control	[utf-8] Sat Sep 10 00:56:31 2016
@@ -29,7 +29,7 @@
                libxfixes-dev (>= 1:3.0.0-3),
                libcairo2-dev (>= 1.6.4-6.1),
                gnome-pkg-tools (>= 0.11),
-               dpkg-dev (>= 1.16.0),
+               dpkg-dev (>= 1.16.1),
                x11proto-xext-dev,
                libcups2-dev (>= 1.2),
                gobject-introspection (>= 0.10.8-2),

Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=50242&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control.in	[utf-8] Sat Sep 10 00:56:31 2016
@@ -29,7 +29,7 @@
                libxfixes-dev (>= 1:3.0.0-3),
                libcairo2-dev (>= 1.6.4-6.1),
                gnome-pkg-tools (>= 0.11),
-               dpkg-dev (>= 1.16.0),
+               dpkg-dev (>= 1.16.1),
                x11proto-xext-dev,
                libcups2-dev (>= 1.2),
                gobject-introspection (>= 0.10.8-2),

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=50242&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules	[utf-8] Sat Sep 10 00:56:31 2016
@@ -6,7 +6,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DPKG_EXPORT_BUILDFLAGS = 1
--include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/default.mk
 
 GNOME_MODULE := gtk+
 
@@ -25,13 +25,6 @@
 DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 PARALLEL_FLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
 
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 DEB_BUILD_OPTIONS += multiarch
 # relative libdir
 ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
@@ -52,8 +45,6 @@
 # currently fails in the cups gtkprint backend
 #LDFLAGS += -Wl,-z,defs
 
-DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
 APIVER := 2.0
 SONAME := 0
 SHVER := 2.24.0
@@ -159,7 +150,7 @@
 devhelpfiles: debian/gtk-faq.devhelp debian/gtk-tutorial.devhelp
 
 debian/dh_gtkmodules.1: debian/dh_gtkmodules
-	cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1
+	cd debian && pod2man -c "Gtk" -r "$(DEB_VERSION)" dh_gtkmodules dh_gtkmodules.1
 
 patch: $(STAMP_DIR)/patch-stamp
 
@@ -222,7 +213,7 @@
 	sed \
 		-e "s#@SONAME@#$(SONAME)#g" \
 		-e "s#@APIVER@#$(APIVER)#g" \
-		-e "s#@VERSION@#$(VERSION)#g" \
+		-e "s#@VERSION@#$(DEB_VERSION_UPSTREAM)#g" \
 		-e "s#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \
 		-e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
 		-e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \