[SCM] libmatekbd Debian package branch, master, updated. cf3b45b28c5fc25b6411f0f4d184d7b9ddb3b5b6

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/libmatekbd.git;a=commitdiff;h=ec81357

The following commit has been merged in the master branch:
commit ec813573f2d56af6f121b1bc02ca55f917744d7b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 6 10:52:32 2014 +0100

    debian/rules: Build package using autogen.sh. Remove get-orig-source hack for previous wrong 1.7 uploads. Don't care about build-modified files in upstream source tree.
---
 debian/rules | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2c367a4..e3c857a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,38 +1,25 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_install:
 	dh_install --list-missing
 
 override_dh_auto_configure:
-	cp libmatekbd/matekbd-indicator-marshal.c libmatekbd/matekbd-indicator-marshal.c.keep
-	cp libmatekbd/matekbd-keyboard-drawing-marshal.c libmatekbd/matekbd-keyboard-drawing-marshal.c.keep
+	# upstream tarball is without configure. autogen.sh will create it
+	NOCONFIGURE=1 ./autogen.sh
 	dh_auto_configure -- \
 		--disable-static
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V 'libmatekbd4 (>= 1.6.1)'
+	dh_makeshlibs -V 'libmatekbd4 (>= 1.8.0)'
 
 override_dh_strip:
-	dh_strip --dbg-package=libmatekbd-dbg
+	dh_strip -plibmatekbd4 --dbg-package=libmatekbd4-dbg
 
 override_dh_auto_clean:
-	-mv libmatekbd/matekbd-indicator-marshal.c.keep libmatekbd/matekbd-indicator-marshal.c
-	-mv libmatekbd/matekbd-keyboard-drawing-marshal.c.keep libmatekbd/matekbd-keyboard-drawing-marshal.c
 	dh_auto_clean
 
-PKD      = $(abspath $(dir $(MAKEFILE_LIST)))
-PKG      = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-UVER     = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
-REALUVER = $(shell echo $(UVER) | sed -e s/1.7.1.is.//)
-
 get-orig-source:
-# keep this if clause as long 1.6.x of libmatekbd upstream is packaged
-	if [ "$(UVER)" = "1.7.1.is.$(REALUVER)" ]; then \
-	    uscan --noconf --force-download --rename --download-version $(REALUVER) --destdir=.. ; \
-	    mv -v ../$(PKG)_$(REALUVER).orig.tar.xz ../$(PKG)_$(UVER).orig.tar.xz; \
-	else \
-	    uscan --noconf --force-download --rename --download-current-version --destdir=.. ; \
-	fi
+	uscan --noconf --force-download --rename --download-current-version --destdir=..

-- 
libmatekbd Debian package