[Python-modules-commits] r18468 - in packages/python-peak.util/trunk/debian (7 files)

eriol-guest at users.alioth.debian.org eriol-guest at users.alioth.debian.org
Thu Sep 8 22:40:40 UTC 2011 

    Date: Thursday, September 8, 2011 @ 22:40:38
  Author: eriol-guest
Revision: 18468

Switched to multiple upstream tarballs

Modified:
  packages/python-peak.util/trunk/debian/changelog
  packages/python-peak.util/trunk/debian/peak.util-addons.watch
  packages/python-peak.util/trunk/debian/peak.util-bytecodeassembler.watch
  packages/python-peak.util/trunk/debian/peak.util-extremes.watch
  packages/python-peak.util/trunk/debian/peak.util-symboltype.watch
  packages/python-peak.util/trunk/debian/python-peak.util.install
  packages/python-peak.util/trunk/debian/rules

Modified: packages/python-peak.util/trunk/debian/changelog
===================================================================
--- packages/python-peak.util/trunk/debian/changelog	2011-09-08 18:52:00 UTC (rev 18467)
+++ packages/python-peak.util/trunk/debian/changelog	2011-09-08 22:40:38 UTC (rev 18468)
@@ -1,6 +1,7 @@
-python-peak.util (20110610-1) UNRELEASED; urgency=low
+python-peak.util (20110909-1) UNRELEASED; urgency=low
 
-  * Regenerated orig tarball to get:
+  * Switched to multiple upstream tarballs
+  * Updated upstream packages:
     - peak.util.addons 0.7
     - peak.util.assembler 0.6 (Closes: #606382, LP: #795096)
   * debian/control
@@ -16,7 +17,7 @@
   * debian/source/format
     - Switched to source format 3.0 (quilt)
 
- -- Daniele Tricoli <eriol at mornie.org>  Tue, 14 Jun 2011 00:44:59 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Fri, 09 Sep 2011 00:11:08 +0200
 
 python-peak.util (20090610-3) unstable; urgency=low
 

Modified: packages/python-peak.util/trunk/debian/peak.util-addons.watch
===================================================================
--- packages/python-peak.util/trunk/debian/peak.util-addons.watch	2011-09-08 18:52:00 UTC (rev 18467)
+++ packages/python-peak.util/trunk/debian/peak.util-addons.watch	2011-09-08 22:40:38 UTC (rev 18468)
@@ -1,2 +1,3 @@
 version=3
+opts=filenamemangle=s/AddOns-([0-9a-z.]+).zip/peak.util-addons-$1.zip/ \
 http://pypi.python.org/packages/source/A/AddOns/AddOns-([0-9a-z.]+)\.zip

Modified: packages/python-peak.util/trunk/debian/peak.util-bytecodeassembler.watch
===================================================================
--- packages/python-peak.util/trunk/debian/peak.util-bytecodeassembler.watch	2011-09-08 18:52:00 UTC (rev 18467)
+++ packages/python-peak.util/trunk/debian/peak.util-bytecodeassembler.watch	2011-09-08 22:40:38 UTC (rev 18468)
@@ -1,2 +1,3 @@
 version=3
+opts=filenamemangle=s/BytecodeAssembler-([0-9a-z.]+).zip/peak.util-bytecodeassembler-$1.zip/ \
 http://pypi.python.org/packages/source/B/BytecodeAssembler/BytecodeAssembler-([0-9a-z.]+)\.zip

Modified: packages/python-peak.util/trunk/debian/peak.util-extremes.watch
===================================================================
--- packages/python-peak.util/trunk/debian/peak.util-extremes.watch	2011-09-08 18:52:00 UTC (rev 18467)
+++ packages/python-peak.util/trunk/debian/peak.util-extremes.watch	2011-09-08 22:40:38 UTC (rev 18468)
@@ -1,2 +1,3 @@
 version=3
+opts=filenamemangle=s/Extremes-([0-9a-z.]+).zip/peak.util-extremes-$1.zip/ \
 http://pypi.python.org/packages/source/E/Extremes/Extremes-([0-9a-z.]+)\.zip

Modified: packages/python-peak.util/trunk/debian/peak.util-symboltype.watch
===================================================================
--- packages/python-peak.util/trunk/debian/peak.util-symboltype.watch	2011-09-08 18:52:00 UTC (rev 18467)
+++ packages/python-peak.util/trunk/debian/peak.util-symboltype.watch	2011-09-08 22:40:38 UTC (rev 18468)
@@ -1,2 +1,3 @@
 version=3
+opts=filenamemangle=s/SymbolType-([0-9a-z.]+).zip/peak.util-symboltype-$1.zip/ \
 http://pypi.python.org/packages/source/S/SymbolType/SymbolType-([0-9a-z.]+)\.zip

Modified: packages/python-peak.util/trunk/debian/python-peak.util.install
===================================================================
--- packages/python-peak.util/trunk/debian/python-peak.util.install	2011-09-08 18:52:00 UTC (rev 18467)
+++ packages/python-peak.util/trunk/debian/python-peak.util.install	2011-09-08 22:40:38 UTC (rev 18468)
@@ -1,4 +1,4 @@
-peak.util-addons/README.txt		usr/share/doc/python-peak.util/AddOns/
-peak.util-bytecodeassembler/README.txt	usr/share/doc/python-peak.util/BytecodeAssembler/
-peak.util-extremes/README.txt		usr/share/doc/python-peak.util/Extremes/
-peak.util-symboltype/README.txt		usr/share/doc/python-peak.util/SymbolType/
+addons-0-7/README.txt               usr/share/doc/python-peak.util/AddOns/
+bytecodeassembler-0-6/README.txt    usr/share/doc/python-peak.util/BytecodeAssembler/
+extremes-1-1-1/README.txt           usr/share/doc/python-peak.util/Extremes/
+symboltype-1-0/README.txt           usr/share/doc/python-peak.util/SymbolType/

Modified: packages/python-peak.util/trunk/debian/rules
===================================================================
--- packages/python-peak.util/trunk/debian/rules	2011-09-08 18:52:00 UTC (rev 18467)
+++ packages/python-peak.util/trunk/debian/rules	2011-09-08 22:40:38 UTC (rev 18468)
@@ -4,23 +4,23 @@
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 PKG = python-peak.util
+VERSION = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | sed 's,-.*,,')
+# Use an absolute path because of regression introduced by devscripts 2.10.72:
+# uscan --destdir option no longer works with relative paths.
+# TARBALLS_DIR point to the default svn-buildpackage tarballs directory.
+TARBALLS_DIR = $$PWD"/../tarballs/"
 UPSTREAMS = \
