merged packaging changes from Sandro Tosi and uploaded 0.37.2 to Debian

9 files changed, 77 insertions, 68 deletions

diff --git a/debian/changelog b/debian/changelog
index f0881d7..34f38bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,61 @@
-logilab-common (0.37.2-1) DISTRIBUTION; urgency=low
+logilab-common (0.37.2-2) unstable; urgency=low
+
+  * Merged Sandro Tosi's changes with Logilab's evolution of the package
+  * Published the resulting package to Debian
+
+ -- Alexandre Fayolle <afayolle@debian.org>  Tue, 20 Jan 2009 16:32:13 +0100
+
+logilab-common (0.37.2-1) unstable; urgency=low
 
   * new upstream release
 
  -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Thu, 08 Jan 2009 14:00:41 +0100
 
-logilab-common (0.37.1-1) DISTRIBUTION; urgency=low
+logilab-common (0.37.1-1) unstable; urgency=low
 
   * new upstream release
 
  -- Adrien Di Mascio <Adrien.DiMascio@logilab.fr>  Thu, 11 Dec 2008 16:07:02 +0100
 
-logilab-common (0.37.0-1) DISTRIBUTION; urgency=low
+logilab-common (0.37.0-1) unstable; urgency=low
 
   * new upstream release
 
  -- Adrien Di Mascio <Adrien.DiMascio@logilab.fr>  Tue, 09 Dec 2008 10:56:23 +0100
 
-logilab-common (0.36.1-1) DISTRIBUTION; urgency=low
+logilab-common (0.36.1-1) unstable; urgency=low
 
-  * new upstream release
-
- -- Nicolas Chauvat <nicolas.chauvat@logilab.fr>  Fri, 14 Nov 2008 13:22:04 +0100
+  * New upstream release
+  * debian/control
+    - adopted under DPMT umbrella (in agreement with Alexandre Fayolle) 
+    - bump Standards-Version to 3.8.0 (no changes needed)
+    - added Vcs-{Svn,Browser} field
+    - replace 'python' with ${python:Depends} and added ${misc:Depends} to
+      Depends
+    - added python-epydoc and graphviz to build-dep-indep (to build doc)
+    - moved python to build-dep (needed for clean)
+  * debian/pycompat
+    - removed since no more needed
+  * debian/rules
+    - install upstream 'Changelog' using dh_installchangelog
+    - added build, clean and install for documentation
+    - no need to recompress man page
+    - using '-delete' find option instead of xargs
+    - call "python setup.py clean" in clean target
+    - merge 'rm' calls into dh_clean
+    - don't compress files under 'test/' and 'apidoc/' dirs
+  * debian/python-logilab-common.{postinst,preinst,prerm}
+    - removed since not needed
+  * debian/python-logilab-common.docs
+    - removed: installed non-existing files, using debian/rules
+  * debian/copyright
+    - added a clear license section, referring simply to GPLv2, since every file
+      is license only GPLv2, hence updating the local license text file too
+    - indented upstream author, copyright and license with 4 spaces
+    - extended copyright year (starting from 2000, previous 2003, due to
+      'table.py' et alter)
+
+ -- Sandro Tosi <morph@debian.org>  Sun, 30 Nov 2008 15:08:25 +0100
 
 logilab-common (0.36.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8827eec..038ff71 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,26 @@
 Source: logilab-common
 Section: python
 Priority: optional
-Maintainer: Alexandre Fayolle <afayolle@debian.org>
-Uploaders: David Douard <david.douard@logilab.fr> , Fabrice Douchant <fabrice.douchant@logilab.fr>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11)
-Build-Depends-Indep: python (>=2.3.5-7), python-central (>=0.5.6)
+Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Uploaders: David Douard <david.douard@logilab.fr>, Fabrice Douchant <fabrice.douchant@logilab.fr>, Alexandre Fayolle <afayolle@debian.org>, Sandro Tosi <morph@debian.org>
+Build-Depends: debhelper (>= 5.0.38), python (>= 2.3.5-7)
+Build-Depends-Indep: python-central (>=0.5.6), python-epydoc, graphviz
 XS-Python-Version: all
-Homepage: http://www.logilab.org/project/logilab-common
 Standards-Version: 3.8.0
+Homepage: http://www.logilab.org/project/logilab-common
+Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/logilab-common/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/logilab-common/trunk/
 
 Package: python-logilab-common
 Architecture: all
 Provides: ${python:Provides}
