[Python-modules-commits] r21450 - in packages/pyparsing/trunk/debian (10 files)

jandd at users.alioth.debian.org jandd at users.alioth.debian.org
Sun Apr 29 21:22:13 UTC 2012


    Date: Sunday, April 29, 2012 @ 21:22:11
  Author: jandd
Revision: 21450

* Team upload.
* New upstream release (Closes: #667798)
  - drop patch debian/patches/01_leaveWhitespace.dpatch (upstream
    documentation matches API)
* switch to source format 3.0 (quilt) (Closes: #670191)
* drop dpatch dependency
* switch to dh
* add documentation and Python3 package (Closes: #667797)
* switch from python-support to dh_python2 and dh_python3 (Closes:
  #631404)

Added:
  packages/pyparsing/trunk/debian/python-pyparsing-doc.docs
  packages/pyparsing/trunk/debian/python-pyparsing-doc.examples
    (from rev 21449, packages/pyparsing/trunk/debian/examples)
Modified:
  packages/pyparsing/trunk/debian/changelog
  packages/pyparsing/trunk/debian/compat
  packages/pyparsing/trunk/debian/control
  packages/pyparsing/trunk/debian/rules
  packages/pyparsing/trunk/debian/source/format
Deleted:
  packages/pyparsing/trunk/debian/README.source
  packages/pyparsing/trunk/debian/examples
  packages/pyparsing/trunk/debian/patches/

Deleted: packages/pyparsing/trunk/debian/README.source
===================================================================
--- packages/pyparsing/trunk/debian/README.source	2012-04-29 15:56:59 UTC (rev 21449)
+++ packages/pyparsing/trunk/debian/README.source	2012-04-29 21:22:11 UTC (rev 21450)
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
-    /usr/share/doc/dpatch/

Modified: packages/pyparsing/trunk/debian/changelog
===================================================================
--- packages/pyparsing/trunk/debian/changelog	2012-04-29 15:56:59 UTC (rev 21449)
+++ packages/pyparsing/trunk/debian/changelog	2012-04-29 21:22:11 UTC (rev 21450)
@@ -1,3 +1,18 @@
+pyparsing (1.5.6-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * New upstream release (Closes: #667798)
+    - drop patch debian/patches/01_leaveWhitespace.dpatch (upstream
+      documentation matches API)
+  * switch to source format 3.0 (quilt) (Closes: #670191)
+  * drop dpatch dependency
+  * switch to dh
+  * add documentation and Python3 package (Closes: #667797)
+  * switch from python-support to dh_python2 and dh_python3 (Closes:
+    #631404)
+
+ -- Jan Dittberner <jandd at debian.org>  Sun, 29 Apr 2012 22:08:24 +0200
+
 pyparsing (1.5.2-2) unstable; urgency=low
 
   * debian/rules
@@ -82,7 +97,7 @@
   * New upstream release
   * Added Vcs-Svn and Vcs-Browser fields in debian/control.
   * Added myself to the Uploaders field.
-  * Drop X{S,B}-Python-Version control fields, deprecated in 
+  * Drop X{S,B}-Python-Version control fields, deprecated in
     new python-support versions.
  -- Torsten Marek <shlomme at debian.org>  Mon, 10 Dec 2007 23:22:08 +0100
 

Modified: packages/pyparsing/trunk/debian/compat
===================================================================
--- packages/pyparsing/trunk/debian/compat	2012-04-29 15:56:59 UTC (rev 21449)
+++ packages/pyparsing/trunk/debian/compat	2012-04-29 21:22:11 UTC (rev 21450)
@@ -1 +1 @@
-7
+8

Modified: packages/pyparsing/trunk/debian/control
===================================================================
--- packages/pyparsing/trunk/debian/control	2012-04-29 15:56:59 UTC (rev 21449)
+++ packages/pyparsing/trunk/debian/control	2012-04-29 21:22:11 UTC (rev 21450)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Kevin Coyner <kcoyner at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Torsten Marek <shlomme at debian.org>
-Standards-Version: 3.8.4
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7), python (>= 2.5.4-1~), dpatch
-Build-Depends-Indep: python-support (>= 0.9), tofrodos
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 8~), python (>= 2.6.5~), python3 (>= 3.1.3-2~)
+Build-Depends-Indep: tofrodos
 Homepage: http://pyparsing.wikispaces.com/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyparsing/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyparsing/trunk/
@@ -27,3 +27,43 @@
   greet = Word(alphas) + "," + Word(alphas) + "!"
   hello = "Hello, World!"
   print hello, "->", greet.parseString(hello)
+
+Package: python3-pyparsing
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+Description: Python parsing module, Python3 package
+ The parsing module is an alternative approach to creating and
+ executing simple grammars, vs. the traditional lex/yacc approach, or
+ the use of regular expressions.  The parsing module provides a
+ library of classes that client code uses to construct the grammar
+ directly in Python code.
+ .
+ Here's an example:
+ .
+  from pyparsing import Word, alphas
+  greet = Word(alphas) + "," + Word(alphas) + "!"
+  hello = "Hello, World!"
+  print hello, "->", greet.parseString(hello)
+ .
+ This package contains the Python3 version of python-pyparsing.
+
+Package: python-pyparsing-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Python parsing module, documentation package
+ The parsing module is an alternative approach to creating and
+ executing simple grammars, vs. the traditional lex/yacc approach, or
+ the use of regular expressions.  The parsing module provides a
+ library of classes that client code uses to construct the grammar
+ directly in Python code.
+ .
+ Here's an example:
+ .
+  from pyparsing import Word, alphas
+  greet = Word(alphas) + "," + Word(alphas) + "!"
+  hello = "Hello, World!"
+  print hello, "->", greet.parseString(hello)
+ .
+ This package contains documentation for python-pyparsing.

Deleted: packages/pyparsing/trunk/debian/examples
===================================================================
--- packages/pyparsing/trunk/debian/examples	2012-04-29 15:56:59 UTC (rev 21449)
+++ packages/pyparsing/trunk/debian/examples	2012-04-29 21:22:11 UTC (rev 21450)
@@ -1 +0,0 @@
-examples/*

Added: packages/pyparsing/trunk/debian/python-pyparsing-doc.docs
===================================================================
--- packages/pyparsing/trunk/debian/python-pyparsing-doc.docs	                        (rev 0)
+++ packages/pyparsing/trunk/debian/python-pyparsing-doc.docs	2012-04-29 21:22:11 UTC (rev 21450)
@@ -0,0 +1,5 @@
+README
+HowToUsePyparsing.html
+htmldoc
+pyparsingClassDiagram.PNG
+docs/*

Copied: packages/pyparsing/trunk/debian/python-pyparsing-doc.examples (from rev 21449, packages/pyparsing/trunk/debian/examples)
===================================================================
--- packages/pyparsing/trunk/debian/python-pyparsing-doc.examples	                        (rev 0)
+++ packages/pyparsing/trunk/debian/python-pyparsing-doc.examples	2012-04-29 21:22:11 UTC (rev 21450)
@@ -0,0 +1 @@
+examples/*

Modified: packages/pyparsing/trunk/debian/rules
===================================================================
--- packages/pyparsing/trunk/debian/rules	2012-04-29 15:56:59 UTC (rev 21449)
+++ packages/pyparsing/trunk/debian/rules	2012-04-29 21:22:11 UTC (rev 21450)
@@ -1,30 +1,35 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2002,2003 Colin Walters <walters at debian.org>
+# Copyright © 2012 Jan Dittberner <jandd at debian.org>
 
-DEB_PYTHON_SYSTEM = pysupport
+override_dh_auto_clean:
+	find -name '*.py[co]' -print0 | xargs -0 --no-run-if-empty rm -f --
+	rm -f pyparsing.py
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/python/python.mk
+override_dh_auto_install:
+	python setup.py install --install-layout=deb \
+	    --root=$(CURDIR)/debian/python-pyparsing
+	rm -f pyparsing.py
+	python3 setup.py install --install-layout=deb \
+	    --root=$(CURDIR)/debian/python3-pyparsing
+	find $(CURDIR)/debian/python{,3}-pyparsing \
+	    \( -name '*.html' -o -name '*.css' -o -name '*.py' \
+	                      -o -name 'README' \) \
+	    -type f -print0 \
+	| xargs -0 --no-run-if-empty fromdos -p --
 
-DEB_PYTHON_INSTALL_ARGS_ALL += --install-layout=deb
+override_dh_installexamples:
+	dh_installexamples -i -ppython-pyparsing-doc
 
-clean::
-	find -name '*.py[co]' -print0 | xargs -0 --no-run-if-empty rm -f --
+override_dh_python2:
+	dh_python2 -ppython-pyparsing
 
-DEB_INSTALL_DOCS_python-pyparsing := README HowToUsePyparsing.html htmldoc \
-	pyparsingClassDiagram.PNG docs/*
-DEB_DH_ALWAYS_EXCLUDE := .svn
+override_dh_python3:
+	dh_python3 -ppython3-pyparsing
 
-install/python-pyparsing::
-	rm debian/python-pyparsing/usr/lib/python*/*-packages/pyparsing_py3.py
+override_dh_compress:
+	dh_compress -i -X.py
 
-binary-post-install/%::
-	# convert CRLF to LF
-	find 'debian/$(cdbs_curpkg)' \
-		\( -name '*.html' -o -name '*.css' -o -name '*.py' \
-			-o -name 'README' \) \
-		-type f -print0 \
-	| xargs -0 --no-run-if-empty fromdos -p --
+%:
+	dh $@ --with=python2,python3 --buildsystem=python_distutils

Modified: packages/pyparsing/trunk/debian/source/format
===================================================================
--- packages/pyparsing/trunk/debian/source/format	2012-04-29 15:56:59 UTC (rev 21449)
+++ packages/pyparsing/trunk/debian/source/format	2012-04-29 21:22:11 UTC (rev 21450)
@@ -1 +1 @@
-1.0
+3.0 (quilt)




More information about the Python-modules-commits mailing list