[Python-modules-commits] [pyparsing] 03/03: New upstream release.

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository pyparsing.

commit d60ae6996243046c66f76639ff170bb0b180e0f3
Author: Barry Warsaw <barry at python.org>
Date:   Thu Aug 18 10:54:45 2016 -0400

    New upstream release.
    
    * New upstream release.
    * d/copyright: Use Files-Excluded header to remove non-DFSG files.
    * d/watch:
      - Set opts for the repacking and mangling of the version number to +dfsg1
      - Use the pypi.debian.net redirector.
    * d/rules: Remove get-orig-source target since with the above changes,
      uscan(1) will now do the right thing.
---
 debian/changelog | 12 ++++++++++++
 debian/copyright |  2 ++
 debian/rules     | 13 -------------
 debian/watch     |  7 +++++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3f2e3f..9fe8654 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pyparsing (2.1.8+dfsg1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * d/copyright: Use Files-Excluded header to remove non-DFSG files.
+  * d/watch:
+    - Set opts for the repacking and mangling of the version number to +dfsg1
+    - Use the pypi.debian.net redirector.
+  * d/rules: Remove get-orig-source target since with the above changes,
+    uscan(1) will now do the right thing.
+
+ -- Barry Warsaw <barry at debian.org>  Thu, 18 Aug 2016 10:45:03 -0400
+
 pyparsing (2.1.7+dfsg1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/copyright b/debian/copyright
index 607bddc..be51b69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pyparsing
 Upstream-Contact: Paul McGuire <ptmcg at austin.rr.com>
 Source: https://pypi.python.org/pypi/pyparsing
+Files-Excluded: docs/pycon06-AdventureEngineUsingPyparsing-notes.pdf
+ docs/pycon06-IntroToPyparsing-notes.pdf
 
 Files: *
 Copyright: 2003-2015 Paul T. McGuire
diff --git a/debian/rules b/debian/rules
index 237b2b8..2e3c2a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,16 +14,3 @@ override_dh_installexamples:
 
 override_dh_compress:
 	dh_compress -i -X.py
-
-
-# the following rule gets the original source and creates a dfsg free
-# tarball
-get-orig-source:
-	DFSGVER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p'); \
-	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p'); \
-	TMPDIR=`mktemp --directory`; \
-	uscan --force-download --download-version=$$VER --destdir="$$TMPDIR"; \
-	cd "$(CURDIR)"; mv "$$TMPDIR/pyparsing_$$DFSGVER.orig.tar.gz" .; \
-	rm -rf "$$TMPDIR"
-
-.PHONY: get-orig-source
diff --git a/debian/watch b/debian/watch
index 6de8064..e17287c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,6 @@
 version=3
-opts=dversionmangle=s/\+dfsg\d+$// \
- https://pypi.python.org/packages/source/p/pyparsing/pyparsing-(.*).tar.gz debian debian/new-upstream
+opts=\
+uversionmangle=s/(rc|a|b|c)/~$1/,\
+dversionmangle=s/\+dfsg\d*$//,\
+repacksuffix=+dfsg1 \
+https://pypi.debian.net/pyparsing/pyparsing-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyparsing.git