[med-svn] r7549 - trunk/packages/python-pynast/trunk/debian

[Timothy Booth]

Author: tbooth-guest
Date: 2011-08-26 10:32:46 +0000 (Fri, 26 Aug 2011)
New Revision: 7549

Modified:
   trunk/packages/python-pynast/trunk/debian/changelog
   trunk/packages/python-pynast/trunk/debian/control
   trunk/packages/python-pynast/trunk/debian/rules
Log:
Clean up and fix Lintian warnings.
Renamed main package from python-pynast to just pynast but
this is not a final decision.


Modified: trunk/packages/python-pynast/trunk/debian/changelog
===================================================================
--- trunk/packages/python-pynast/trunk/debian/changelog	2011-08-26 09:20:44 UTC (rev 7548)
+++ trunk/packages/python-pynast/trunk/debian/changelog	2011-08-26 10:32:46 UTC (rev 7549)
@@ -1,3 +1,17 @@
+python-pynast (1.1-2ubuntu4) lucid; urgency=low
+
+  * Fix Lintian warning on docs, clean up build file
+  * Allow building with either python2 or python-central 
+  * Renamed main package to pynast
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Fri, 26 Aug 2011 11:29:17 +0100
+
+python-pynast (1.1-2ubuntu3) lucid; urgency=low
+
+  * Rebuild for Lucid, lowered dependencies 
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Fri, 26 Aug 2011 10:05:42 +0100
+
 python-pynast (1.1-2) unstable; urgency=low
 
   * Transition to dh7 and dh_python2

Modified: trunk/packages/python-pynast/trunk/debian/control
===================================================================
--- trunk/packages/python-pynast/trunk/debian/control	2011-08-26 09:20:44 UTC (rev 7548)
+++ trunk/packages/python-pynast/trunk/debian/control	2011-08-26 10:32:46 UTC (rev 7549)
@@ -3,17 +3,16 @@
 Priority: extra
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>
-Build-Depends: debhelper (>= 7), python (>= 2.6.6-3~), python-central, python-cogent, python-sphinx
-XS-Autobuild: yes
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.5), python-cogent, python-sphinx
+Standards-Version: 3.9.1
 Homepage: http://pynast.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/python-nast/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/python-nast/trunk/
 X-Python-Version: >= 2.5
 
-Package: python-pynast
+Package: pynast
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${misc:Depends}, ${python:Depends}, libjs-jquery
 Description: alignment of short DNA sequences
  The package provices a reimplementation of the Nearest Alignment 
  Space Termination tool in python. It was prepared for next generation

Modified: trunk/packages/python-pynast/trunk/debian/rules
===================================================================
--- trunk/packages/python-pynast/trunk/debian/rules	2011-08-26 09:20:44 UTC (rev 7548)
+++ trunk/packages/python-pynast/trunk/debian/rules	2011-08-26 10:32:46 UTC (rev 7549)
@@ -4,14 +4,29 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-#include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/class/python-distutils.mk
+#Allowing this to be overridden by environemnt helps with backports
+DEB_PYTHON_SUPPORT?=python2
 
+#Do the docs go into their own package?
+#DOC_PKG=pynast-doc
+DOC_PKG=pynast
+
 %:
-	dh $@ --with python2
+	dh $@ --with $(DEB_PYTHON_SUPPORT)
 
-build-indep:
+override_dh_auto_build:
+	dh_auto_build
 	$(MAKE) -C doc html
 
-clean::
-	rm -rf build build-stamp
+override_dh_auto_clean:
+	dh_auto_clean
+	$(MAKE) -C doc clean
+
+#Fix Lintian warning about jquery.js
+override_dh_installdocs:
+	dh_installdocs -X.buildinfo
+	dh_link -p $(DOC_PKG) /usr/share/javascript/jquery/jquery.js /usr/share/doc/$(DOC_PKG)/html/_static/jquery.js
+
+#Don't compress .js files
+override_dh_compress:
+	dh_compress -X.js