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

[Andreas Tille]

Author: tille
Date: 2011-11-29 10:52:14 +0000 (Tue, 29 Nov 2011)
New Revision: 8699

Added:
   trunk/packages/python-pynast/trunk/debian/links
Modified:
   trunk/packages/python-pynast/trunk/debian/changelog
   trunk/packages/python-pynast/trunk/debian/compat
   trunk/packages/python-pynast/trunk/debian/control
   trunk/packages/python-pynast/trunk/debian/rules
Log:
Properly use prepackaged JavaScript libraries


Modified: trunk/packages/python-pynast/trunk/debian/changelog
===================================================================
--- trunk/packages/python-pynast/trunk/debian/changelog	2011-11-29 10:43:50 UTC (rev 8698)
+++ trunk/packages/python-pynast/trunk/debian/changelog	2011-11-29 10:52:14 UTC (rev 8699)
@@ -7,8 +7,16 @@
   * Changing name from python-pynast to pynast.
 
   [ Andreas Tille ]
-  * Added myself and Tim Booth <tbooth at ceh.ac.uk> to Uploaders
+  * debian/control:
+    - Added myself and Tim Booth <tbooth at ceh.ac.uk> to Uploaders
+    - Fixed Vcs fields
+    - Removed duplicated ${misc:Depends}
+    - Removed unneeded ${shlibs:Depends}
+    - Depends: libjs-jquery, libjs-underscore
   * debian/copyright: DEP5
+  * Dephelper 8 (control+compat)
+  * debian/links: Link packages JavaScript libraries
+  * debian/rules: remove incomplete links to JavaScript libraries
 
  -- Andreas Tille <tille at debian.org>  Tue, 29 Nov 2011 11:22:19 +0100
 

Modified: trunk/packages/python-pynast/trunk/debian/compat
===================================================================
--- trunk/packages/python-pynast/trunk/debian/compat	2011-11-29 10:43:50 UTC (rev 8698)
+++ trunk/packages/python-pynast/trunk/debian/compat	2011-11-29 10:52:14 UTC (rev 8699)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/python-pynast/trunk/debian/control
===================================================================
--- trunk/packages/python-pynast/trunk/debian/control	2011-11-29 10:43:50 UTC (rev 8698)
+++ trunk/packages/python-pynast/trunk/debian/control	2011-11-29 10:52:14 UTC (rev 8699)
@@ -5,20 +5,20 @@
 Uploaders: Steffen Moeller <moeller at debian.org>,
  Andreas Tille <tille at debian.org>,
  Tim Booth <tbooth at ceh.ac.uk>
-Build-Depends: debhelper (>= 7), python (>= 2.6.6-3~), python-central, python-cogent, python-sphinx
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-central, python-cogent, python-sphinx
 XS-Autobuild: yes
 Standards-Version: 3.9.2
 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/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/python-nast/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/python-nast/trunk/
 X-Python-Version: >= 2.5
 
 Package: python-pynast
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, libjs-jquery, libjs-underscore
 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
+ Space Termination tool in Python. It was prepared for next generation
  sequencers.
  .
  Given a set of sequences and a template alignment, PyNAST will align the

Added: trunk/packages/python-pynast/trunk/debian/links
===================================================================
--- trunk/packages/python-pynast/trunk/debian/links	                        (rev 0)
+++ trunk/packages/python-pynast/trunk/debian/links	2011-11-29 10:52:14 UTC (rev 8699)
@@ -0,0 +1,2 @@
+usr/share/javascript/jquery/jquery.js		usr/share/doc/python-pynast/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js	usr/share/doc/python-pynast/html/_static/underscore.js

Modified: trunk/packages/python-pynast/trunk/debian/rules
===================================================================
--- trunk/packages/python-pynast/trunk/debian/rules	2011-11-29 10:43:50 UTC (rev 8698)
+++ trunk/packages/python-pynast/trunk/debian/rules	2011-11-29 10:52:14 UTC (rev 8699)
@@ -7,10 +7,6 @@
 #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=python-pynast
-
 %:
 	dh $@ --with $(DEB_PYTHON_SUPPORT)
 
@@ -25,7 +21,6 @@
 #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: