[med-svn] r6131 - trunk/packages/python-cogent/trunk/debian

Andreas Tille tille at alioth.debian.org
Tue Mar 1 13:19:14 UTC 2011 

Author: tille
Date: 2011-03-01 13:19:13 +0000 (Tue, 01 Mar 2011)
New Revision: 6131

Added:
   trunk/packages/python-cogent/trunk/debian/links
Removed:
   trunk/packages/python-cogent/trunk/debian/README.Debian
   trunk/packages/python-cogent/trunk/debian/examples
Modified:
   trunk/packages/python-cogent/trunk/debian/changelog
   trunk/packages/python-cogent/trunk/debian/control
   trunk/packages/python-cogent/trunk/debian/docs
   trunk/packages/python-cogent/trunk/debian/python-cogent.doc-base
   trunk/packages/python-cogent/trunk/debian/pyversions
   trunk/packages/python-cogent/trunk/debian/rules
Log:
Build ocumentation as html, use short dh rules file instead of cdbs to simplify moving around the docs; uploaded to main instead of non-free


Deleted: trunk/packages/python-cogent/trunk/debian/README.Debian
===================================================================
--- trunk/packages/python-cogent/trunk/debian/README.Debian	2011-03-01 13:16:56 UTC (rev 6130)
+++ trunk/packages/python-cogent/trunk/debian/README.Debian	2011-03-01 13:19:13 UTC (rev 6131)
@@ -1,3 +0,0 @@
-The package is in non-free just because some comparatively tiny contribution
-by someone who is limiting his code for free use in acedemia only.
-The user needs to think strongly if he/she can use this package.

Modified: trunk/packages/python-cogent/trunk/debian/changelog
===================================================================
--- trunk/packages/python-cogent/trunk/debian/changelog	2011-03-01 13:16:56 UTC (rev 6130)
+++ trunk/packages/python-cogent/trunk/debian/changelog	2011-03-01 13:19:13 UTC (rev 6131)
@@ -2,8 +2,18 @@
 
   * debian/copyright: Clarified license of two single non-free files
     -> package can go to main
-  * Added myself to uploaders
-  * python-central -> python-support
+  * debian/control:
+    - Added myself to uploaders
+    - python-central -> python-support
+    - Build-Depends: python-sphinx to create doc in HTML format
+    - Depends: libjs-jquery to enable using Debian packaged version
+      of this JS library
+  * debian/rules:
+    - Short dh syntax to simplyfy the following tasks
+    - Build html doc from rst
+    - avoid compressing used files
+  * Removed README.Debian because the non-free issue is solved
+  * debian/links: Link against Debian's jquery.js
 
  -- Andreas Tille <tille at debian.org>  Tue, 01 Mar 2011 11:30:18 +0100
 

Modified: trunk/packages/python-cogent/trunk/debian/control
===================================================================
--- trunk/packages/python-cogent/trunk/debian/control	2011-03-01 13:16:56 UTC (rev 6130)
+++ trunk/packages/python-cogent/trunk/debian/control	2011-03-01 13:19:13 UTC (rev 6131)
@@ -5,17 +5,16 @@
 Uploaders: Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>,
  Steffen Moeller <moeller at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, python, python-support, python-numpy (>= 1.3.0), python-all-dev
+Build-Depends: debhelper (>= 7.1), python-all-dev, python-support, python-numpy (>= 1.3.0),
+ python-sphinx
 Standards-Version: 3.9.1
 Homepage: http://pycogent.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/python-cogent/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/python-cogent/trunk/
-XS-Python-Version: >= 2.5
 
 Package: python-cogent
 Architecture: any
