[Python-modules-commits] r7047 - in packages/logilab-common/trunk/debian (7 files)

Sun Nov 30 10:34:11 UTC 2008

Date: Sunday, November 30, 2008 @ 10:34:10
  Author: morph
Revision: 7047

  - added python-epydoc to build-dep-indep (to build doc)
* debian/rules
  - install upstream 'Changelog' using dh_installchangelog
  - added build, clean and install for documentation
* debian/python-logilab-common.{postinst,preinst,prerm}
  - removed since not needed
* debian/python-logilab-common.docs
  - removed: installed non-existing files, using debian/rules
* upload to debian

Modified:
  packages/logilab-common/trunk/debian/changelog
  packages/logilab-common/trunk/debian/control
  packages/logilab-common/trunk/debian/rules
Deleted:
  packages/logilab-common/trunk/debian/python-logilab-common.docs
  packages/logilab-common/trunk/debian/python-logilab-common.postinst
  packages/logilab-common/trunk/debian/python-logilab-common.preinst
  packages/logilab-common/trunk/debian/python-logilab-common.prerm

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================

--- packages/logilab-common/trunk/debian/changelog	2008-11-29 23:37:52 UTC (rev 7046)
+++ packages/logilab-common/trunk/debian/changelog	2008-11-30 10:34:10 UTC (rev 7047)
@@ -7,14 +7,22 @@
     - added Vcs-{Svn,Browser} field
     - replace 'python' with ${python:Depends} and added ${misc:Depends} to
       Depends
+    - added python-epydoc to build-dep-indep (to build doc)
   * debian/pycompat
     - removed since no more needed
+  * debian/rules
+    - install upstream 'Changelog' using dh_installchangelog
+    - added build, clean and install for documentation
+  * debian/python-logilab-common.{postinst,preinst,prerm}
+    - removed since not needed
+  * debian/python-logilab-common.docs
+    - removed: installed non-existing files, using debian/rules
 
  -- Sandro Tosi <morph at debian.org>  Sat, 29 Nov 2008 23:47:00 +0100
 
 logilab-common (0.30.0-2) unstable; urgency=low
 
-  * upload to debian
+  * upload to debian
 
  -- Alexandre Fayolle <afayolle at debian.org>  Mon, 21 Apr 2008 17:24:28 +0200
 

Modified: packages/logilab-common/trunk/debian/control
===================================================================
--- packages/logilab-common/trunk/debian/control	2008-11-29 23:37:52 UTC (rev 7046)
+++ packages/logilab-common/trunk/debian/control	2008-11-30 10:34:10 UTC (rev 7047)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: David Douard <david.douard at logilab.fr>, Alexandre Fayolle <afayolle at debian.org>, Sandro Tosi <morph at debian.org>
 Build-Depends: debhelper (>= 5.0.38)
-Build-Depends-Indep: python (>=2.3.5-7), python-central (>=0.5.6)
+Build-Depends-Indep: python (>=2.3.5-7), python-central (>=0.5.6), python-epydoc
 XS-Python-Version: all
 Standards-Version: 3.8.0
 Homepage: http://www.logilab.org/project/logilab-common

Deleted: packages/logilab-common/trunk/debian/python-logilab-common.docs
===================================================================
--- packages/logilab-common/trunk/debian/python-logilab-common.docs	2008-11-29 23:37:52 UTC (rev 7046)
+++ packages/logilab-common/trunk/debian/python-logilab-common.docs	2008-11-30 10:34:10 UTC (rev 7047)
@@ -1 +0,0 @@
-doc/html/*

Deleted: packages/logilab-common/trunk/debian/python-logilab-common.postinst
===================================================================
--- packages/logilab-common/trunk/debian/python-logilab-common.postinst	2008-11-29 23:37:52 UTC (rev 7046)
+++ packages/logilab-common/trunk/debian/python-logilab-common.postinst	2008-11-30 10:34:10 UTC (rev 7047)
@@ -1,6 +0,0 @@
-#! /bin/sh -e
-#
-
-#DEBHELPER#
-
-exit 0

Deleted: packages/logilab-common/trunk/debian/python-logilab-common.preinst
===================================================================
--- packages/logilab-common/trunk/debian/python-logilab-common.preinst	2008-11-29 23:37:52 UTC (rev 7046)
+++ packages/logilab-common/trunk/debian/python-logilab-common.preinst	2008-11-30 10:34:10 UTC (rev 7047)
@@ -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

Deleted: packages/logilab-common/trunk/debian/python-logilab-common.prerm
===================================================================
--- packages/logilab-common/trunk/debian/python-logilab-common.prerm	2008-11-29 23:37:52 UTC (rev 7046)
+++ packages/logilab-common/trunk/debian/python-logilab-common.prerm	2008-11-30 10:34:10 UTC (rev 7047)
@@ -1,6 +0,0 @@
-#! /bin/sh -e
-#
-
-#DEBHELPER#
-
-exit 0

Modified: packages/logilab-common/trunk/debian/rules
===================================================================
--- packages/logilab-common/trunk/debian/rules	2008-11-29 23:37:52 UTC (rev 7046)
+++ packages/logilab-common/trunk/debian/rules	2008-11-30 10:34:10 UTC (rev 7047)
@@ -14,7 +14,13 @@
 build: build-stamp
 build-stamp: 
 	dh_testdir
+	
+	# python module build
 	python setup.py -q build
+
+	# build doc
+	$(MAKE) -C doc
+
 	touch build-stamp
 
 clean: 
@@ -22,8 +28,10 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -rf build
+	
+	# clean doc
+	$(MAKE) -C doc clean
 	find . -name "*.pyc" | xargs rm -f
-	rm -f changelog.gz
 	dh_clean
 
 install: build
@@ -35,17 +43,15 @@
 	# 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  


