Sandro Tosi's packaging enhancements

5 files changed, 77 insertions, 41 deletions

diff --git a/debian/changelog b/debian/changelog
index 5813c99..305adbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,45 @@ pylint (0.16.0-1) unstable; urgency=low
 
  -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Wed, 28 Jan 2009 12:15:07 +0100
 
+pylint (0.15.2-2) UNRELEASED; urgency=low
+
+  * debian/control
+    - added Vcs-{Svn,Browser} field
+
+ -- Sandro Tosi <morph@debian.org>  Sat, 29 Nov 2008 14:44:41 +0100
+
 pylint (0.15.2-1) unstable; urgency=low
 
+  * New upstream release
+  * debian/control
+    - added under PAPT umbrella (in agreement with Alexandre Fayolle)
+    - added me to uploaders
+    - moved Homepage field to source stanza
+    - bump Standards-Version to 3.8.0
+      + added debian/README.source
+    - moved python (removing version, since we are in a 2.4+2.5 distribution) to
+      build-dep from build-dep-indep (to satisfy clean target needs)
+    - added ${python:Depends}, ${misc:Depends} to depends instead of directly
+      depending on "python" package
+  * debian/watch
+    - bump verstion to 3
+    - left only the url to scan, adding "opts=pasv" for ftp scan
+  * debian/pylint.docs
+    - install all doc/ directory files
+    - added README and TODO (from debian/rules)
+  * debian/rules
+    - merged 'rm -f' commands into dh_clean call
+    - added "python setup.py clean" call in clean target
+    - install upstream "Changelog" using dh_installchangelog
+    - removed files passed to dh_installdocs since using debian/pylint.docs and
+      because debian/NEWS.Debian is automatically installed
+    - using '-delete' find option instead of xargs
+    - fix executables shebang with a for loop
+
+ -- Sandro Tosi <morph@debian.org>  Wed, 26 Nov 2008 16:45:36 +0100
+
+pylint (0.15.2-0) unstable; urgency=low
+
   * new upstream release
 
  -- Emile Anclin <emile.anclin@logilab.fr>  Mon,  13 Oct 2008 13:38:00 +0200
@@ -24,6 +61,12 @@ pylint (0.15.0-1) unstable; urgency=low
 
  -- Emile Anclin <emile.anclin@logilab.fr>  Wed,  10 Sep 2008 12:16:00 +0200
 
+pylint (0.14.0-2.2) unstable; urgency=low
+
+  * NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490488.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 18 Jul 2008 15:53:30 +0000
+
 pylint (0.14.0-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 5475d34..71b65a0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,19 @@
 Source: pylint
 Section: python
 Priority: optional
-Maintainer: Sylvain Thénault <sylvain.thenault@logilab.fr>
-Uploaders: Alexandre Fayolle <afayolle@debian.org> 
-Build-Depends: debhelper (>= 5.0.38)
-Build-Depends-Indep: python (>=2.3.5-7), python-central (>=0.5.6)
+Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
+Uploaders: Sylvain Thénault <sylvain.thenault@logilab.fr>, Alexandre Fayolle <afayolle@debian.org>, Sandro Tosi <morph@debian.org>
+Build-Depends: debhelper (>= 5.0.38), python
+Build-Depends-Indep: python-central (>=0.5.6)
 Standards-Version: 3.8.0
-Homepage: http://www.logilab.org/Project/name/pylint
 XS-Python-Version: all
+Homepage: http://www.logilab.org/Project/name/pylint
+Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/pylint/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pylint/trunk/
 
 Package: pylint
 Architecture: all
-Depends: python, python-logilab-common (>= 0.35.0), python-logilab-astng (>= 0.17.3)
+Depends: ${python:Depends}, ${misc:Depends}, python-logilab-common (>= 0.35.0), python-logilab-astng (>= 0.17.3)
 Recommends: python-tk
 XB-Python-Version: ${python:Versions}
 Conflicts: python2.2-pylint, python2.3-pylint, python2.4-pylint, pylint-common, pylint-test
@@ -35,5 +37,3 @@ Description: python code static checker and UML diagram generator
  . 
  The recommended python-tk package is only for using the pylint-gui
  script.
- 
-
diff --git a/debian/pylint.docs b/debian/pylint.docs
index 27ad787..99f8275 100644
--- a/debian/pylint.docs
+++ b/debian/pylint.docs
@@ -1,6 +1,3 @@
-doc/features.html
-doc/quickstart.html
-doc/FAQ.html
-doc/FAQ.txt
-doc/quickstart.txt
-doc/features.txt
+doc/*
+README
+TODO
diff --git a/debian/rules b/debian/rules
index 06c3942..525560d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,57 +10,55 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
 build: build-stamp
-build-stamp: 
+build-stamp:
 	dh_testdir
 	python setup.py -q build
 	touch build-stamp
 
-clean: 
+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
+
+	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/pylint/usr/
 
 	rm -rf debian/pylint/usr/lib/python*/site-packages/pylint/test
-	if head -1 debian/pylint/usr/bin/pylint | grep "^#! */usr/bin" | grep "python" >/dev/null ; then \
-		sed -i "s@^#! */usr/bin/env \+python\$$@#!/usr/bin/python@" debian/pylint/usr/bin/pylint; \
-	fi
-	chmod a+x debian/pylint/usr/bin/pylint
-	if head -1 debian/pylint/usr/bin/pylint-gui | grep "^#! */usr/bin" | grep "python" >/dev/null ; then \
-		sed -i "s@^#! */usr/bin/env \+python\$$@#!/usr/bin/python@" debian/pylint/usr/bin/pylint-gui; \
-	fi
-	chmod a+x debian/pylint/usr/bin/pylint-gui
-	if head -1 debian/pylint/usr/bin/symilar | grep "^#! */usr/bin" | grep "python" >/dev/null ; then \
-		sed -i "s@^#! */usr/bin/env \+python\$$@#!/usr/bin/python@" debian/pylint/usr/bin/symilar; \
-	fi
-	chmod a+x debian/pylint/usr/bin/symilar
+
+	# fixes shebangs
+	for exec in pylint pylint-gui symilar ; do \
+	  if head -1 debian/pylint/usr/bin/$$exec | grep "^#! */usr/bin" | grep "python" >/dev/null ; then \
+		sed -i "s@^#! */usr/bin/env \+python\$$@#!/usr/bin/python@" debian/pylint/usr/bin/$$exec; \
+	  fi ; \
+	  chmod a+x debian/pylint/usr/bin/$$exec; \
+	done
+
 	install -m 644 elisp/pylint.el debian/pylint/usr/share/emacs/site-lisp/pylint/
 
 	# install tests
 	#(cd test && find . -type f -not \( -path '*/CVS/*' -or -name '*.pyc' \) -exec install -D --mode=644 {} ../debian/pylint/usr/share/doc/pylint/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 TODO changelog.gz debian/NEWS.Debian
+	dh_installdocs -i
 	dh_installman -i
 	dh_installemacsen
 	dh_link -i
@@ -75,4 +73,3 @@ binary-arch:
 
 binary: binary-indep
 .PHONY: build clean binary binary-indep binary-arch
-
diff --git a/debian/watch b/debian/watch
index 52cc0a2..0c0b773 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
-version=2
-ftp://ftp.logilab.org/pub/pylint/pylint-(.*)\.tar\.gz debian uupdate
-
+version=3
+opts=pasv ftp://ftp.logilab.org/pub/pylint/pylint-(.*)\.tar\.gz