-Depends:  ${python:Depends}, python-egenix-mxdatetime
+Depends: ${python:Depends}, ${misc:Depends}, python-egenix-mxdatetime
 Conflicts: python-constraint ( <= 0.3.0-4), python-logilab-astng ( <= 0.16.0-1), pylint ( << 0.11.0-1), devtools ( <= 0.9.0-1), logilab-doctools ( <= 0.1.6-4), python-logilab-aspects ( <= 0.1.4-2), python2.3-logilab-common, python2.4-logilab-common
 XB-Python-Version: ${python:Versions}
 Description: useful miscellaneous modules used by Logilab projects
  logilab-common is a collection of low-level Python packages and modules,
  designed to ease:
+ .
   * handling command line options and configuration files
   * writing interactive command line tools
   * manipulation files and character strings
@@ -28,5 +31,3 @@ Description: useful miscellaneous modules used by Logilab projects
   * accessing RDBMS (currently postgreSQL, MySQL and sqlite)
   * generating text and HTML reports
   * logging
-
-
diff --git a/debian/copyright b/debian/copyright
index 61bd575..270613a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,25 +4,16 @@ It was downloaded from ftp://ftp.logilab.org/pub/common
 
 Upstream Author: 
 
-  Logilab <devel@logilab.fr>
+    Logilab <devel@logilab.fr>
 
 Copyright:
 
-Copyright (c) 2003-2008 LOGILAB S.A. (Paris, FRANCE).
-http://www.logilab.fr/ -- mailto:contact@logilab.fr
+    Copyright (c) 2000-2008 LOGILAB S.A. (Paris, FRANCE).
+    http://www.logilab.fr/ -- mailto:contact@logilab.fr
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
+License:
 
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+    GPLv2
 
 On Debian systems, the complete text of the GNU General Public License
-may be found in '/usr/share/common-licenses/GPL'.
+Version 2 may be found in '/usr/share/common-licenses/GPL-2'.
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/python-logilab-common.docs b/debian/python-logilab-common.docs
deleted file mode 100644
index 3ff7356..0000000
--- a/debian/python-logilab-common.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/html/*
diff --git a/debian/python-logilab-common.postinst b/debian/python-logilab-common.postinst
deleted file mode 100644
index c426afd..0000000
--- a/debian/python-logilab-common.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh -e
-#
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python-logilab-common.preinst b/debian/python-logilab-common.preinst
deleted file mode 100644
index 3db35ef..0000000
--- a/debian/python-logilab-common.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/bash
-#
-
-set -e
-
-if [ $1 = upgrade ] ; then 
-    if [ $2 = 0.9.3-1 ] ; then 
-	rm -f /usr/lib/python*/site-packages/logilab/__init__.py*
-    fi
-fi 
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python-logilab-common.prerm b/debian/python-logilab-common.prerm
deleted file mode 100644
index c426afd..0000000
--- a/debian/python-logilab-common.prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh -e
-#
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index d05f8e7..e15c1e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,42 +14,51 @@
 build: build-stamp
 build-stamp: 
 	dh_testdir
+	
+	# python module build
 	python setup.py -q build
+
+	# build doc
+	$(MAKE) -C doc
+
 	touch build-stamp
 
 clean: 
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -rf build
-	find . -name "*.pyc" | xargs rm -f
-	rm -f changelog.gz
-	dh_clean
+	
+	# clean doc
+	$(MAKE) -C doc clean
+
+	python setup.py clean
+
+	find . -name "*.pyc" -delete
+
+	dh_clean build-stamp build
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+
 	python setup.py -q install --no-compile --prefix=debian/python-logilab-common/usr/ --install-headers=debian/python-logilab-common/usr/include/ --install-scripts=debian/python-logilab-common/usr/bin
+
 	# remove test directory (installed in in the doc directory)
 	rm -rf debian/python-logilab-common/usr/lib/python*/site-packages/logilab/common/test
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir 
 	dh_testroot 
 	dh_install -i
 	dh_pycentral -i 
-	gzip -9 -c ChangeLog > changelog.gz
-	dh_installchangelogs -i
+	dh_installchangelogs -i ChangeLog
 	dh_installexamples -i
-	dh_installdocs -i README changelog.gz
+	dh_installdocs -i 	README doc/apidoc/
 	dh_installman -i
 	dh_link -i
-	dh_compress -i -X.py -X.ini -X.xml -Xtest  
-	gzip -9 debian/python-logilab-common/usr/share/man/man1/pytest.1
+	dh_compress -i		-X.py -X.ini -X.xml -Xtest/ -Xapidoc/
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i