-	peak.util-addons \
-	peak.util-bytecodeassembler \
-	peak.util-extremes \
-	peak.util-symboltype \
+	addons-0.7 \
+	bytecodeassembler-0.6 \
+	extremes-1.1.1 \
+	symboltype-1.0 \
 	$(NULL)
-export SUBDIRS = $(UPSTREAMS)
 
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+export SUBDIRS = $(subst .,-,$(UPSTREAMS))
 
-# avoid installing tests: useless at runtime and prone to name clashes
-install/$(PKG)::
-	rm -rf debian/$(PKG)/usr/lib/python*/site-packages/tests/
-	rm -f debian/$(PKG)/usr/lib/python*/site-packages/*.pth
+PKG_PREFIX = peak.util-
 
-USCAN_EXTRA_ARGS = --repack
--include debian/get-orig-source.mk
+DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
 clean::
 	rm -rf build/
@@ -30,3 +30,29 @@
 	rm -f SymbolType-1.0/SymbolType.egg-info/PKG-INFO
 	rm -f SymbolType-1.0/SymbolType.egg-info/SOURCES.txt
 	rm -f SymbolType-1.0/SymbolType.egg-info/dependency_links.txt
+
+
+# avoid installing tests: useless at runtime and prone to name clashes
+install/$(PKG)::
+	rm -rf debian/$(PKG)/usr/lib/python*/site-packages/tests/
+	rm -f debian/$(PKG)/usr/lib/python*/site-packages/*.pth
+
+USCAN_EXTRA_ARGS = --repack
+# -include debian/get-orig-source.mk
+
+.PHONY: get-orig-source
+get-orig-source:
+	@echo $(DEB_SUBDIR)
+	set -e; \
+	for upstream in $(UPSTREAMS); do \
+		uscan --watchfile debian/$(PKG_PREFIX)`echo $$upstream | cut -d- -f1`.watch $(USCAN_EXTRA_ARGS) \
+			--upstream-version 0 --download-version `echo $$upstream | cut -d- -f2` \
+			--package `echo $(PKG_PREFIX)$$upstream | cut -d- -f1` \
+			--download --destdir $(TARBALLS_DIR)/ --no-symlink; \
+		mv $(TARBALLS_DIR)/`echo $(PKG_PREFIX)$$upstream`.tar.gz \
+		   $(TARBALLS_DIR)/$(PKG)_$(VERSION).orig-`echo $$upstream | tr . -`.tar.gz; \
+	done
+	# TODO: Find why create-empty-orig option does't work
+	mkdir $(TARBALLS_DIR)/$(PKG)-$(VERSION)
+	cd $(TARBALLS_DIR); tar czf $(PKG)_$(VERSION).orig.tar.gz $(PKG)-$(VERSION)
+	rmdir $(TARBALLS_DIR)/$(PKG)-$(VERSION)

More information about the Python-modules-commits mailing list