-XB-Python-Version:  ${python:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libjs-jquery
 Description: framework for genomic biology
  PyCogent is a software library for genomic biology. It is a fully
  integrated and thoroughly tested framework for: controlling third-party

Modified: trunk/packages/python-cogent/trunk/debian/docs
===================================================================
--- trunk/packages/python-cogent/trunk/debian/docs	2011-03-01 13:16:56 UTC (rev 6130)
+++ trunk/packages/python-cogent/trunk/debian/docs	2011-03-01 13:19:13 UTC (rev 6131)
@@ -1,17 +1,3 @@
-cogent-requirements.txt
 NumpyPortingNotes.txt
 README
-doc/ChangeLog.rst
-doc/conf.py
-doc/data_file_links.rst
-doc/doctest_rsts.py
-doc/install.rst
-doc/cookbook
-doc/developer_notes.rst
-doc/licenses.rst
-doc/README.rst
-doc/data
-doc/doctest2script.py
-doc/index.rst 
-doc/templates
-
+doc/_build/html

Deleted: trunk/packages/python-cogent/trunk/debian/examples
===================================================================
--- trunk/packages/python-cogent/trunk/debian/examples	2011-03-01 13:16:56 UTC (rev 6130)
+++ trunk/packages/python-cogent/trunk/debian/examples	2011-03-01 13:19:13 UTC (rev 6131)
@@ -1 +0,0 @@
-doc/examples/*

Added: trunk/packages/python-cogent/trunk/debian/links
===================================================================
--- trunk/packages/python-cogent/trunk/debian/links	                        (rev 0)
+++ trunk/packages/python-cogent/trunk/debian/links	2011-03-01 13:19:13 UTC (rev 6131)
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js	usr/share/doc/python-cogent/html/_static/jquery.js

Modified: trunk/packages/python-cogent/trunk/debian/python-cogent.doc-base
===================================================================
--- trunk/packages/python-cogent/trunk/debian/python-cogent.doc-base	2011-03-01 13:16:56 UTC (rev 6130)
+++ trunk/packages/python-cogent/trunk/debian/python-cogent.doc-base	2011-03-01 13:19:13 UTC (rev 6131)
@@ -1,9 +1,16 @@
 Document: python-cogent
 Title: Debian python-cogent Manual
 Author: The Cogent Project
-Abstract: This manual introduces to the
- concepts behind PyCogent.
+Abstract: PyCogent documentation
+ PyCogent is a software library for genomic biology. It is a fully
+ integrated and thoroughly tested framework for: controlling third-party
+ applications; devising workflows; querying databases; conducting novel
+ probabilistic analyses of biological sequence evolution; and generating
+ publication quality graphics. It is distinguished by many unique built-in
+ capabilities (such as true codon alignment) and the frequent addition of
+ entirely new methods for the analysis of genomic data.
 Section: Science/Biology
 
-Format: text
-Files: /usr/share/doc/python-cogent/cookbook/*
+Format: html
+Files: /usr/share/doc/python-cogent/html/*
+Index: /usr/share/doc/python-cogent/html/index.html

Modified: trunk/packages/python-cogent/trunk/debian/pyversions
===================================================================
--- trunk/packages/python-cogent/trunk/debian/pyversions	2011-03-01 13:16:56 UTC (rev 6130)
+++ trunk/packages/python-cogent/trunk/debian/pyversions	2011-03-01 13:19:13 UTC (rev 6131)
@@ -1 +1 @@
-all
+2.4-

Modified: trunk/packages/python-cogent/trunk/debian/rules
===================================================================
--- trunk/packages/python-cogent/trunk/debian/rules	2011-03-01 13:16:56 UTC (rev 6130)
+++ trunk/packages/python-cogent/trunk/debian/rules	2011-03-01 13:19:13 UTC (rev 6131)
@@ -4,10 +4,22 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_PYTHON_SYSTEM=pysupport
+PKG := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+%:
+	dh $@
 
-clean::
+override_dh_clean:
 	rm -rf build build-stamp
+	rm -rf doc/_build
+	dh_clean
+
+override_dh_auto_build:
+	cd doc; $(MAKE) html
+
+override_dh_compress:
+	dh_compress --exclude=.js --exclude=.fasta --exclude=.txt --exclude=.pdb
+
+override_dh_installdocs:
+	dh_installdocs
+	rm -rf debian/$(PKG)/usr/share/doc/$(PKG)/html/_sources

More information about the debian-med-commit mailing list