[Python-modules-commits] r18746 - in packages/python-peak.rules/trunk/debian (5 files)

eriol-guest at users.alioth.debian.org eriol-guest at users.alioth.debian.org
Wed Sep 28 01:58:54 UTC 2011 

    Date: Wednesday, September 28, 2011 @ 01:58:53
  Author: eriol-guest
Revision: 18746

Switched to multiple upstream tarballs

Modified:
  packages/python-peak.rules/trunk/debian/changelog
  packages/python-peak.rules/trunk/debian/rules
  packages/python-peak.rules/trunk/debian/watch
Deleted:
  packages/python-peak.rules/trunk/debian/get-orig-source.mk
  packages/python-peak.rules/trunk/debian/peak.rules.watch

Modified: packages/python-peak.rules/trunk/debian/changelog
===================================================================
--- packages/python-peak.rules/trunk/debian/changelog	2011-09-28 01:46:08 UTC (rev 18745)
+++ packages/python-peak.rules/trunk/debian/changelog	2011-09-28 01:58:53 UTC (rev 18746)
@@ -1,6 +1,7 @@
 python-peak.rules (0.5a1+r2707-1) unstable; urgency=low
 
   * New upstream release
+  * Switched to multiple upstream tarballs
   * debian/control
     - Set myself as uploader with Stefano Zacchiroli's permission.
       Thanks to Stefano Zacchiroli for his past work!
@@ -9,8 +10,10 @@
       of multiple setup.py in subdir provided by Stefano Zacchiroli
   * debian/source/format
     - Switched to source format 3.0 (quilt)
+  * debian/watch
+    - Added filenamemangle option
 
- -- Daniele Tricoli <eriol at mornie.org>  Wed, 28 Sep 2011 03:09:47 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Wed, 28 Sep 2011 03:47:28 +0200
 
 python-peak.rules (0.5a1+r2600-1) unstable; urgency=low
 

Deleted: packages/python-peak.rules/trunk/debian/get-orig-source.mk
===================================================================
--- packages/python-peak.rules/trunk/debian/get-orig-source.mk	2011-09-28 01:46:08 UTC (rev 18745)
+++ packages/python-peak.rules/trunk/debian/get-orig-source.mk	2011-09-28 01:58:53 UTC (rev 18746)
@@ -1,40 +0,0 @@
-# debian/rules snippet for creating multi-upstream tarball relying on
-# several debian/*.watch files
-
-# XXX: adapted to use as version number those returned by the "main"
-# debian/watch
-
-# Copyright © 2009 Stefano Zacchiroli <zack at debian.org>
-# License: GNU GPL version 3 or above
-# Created: Sat, 30 May 2009 11:58:16 +0200
-# Last-Modified: Sat, 20 Jun 2009 12:59:10 +0200
-
-# TODO: does not yet fully implement policy wrt get-orig-source:
-#       - the target cannot be invoked from any dir (rely on "debian/")
-#       - tmpdir handling is not fully safe (e.g., no "mktemp -d")
-
-GOSTMP = get-orig-source.tmp
-ORIGVERSION := $(shell uscan --report --dehs | grep '<upstream-version>' | sed 's/<[^>]\+>//g')
-ORIGNAME = $(PKG)-$(ORIGVERSION)
-ORIGTARBALL = $(PKG)_$(ORIGVERSION).orig.tar.gz
-
-get-orig-source: $(patsubst %,%/get-orig-source,$(UPSTREAMS))
-	cd $(GOSTMP) && \
-	mkdir $(ORIGNAME) && \
-	for p in $(UPSTREAMS) ; do \
-		mv `readlink $$p` $(ORIGNAME) ; \
-		mv $$p $(ORIGNAME) ; \
-	done && \
-	tar cvzf $(ORIGTARBALL) $(ORIGNAME) && \
-	mv $(ORIGTARBALL) ../ && \
-	cd .. && \
-	rm -rf $(GOSTMP)/
-$(GOSTMP):
-	-mkdir $@
-%/get-orig-source: $(GOSTMP)
-	uscan --watchfile debian/$*.watch \
-		--upstream-version 0 --package $* \
-		--download --destdir $(GOSTMP)/
-	cd $(GOSTMP) && \
-	tar xzf $**.orig.tar.gz && \
-	ln -s `tar tzf $**.orig.tar.gz | head -n1` $*

