[Python-modules-commits] r24972 - in packages/pycparser/trunk/debian (4 files)

[stefanor at users.alioth.debian.org]

    Date: Tuesday, June 25, 2013 @ 22:39:30
  Author: stefanor
Revision: 24972

* Ensure auto-generated files are rebuilt, by deleting before build.
* Use dh_python-ply to generate dependencies against python{3,}-ply.

Modified:
  packages/pycparser/trunk/debian/changelog
  packages/pycparser/trunk/debian/clean
  packages/pycparser/trunk/debian/control
  packages/pycparser/trunk/debian/rules

Modified: packages/pycparser/trunk/debian/changelog
===================================================================
--- packages/pycparser/trunk/debian/changelog	2013-06-25 21:54:26 UTC (rev 24971)
+++ packages/pycparser/trunk/debian/changelog	2013-06-25 22:39:30 UTC (rev 24972)
@@ -1,9 +1,14 @@
-pycparser (2.09.1+dfsg-2) UNRELEASED; urgency=low
+pycparser (2.09.1+dfsg-2) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Run tests only if DEB_BUILD_OPTIONS=nocheck is not set.
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 13 Jun 2013 13:13:47 +0200
+  [ Stefano Rivera ]
+  * Ensure auto-generated files are rebuilt, by deleting before build.
+  * Use dh_python-ply to generate dependencies against python{3,}-ply.
 
+ -- Stefano Rivera <stefanor at debian.org>  Wed, 26 Jun 2013 00:38:51 +0200
+
 pycparser (2.09.1+dfsg-1) unstable; urgency=low
 
   [ Stefano Rivera ]

Modified: packages/pycparser/trunk/debian/clean
===================================================================
--- packages/pycparser/trunk/debian/clean	2013-06-25 21:54:26 UTC (rev 24971)
+++ packages/pycparser/trunk/debian/clean	2013-06-25 22:39:30 UTC (rev 24972)
@@ -1,4 +1,2 @@
 yacctab.py
 parser.out
-pycparser/yacctab.py
-pycparser/c_ast.py

Modified: packages/pycparser/trunk/debian/control
===================================================================
--- packages/pycparser/trunk/debian/control	2013-06-25 21:54:26 UTC (rev 24971)
+++ packages/pycparser/trunk/debian/control	2013-06-25 22:39:30 UTC (rev 24972)
@@ -6,7 +6,7 @@
 Build-Depends:
  debhelper (>= 8.1),
  python-all (>= 2.6.6-3~),
- python-ply,
+ python-ply (>= 3.4-1~),
  python3-all (>= 3.1.2-6~),
  python3-ply
 Standards-Version: 3.9.4
@@ -19,7 +19,7 @@
 
 Package: python-pycparser
 Architecture: all
-Depends: python-ply, ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python-ply:Depends}, ${python:Depends}
 Description: C parser in Python
  pycparser is a complete parser of the C language, written in pure Python using
  the PLY parsing library. It parses C code into an AST and can serve as a
@@ -27,7 +27,7 @@
 
 Package: python3-pycparser
 Architecture: all
-Depends: python3-ply, ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}, ${python3-ply:Depends}, ${python3:Depends}
 Description: C parser in Python 3
  pycparser is a complete parser of the C language, written in pure Python using
  the PLY parsing library. It parses C code into an AST and can serve as a

Modified: packages/pycparser/trunk/debian/rules
===================================================================
--- packages/pycparser/trunk/debian/rules	2013-06-25 21:54:26 UTC (rev 24971)
+++ packages/pycparser/trunk/debian/rules	2013-06-25 22:39:30 UTC (rev 24972)
@@ -9,7 +9,7 @@
 %:
 	dh $@ --with python2,python3
 
-override_dh_auto_build:
+override_dh_auto_build: clean-generated-code
 	cd pycparser && python _build_tables.py
 	set -e -x; \
 	for py in $(PYVERS) $(PY3VERS); do \
@@ -34,10 +34,20 @@
 		$$py setup.py install --skip-build --root debian/python3-pycparser --install-layout=deb; \
 	done
 
-override_dh_auto_clean:
+override_dh_auto_clean: clean-generated-code
 	rm -rf build
 	find . -name '*.pyc' -delete
 
+override_dh_python2:
+	dh_python2
+	dh_python-ply pycparser/lextab.py pycparser/yacctab.py
+	# I blame jwilk for this temporary hack: (waiting for #714099)
+	sed -e 's/python-/python3-/g' /usr/bin/dh_python-ply | \
+		perl - pycparser/lextab.py pycparser/yacctab.py
+
+clean-generated-code:
+	cd pycparser && rm -f lextab.py yacctab.py c_ast.py
+
 get-packaged-orig-source:
 	set -e -x; \
 	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p'); \