[Pkg-cli-apps-commits] r5275 - in /packages/gfax/trunk/debian: changelog rules watch

[directhex at users.alioth.debian.org]

Author: directhex
Date: Fri Jan 29 13:07:56 2010
New Revision: 5275

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5275
Log:
debian/stripper
remove unwanted dh_desktop call

Modified:
    packages/gfax/trunk/debian/changelog
    packages/gfax/trunk/debian/rules
    packages/gfax/trunk/debian/watch

Modified: packages/gfax/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/changelog?rev=5275&op=diff
==============================================================================
--- packages/gfax/trunk/debian/changelog (original)
+++ packages/gfax/trunk/debian/changelog Fri Jan 29 13:07:56 2010
@@ -1,9 +1,10 @@
-gfax (0.7.7-1) UNRELEASED; urgency=low
+gfax (0.7.7+ds-1) UNRELEASED; urgency=low
 
   [ Iain Lane ]
   * New upstream release 0.7.7 (Closes: #542559)
 
   [ Jo Shields ]
+  * Debian Source repack (upstream bundles a debian/ folder)
   * debian/patches/02_libgnomeprint_path,
     debian/patches/03_fix_gconf-sharp-peditors_linkage,
     debian/patches/04_fix_Process_ambiguous_reference,
@@ -25,6 +26,8 @@
     + Use mono-csc from mono-devel 2.4.3 as compiler command
   * debian/rules:
     + Stop manually passing gnomeprint nonsense to dh_gencontrol
+    + Remove pointless dh_desktop call
+    + Rework get-orig-source rule to handle removing debian/
 
  -- Jo Shields <directhex at apebox.org>  Fri, 29 Jan 2010 11:31:56 +0000
 

Modified: packages/gfax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/rules?rev=5275&op=diff
==============================================================================
--- packages/gfax/trunk/debian/rules (original)
+++ packages/gfax/trunk/debian/rules Fri Jan 29 13:07:56 2010
@@ -9,7 +9,13 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1)
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
+SOURCE_DIR = $(DEBIAN_DIR)/..
+
+DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)
+DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
+VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+ds.*//')
 
 CFLAGS = -Wall -g
 
@@ -73,7 +79,6 @@
 	dh_installmenu -i
 	dh_installman -i
 	dh_gconf -i
-	dh_desktop -i
 	dh_link -i
 	dh_strip -i
 	dh_clistrip -i
@@ -94,9 +99,23 @@
 get-orig-source:
 	[ -d ../tarballs ] || mkdir ../tarballs
 	uscan \
+		--package $(DEB_SOURCE_NAME) \
+		--watchfile $(DEBIAN_DIR)/watch \
+		--upstream-version $(VERSION) \
+		--download-version $(VERSION) \
+		--destdir . \
 		--force-download \
-		--download-version $(CURVER) \
 		--rename \
-		--destdir ../tarballs
+		--repack
+	if [ -d $(DEB_SOURCE_NAME)-$(VERSION) ]; then \
+		echo "$(DEB_SOURCE_NAME)-$(VERSION) is in the way, bailing out!"; \
+		exit 1; \
+	fi
+	tar -xzf $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
+	rm $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
+	rm -fr $(DEB_SOURCE_NAME)-$(VERSION)/debian/
+	tar --mtime=@1255820400 -cf ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION)+ds.orig.tar $(DEB_SOURCE_NAME)-$(VERSION)
+	gzip -9fn ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION)+ds.orig.tar
+	rm -r $(DEB_SOURCE_NAME)-$(VERSION)
 
 .PHONY: build clean binary-indep binary-arch binary install patch unpatch

Modified: packages/gfax/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gfax/trunk/debian/watch?rev=5275&op=diff
==============================================================================
--- packages/gfax/trunk/debian/watch (original)
+++ packages/gfax/trunk/debian/watch Fri Jan 29 13:07:56 2010
@@ -1,2 +1,3 @@
-version=3
-http://gfax.cowlug.org/ gfax-([\d\.]+)\.tar\.gz
+version=2
+opts=dversionmangle=s/\+ds// \
+	http://gfax.cowlug.org/gfax-([\d\.]+)\.tar\.gz