Deleted: packages/python-peak.rules/trunk/debian/peak.rules.watch
===================================================================
--- packages/python-peak.rules/trunk/debian/peak.rules.watch	2011-09-28 01:46:08 UTC (rev 18745)
+++ packages/python-peak.rules/trunk/debian/peak.rules.watch	2011-09-28 01:58:53 UTC (rev 18746)
@@ -1,5 +0,0 @@
-# this file comes with two copies: debian/watch and debian/peak.rules.watch
-# will go away with symlink support in dpkg-* soon; in the meantime update both
-version=3
-opts="uversionmangle=s/\.dev-(r\d+)/+$1/" \
-http://peak.telecommunity.com/snapshots/PEAK-Rules-([0-9a-z.-]+)\.tar\.gz

Modified: packages/python-peak.rules/trunk/debian/rules
===================================================================
--- packages/python-peak.rules/trunk/debian/rules	2011-09-28 01:46:08 UTC (rev 18745)
+++ packages/python-peak.rules/trunk/debian/rules	2011-09-28 01:58:53 UTC (rev 18746)
@@ -4,12 +4,15 @@
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 PKG = python-peak.rules
-UPSTREAMS = \
-	peak.rules \
-	prioritized_methods \
-	$(NULL)
-export SUBDIRS = $(UPSTREAMS)
+VERSION = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | sed 's,-.*,,')
+TARBALLS_DIR = $$PWD"/../tarballs/"
 
+PRIORITIZED_METHODS = prioritized_methods-0.2.2dev-20110830
+
+DEB_PRIORITIZED_METHODS_DIR = $(subst _,-,$(subst .,-,$(PRIORITIZED_METHODS)))
+
+export SUBDIRS = rules $(DEB_PRIORITIZED_METHODS_DIR)
+
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
 # avoid installing useless *.pth files
@@ -19,9 +22,23 @@
 # Generate README for prioritized_methods out of its PKG-INFO.
 # It will be installed by dh_installdocs
 build/$(PKG)::
-	egrep -i '^( |description:)' prioritized_methods/PKG-INFO > \
+	egrep -i '^( |description:)' $(DEB_PRIORITIZED_METHODS_DIR)/PKG-INFO > \
 		README.prioritized_methods.txt
 clean::
 	rm -f README.prioritized_methods.txt
 
--include debian/get-orig-source.mk
+get-orig-source:
+	set -e; \
+	uscan --force-download --destdir $(TARBALLS_DIR) --no-symlink;
+
+	uscan --no-conf \
+		--watchfile debian/`echo $(PRIORITIZED_METHODS) | cut -d- -f1`.watch \
+		--upstream-version 0 --download-version `echo $(PRIORITIZED_METHODS) | cut -d- -f2,3` \
+		--download --destdir $(TARBALLS_DIR)/ --no-symlink; \
+	mv $(TARBALLS_DIR)/$(PRIORITIZED_METHODS).tar.gz \
+		$(TARBALLS_DIR)/$(PKG)_$(VERSION).orig-`echo $(PRIORITIZED_METHODS) | tr ._ -`.tar.gz; \
+
+	# Create manually the empty main package
+	mkdir $(TARBALLS_DIR)/$(PKG)-$(VERSION)
+	cd $(TARBALLS_DIR); tar czf $(PKG)_$(VERSION).orig.tar.gz $(PKG)-$(VERSION)
+	rmdir $(TARBALLS_DIR)/$(PKG)-$(VERSION)

Modified: packages/python-peak.rules/trunk/debian/watch
===================================================================
--- packages/python-peak.rules/trunk/debian/watch	2011-09-28 01:46:08 UTC (rev 18745)
+++ packages/python-peak.rules/trunk/debian/watch	2011-09-28 01:58:53 UTC (rev 18746)
@@ -1,5 +1,3 @@
-# this file comes with two copies: debian/watch and debian/peak.rules.watch
-# will go away with symlink support in dpkg-* soon; in the meantime update both
 version=3
-opts="uversionmangle=s/\.dev-(r\d+)/+$1/" \
+opts=uversionmangle=s/\.dev-(r\d+)/+$1/,filenamemangle=s/PEAK-Rules-([0-9a-z.-]+)\.dev-(r\d+).tar.gz/python-peak.rules_$1+$2.orig-rules.tar.gz/ \
 http://peak.telecommunity.com/snapshots/PEAK-Rules-([0-9a-z.-]+)\.tar\.gz

More information about the Python-modules-commits mailing list