[Python-modules-commits] r9023 - in packages/argparse/trunk/debian (control rules watch)

[rrs-guest at users.alioth.debian.org]

    Date: Sunday, July 12, 2009 @ 07:57:11
  Author: rrs-guest
Revision: 9023

Merge branch 'master' into local-svn/trunk

Conflicts:
	debian/control
	debian/rules
	debian/watch

Modified:
  packages/argparse/trunk/debian/control
  packages/argparse/trunk/debian/rules
  packages/argparse/trunk/debian/watch

Modified: packages/argparse/trunk/debian/control
===================================================================
--- packages/argparse/trunk/debian/control	2009-07-11 13:20:54 UTC (rev 9022)
+++ packages/argparse/trunk/debian/control	2009-07-12 07:57:11 UTC (rev 9023)
@@ -6,17 +6,17 @@
 Build-Depends: debhelper (>= 7), python-epydoc, python-support, python
 Standards-Version: 3.8.1
 XS-Python-Version: >=2.4
-Vcs-Git: git://git.debian.org/collab-maint/argparse.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/argparse.git
+Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/argparse/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/argparse/trunk/
 Homepage: http://code.google.com/p/argparse/
 
 Package: python-argparse
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+Architecture: all
+Depends: ${python:Depends}
 Provides: ${python:Provides}
 Suggests: python-argparse-doc
 XB-Python-Version: ${python:Versions}
-Description: An optparse-inspired command-line parsing library
+Description: optparse-inspired command-line parsing library
  Argparse takes the best of the optparse command-line parsing module
  and brings it new life. Argparse adds positional as well as
  optional arguments, the ability to create parsers for sub-commands,
@@ -28,7 +28,7 @@
 Section: doc
 Architecture: all
 Recommends: python-argparse
-Description: An optparse-inspired command-line parsing library - doc
+Description: optparse-inspired command-line parsing library - doc
  Argparse takes the best of the optparse command-line parsing module
  and brings it new life. Argparse adds positional as well as
  optional arguments, the ability to create parsers for sub-commands,

Modified: packages/argparse/trunk/debian/rules
===================================================================
--- packages/argparse/trunk/debian/rules	2009-07-11 13:20:54 UTC (rev 9022)
+++ packages/argparse/trunk/debian/rules	2009-07-12 07:57:11 UTC (rev 9023)
@@ -1,18 +1,16 @@
 #!/usr/bin/make -f
 
-PKG_NAME=argparse
-PKG_VER=0.9.1
-PKG_FILE=$(PKG_NAME)-$(PKG_VER).tar.gz
-PKG_DIR=$(PKG_NAME)-$(PKG_VER)
-UPSTR_SITE=http://argparse.googlecode.com/files
-UPSTR_FILE=argparse-0.9.1.zip
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+DEB_UPSTREAM_FILE=argparse-$(DEB_UPSTREAM_VERSION).zip
+DEB_UPSTREAM_GZ=argparse-$(DEB_UPSTREAM_VERSION).tar.gz
+PKG_DIR=argparse-$(DEB_UPSTREAM_VERSION)
 get-orig-source:
-	wget --no-cache -q $(UPSTR_SITE)/$(UPSTR_FILE)
-	test -f $(UPSTR_FILE) && unzip -qq $(UPSTR_FILE) && rm -rf $(UPSTR_FILE)
+	uscan --force-download --rename --download-version=$(DEB_UPSTREAM_VERSION) --destdir=.
+	test -f $(DEB_UPSTREAM_FILE) && unzip -qq $(DEB_UPSTREAM_FILE) && rm -rf $(DEB_UPSTREAM_FILE)
 	test -d $(PKG_DIR) || exit 1
-	tar -czvf $(PKG_FILE) $(PKG_DIR) && rm -rf $(PKG_DIR)
-	@echo "Downloaded source file: $(PKG_FILE)"
-	@ls -l $(PKG_FILE)
+	tar -czvf $(DEB_UPSTREAM_GZ) $(PKG_DIR) && rm -rf $(PKG_DIR)
+	@echo "Downloaded source file: $(DEB_UPSTREAM_GZ)"
+	@ls -l $(DEB_UPSTREAM_GZ)
 
 build:
 
@@ -24,6 +22,7 @@
 	[ ! -e doc.orig ] || mv doc.orig doc
 
 	python setup.py clean --all
+	[-f argparse.pyc ] && rm -f argparse.pyc
 
 	dh_clean
 
@@ -38,7 +37,7 @@
 	python setup.py install --root $(CURDIR)/debian/python-argparse
 
 	# epydoc warns about Indentation problems. But I've verified. It is fine.
-	epydoc $(CURDIR)/debian/python-argparse/usr/lib/python2.5/site-packages/argparse.py
+	epydoc argparse.py
 
 binary-indep: build install
 	dh_testdir

Modified: packages/argparse/trunk/debian/watch
===================================================================
--- packages/argparse/trunk/debian/watch	2009-07-11 13:20:54 UTC (rev 9022)
+++ packages/argparse/trunk/debian/watch	2009-07-12 07:57:11 UTC (rev 9023)
@@ -1,3 +1,3 @@
 # Compulsory line, this is a version 3 file
 version=3
-http://argparse.googlecode.com/files/argparse-(.*)\.zip
+http://code.google.com/p/argparse/downloads/list http://argparse.googlecode.com/files/argparse-([\d\.]+).zip