Hi,

Attached is the diff for my collatinus 7.14-1.1 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
reverted:
--- collatinus-7.14/debian/dirs
+++ collatinus-7.14.orig/debian/dirs
@@ -1,4 +0,0 @@
-usr/bin
-usr/lib/collatinus
-usr/share/man/man1
-usr/share/doc/collatinus
diff -u collatinus-7.14/debian/control collatinus-7.14/debian/control
--- collatinus-7.14/debian/control
+++ collatinus-7.14/debian/control
@@ -2,12 +2,15 @@
 Section: text
 Priority: optional
 Maintainer: Georges Khaznadar <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 4.0.0), hyperlatex, tetex-extra
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>> 4.0.0)
+Build-Depends-Indep: hyperlatex, tetex-extra, python-support (>= 0.4)
+Standards-Version: 3.7.2
 
 Package: collatinus
 Architecture: all
-Depends: python, python-wxgtk2.4|python-wxgtk2.6, collatinus-data, 
collatinus-doc
+Replaces: collatinus-data
+Conflicts: collatinus-data
+Depends: ${python:Depends}, python-wxgtk2.6 | python-wxgtk2.4, collatinus-doc
 Description: lemmatisation of latin text
  Collatinus can be used to lemmatise latin texts, i.e. extract words and
  make a lexicon which indicates for each word its canonic form, and how
@@ -15,15 +18,8 @@
  declining it. Example : rosam gives : rosa-rosae -- acc. sing.
  Collatinus provides a nice graphic front-end to each operation.
 
-Package: collatinus-data
-Architecture: all
-Depends: 
-Description: data files for collatinus
- lemmatisation engine data in xml format.
-
 Package: collatinus-doc
 Architecture: all
-Depends: 
 Description: documentation for collatinus
  This package provides documentation for Collatinus in HTML and PDF
  formats.
diff -u collatinus-7.14/debian/rules collatinus-7.14/debian/rules
--- collatinus-7.14/debian/rules
+++ collatinus-7.14/debian/rules
@@ -55,10 +55,10 @@
        dh_installdirs
 
        # Add here commands to install the package into debian/collatinus.
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/collatinus
-       $(MAKE) install-data DESTDIR=$(CURDIR)/debian/collatinus-data
-       $(MAKE) install-doc DESTDIR=$(CURDIR)/debian/collatinus-doc
-
+       $(MAKE) install      DESTDIR=$(CURDIR)/debian/collatinus
+       $(MAKE) install-data DESTDIR=$(CURDIR)/debian/collatinus
+       $(MAKE) install-doc  DESTDIR=$(CURDIR)/debian/collatinus-doc
+       python $(CURDIR)/debian/compile.lematta.py $(CURDIR)/debian/collatinus
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -87,7 +87,7 @@
        dh_compress
        dh_fixperms
 #      dh_perl
-#      dh_python
+       dh_pysupport
 #      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
diff -u collatinus-7.14/debian/changelog collatinus-7.14/debian/changelog
--- collatinus-7.14/debian/changelog
+++ collatinus-7.14/debian/changelog
@@ -1,3 +1,16 @@
+collatinus (7.14-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package to the last python policy (Closes: #380776).
+  * Bump Standards-Version to 3.7.2.
+  * Move debhelper to Build-Depends.
+  * collatinus-data has no sense: collatinus is already arch:all, so merge the
+    packages.
+  * generate the lematta at build time, instead of install time (it was not
+    even removed in the prerm !)
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Wed, 30 Aug 2006 12:30:10 +0200
+
 collatinus (7.14-1) unstable; urgency=low
 
   * upgraded to the new upstream version
diff -u collatinus-7.14/debian/collatinus-doc.dirs 
collatinus-7.14/debian/collatinus-doc.dirs
--- collatinus-7.14/debian/collatinus-doc.dirs
+++ collatinus-7.14/debian/collatinus-doc.dirs
@@ -2 +1,0 @@
-
reverted:
--- collatinus-7.14/debian/collatinus-data.dirs
+++ collatinus-7.14.orig/debian/collatinus-data.dirs
@@ -1,2 +0,0 @@
-usr/share/collatinus
-
reverted:
--- collatinus-7.14/debian/postinst
+++ collatinus-7.14.orig/debian/postinst
@@ -1,42 +0,0 @@
-#! /bin/sh
-# postinst script for foo
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
-    configure)
-       cd /usr/lib/collatinus/ && python -c "import 
collat,latinus,version,flexfr,frequences; collat.precompile()" && mv -f lemmata 
/usr/share/collatinus/
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
only in patch2:
unchanged:
--- collatinus-7.14.orig/debian/collatinus.dirs
+++ collatinus-7.14/debian/collatinus.dirs
@@ -0,0 +1,5 @@
+usr/bin
+usr/lib/collatinus
+usr/share/collatinus
+usr/share/doc/collatinus
+usr/share/man/man1
only in patch2:
unchanged:
--- collatinus-7.14.orig/debian/compile.lematta.py
+++ collatinus-7.14/debian/compile.lematta.py
@@ -0,0 +1,8 @@
+#! /usr/bin/python
+
+import sys, os, os.path
+sys.path.append(os.path.join(sys.argv[1], 'usr/lib/collatinus'))
+os.chdir(os.path.join(sys.argv[1], 'usr/share/collatinus'))
+
+import collat
+collat.precompile()

Attachment: signature.asc
Description: Digital signature

Reply via email to