Hi,

Attached is the diff for my yappy 1.6-1.1 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/changelog 
/tmp/zsulOY4cQn/yappy-1.6/debian/changelog
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/changelog  2006-02-26 03:38:43.000000000 
+0100
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/changelog  2006-07-02 16:00:33.000000000 
+0200
@@ -1,3 +1,12 @@
+yappy (1.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package to the last python policy (Closes: #373412).
+  * Avoid to compress .py's and .pdf's in the -doc package.
+  * Use dh_install{docs,examples} instead of cp's.
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Sun,  2 Jul 2006 15:59:48 +0200
+
 yappy (1.6-1) unstable; urgency=low
 
   * New upstream release
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/control 
/tmp/zsulOY4cQn/yappy-1.6/debian/control
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/control    2006-02-15 11:10:17.000000000 
+0100
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/control    2006-07-02 15:52:14.000000000 
+0200
@@ -3,13 +3,18 @@
 Priority: optional
 Maintainer: Rogerio Reis <[EMAIL PROTECTED]>
 Architecture: any
-Build-Depends: debhelper (>= 4.1.67), python, python2.3, python2.4
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11),
+ python-support (>= 0.3)
+Standards-Version: 3.7.2
 
 Package: python-yappy
 Architecture: all
 Section: python
 Depends: ${python:Depends}
+Provides: ${python:Provides}
+Replaces: python2.3-yappy (<< 1.6-1.1), python2.4-yappy (<< 1.6-1.1)
+Conflicts: python2.3-yappy (<< 1.6-1.1), python2.4-yappy (<< 1.6-1.1)
+XB-Python-Version: ${python:Versions}
 Description: Yet Another Parser Generator fo Python
  Yappy provides a lexical analyser and a LR parser generator
  for python applications. It currently builds SLR,
@@ -17,32 +22,6 @@
  in parsing.  Some ambiguous grammars can be handled if priority
  and associativity information is provided.
 
-Package: python2.3-yappy
-Architecture: all
-Section: python
-Depends: python2.3
-Description: Yet Another Parser Generator fo Python
- Yappy provides a lexical analyser and a LR parser generator
- for python applications. It currently builds SLR,
- LR(1) and LALR(1) tables. Tables are kept in python shelves for use
- in parsing.  Some ambiguous grammars can be handled if priority
- and associativity information is provided.
- .
- This package is built for python2.3
-
-Package: python2.4-yappy
-Architecture: all
-Section: python
-Depends: python2.4
-Description: Yet Another Parser Generator fo Python
- Yappy provides a lexical analyser and a LR parser generator
- for python applications. It currently builds SLR,
- LR(1) and LALR(1) tables. Tables are kept in python shelves for use
- in parsing.  Some ambiguous grammars can be handled if priority
- and associativity information is provided.
- .
- This package is built for python2.4
-
 Package: python-yappy-doc
 Architecture: all
 Section: doc
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/pycompat 
/tmp/zsulOY4cQn/yappy-1.6/debian/pycompat
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/pycompat   1970-01-01 01:00:00.000000000 
+0100
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/pycompat   2006-07-02 15:50:57.000000000 
+0200
@@ -0,0 +1 @@
+2
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/python2.3-yappy.dirs 
/tmp/zsulOY4cQn/yappy-1.6/debian/python2.3-yappy.dirs
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/python2.3-yappy.dirs       2003-09-01 
19:47:11.000000000 +0200
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/python2.3-yappy.dirs       1970-01-01 
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/share/doc/python2.3-yappy
-usr/lib/python2.3/site-packages/yappy 
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/python2.4-yappy.dirs 
/tmp/zsulOY4cQn/yappy-1.6/debian/python2.4-yappy.dirs
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/python2.4-yappy.dirs       2005-02-14 
17:26:20.000000000 +0100
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/python2.4-yappy.dirs       1970-01-01 
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/share/doc/python2.4-yappy
-usr/lib/python2.4/site-packages/yappy 
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/python-yappy.dirs 
/tmp/zsulOY4cQn/yappy-1.6/debian/python-yappy.dirs
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/python-yappy.dirs  2003-09-01 
19:50:22.000000000 +0200
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/python-yappy.dirs  1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/python-yappy
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/python-yappy-doc.dirs 
/tmp/zsulOY4cQn/yappy-1.6/debian/python-yappy-doc.dirs
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/python-yappy-doc.dirs      2003-09-01 
19:49:35.000000000 +0200
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/python-yappy-doc.dirs      1970-01-01 
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/share/doc/python-yappy-doc
-usr/share/doc/python-yappy-doc/html
-usr/share/doc/python-yappy-doc/examples
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/python-yappy-doc.docs 
/tmp/zsulOY4cQn/yappy-1.6/debian/python-yappy-doc.docs
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/python-yappy-doc.docs      1970-01-01 
01:00:00.000000000 +0100
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/python-yappy-doc.docs      2006-07-02 
15:57:40.000000000 +0200
@@ -0,0 +1,2 @@
+Yappy.pdf
+html
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/python-yappy-doc.examples 
/tmp/zsulOY4cQn/yappy-1.6/debian/python-yappy-doc.examples
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/python-yappy-doc.examples  1970-01-01 
01:00:00.000000000 +0100
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/python-yappy-doc.examples  2006-07-02 
15:57:40.000000000 +0200
@@ -0,0 +1 @@
+demo.py
diff -Nru /tmp/eYcMkxLUCt/yappy-1.6/debian/rules 
/tmp/zsulOY4cQn/yappy-1.6/debian/rules
--- /tmp/eYcMkxLUCt/yappy-1.6/debian/rules      2006-02-15 11:12:41.000000000 
+0100
+++ /tmp/zsulOY4cQn/yappy-1.6/debian/rules      2006-07-02 15:59:46.000000000 
+0200
@@ -11,7 +11,7 @@
 
 DIRS =  usr/X11R6/bin usr/lib/apoo usr/share/doc
 
-PyVersions = 2.3 2.4
+PYVERS := $(shell pyversions -r)
 
 build: build-stamp
 build-stamp:
@@ -30,15 +30,12 @@
        dh_clean -k
        dh_installdirs
 
-       ${INSTALL_DATA} ${PYFILES} 
debian/python2.3-yappy/usr/lib/python2.3/site-packages/yappy
-       ${INSTALL_DATA} ${PYFILES} 
debian/python2.4-yappy/usr/lib/python2.4/site-packages/yappy
-       cp -r html debian/python-yappy-doc/usr/share/doc/python-yappy-doc
-       ${INSTALL_DATA} demo.py 
debian/python-yappy-doc/usr/share/doc/python-yappy-doc/examples
-       ${INSTALL_DATA} Yappy.pdf 
debian/python-yappy-doc/usr/share/doc/python-yappy-doc
-       ${INSTALL_DATA} debian/copyright 
debian/python-yappy-doc/usr/share/doc/python-yappy-doc
-       ${INSTALL_DATA} debian/copyright 
debian/python-yappy/usr/share/doc/python-yappy
-       ${INSTALL_DATA} debian/copyright 
debian/python2.3-yappy/usr/share/doc/python2.3-yappy
-       ${INSTALL_DATA} debian/copyright 
debian/python2.4-yappy/usr/share/doc/python2.4-yappy
+       set -e; for py in $(PYVERS); do \
+           inst_dir=debian/python-yappy/usr/lib/$$py/site-packages/yappy; \
+           mkdir -p $$inst_dir;                                           \
+           ${INSTALL_DATA} ${PYFILES} $$inst_dir;                         \
+       done
+
        touch install-stamp
 
 
@@ -49,8 +46,11 @@
        dh_link
        dh_strip
        dh_installchangelogs
-       dh_compress
+       dh_installdocs
+       dh_installexamples
+       dh_compress -X.py -X.pdf
        dh_fixperms
+       dh_pysupport
        dh_python
        dh_installdeb
        dh_shlibdeps
@@ -59,8 +59,7 @@
        dh_builddeb
 
 # Build architecture-dependent files here.
-binary-arch: 
-       echo ""
+binary-arch: ;
 
 binary: binary-indep 
 .PHONY: build clean binary-indep binary-arch binary install configure

Attachment: signature.asc
Description: Digital signature

Reply via email to