[med-svn] [khmer] 01/08: More cleanups

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to branch master
in repository khmer.

commit b3f8d03f5b5fcc3680236ebbcb192007075ed9ef
Author: Michael R. Crusoe <mcrusoe at msu.edu>
Date:   Fri Jan 30 17:09:24 2015 -0500

    More cleanups
---
 debian/control                | 28 +++++++++++++++++++++-------
 debian/inject-into-alioth-git | 18 ------------------
 debian/patches/local-libs     |  3 ---
 debian/rules                  |  2 +-
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index 8714c49..f708b33 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,36 @@
 Source: khmer
-Section: science
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Michael R. Crusoe <mcrusoe at msu.edu>
-Build-Depends: python-screed, python2.7-dev, debhelper (>= 9), dh-python, python2.7, python (>= 2.7), python | python-all | python-dev | python-all-dev, python-setuptools (>= 3.3), zlib1g-dev, libbz2-dev, python-nose
+Section: science
+Priority: optional
+Build-Depends: python-screed,
+               python2.7-dev,
+               debhelper (>= 9),
+               dh-python,
+               python2.7,
+               python (>= 2.7),
+               python | python-all | python-dev | python-all-dev,
+               python-setuptools (>= 3.3),
+               zlib1g-dev,
+               libbz2-dev,
+               python-nose
 Standards-Version: 3.9.5
-Homepage: http://khmer.readthedocs.org
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/khmer.git
 Vcs-Git: git://anonscm.debian.org/debian-med/khmer.git
-Testsuite: autopkgtest
+Homepage: http://khmer.readthedocs.org
 X-Python-Version: 2.7
 
 Package: khmer
 Architecture: amd64
 Section: science
 Priority: optional
-Depends: python (>= 2.7), python (<< 2.8), ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
-Description: In-memory DNA sequence k-mer counting, filtering & graph traversal
+Depends: python (>= 2.7),
+         python (<< 2.8),
+         python-screed,
+         ${misc:Depends},
+         ${shlibs:Depends},
+         ${python:Depends}
+Description: in-memory DNA sequence kmer counting, filtering & graph traversal
  khmer is a library and suite of command line tools for working with DNA
  sequence. It is primarily aimed at short-read sequencing data such as that
  produced by the Illumina platform. khmer takes a k-mer-centric approach to
diff --git a/debian/inject-into-alioth-git b/debian/inject-into-alioth-git
deleted file mode 100755
index 02c2222..0000000
--- a/debian/inject-into-alioth-git
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-echo "Please verify whether this script is obsoleted by gbp-create-remote-repo !"
-
-# This script implements the "Git tips" given here
-#   http://debian-med.alioth.debian.org/docs/policy.html#git-tips
-# Use it with caution since it is less testet
-
-DEBPKGNAME=`dpkg-parsechangelog | awk '/^Source:/ {print $2}'`
-SHORTDESC=`grep "^Description: " debian/control | head -n 1 | sed 's/^Description: //'`
-VCSGIT=`grep "^Vcs-Git: " debian/control | sed -e 's/^Vcs-Git: //' -e 's#git://anonscm.debian.org/#ssh://git.debian.org/git/#'`
-DIRatALIOTH=`echo $VCSGIT | sed -e 's#ssh://git.debian.org/git/#/git/#' -e 's#/[^/]\+\.git##'`
-
-ssh git.debian.org "cd $DIRatALIOTH; ./setup-repository $DEBPKGNAME '$SHORTDESC'"
-git remote add origin $VCSGIT
-git push origin master
-git push --all --set-upstream
-git push --tags
diff --git a/debian/patches/local-libs b/debian/patches/local-libs
index 82916a0..b742221 100644
--- a/debian/patches/local-libs
+++ b/debian/patches/local-libs
@@ -16,9 +16,6 @@ checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 are templates for supplementary fields that you might want to add:
 
 Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
diff --git a/debian/rules b/debian/rules
index e405081..8788633 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@ export PYBUILD_NAME=khmer
 export PYBUILD_SYSTEM=distutils
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with python2,sphinxdoc --buildsystem=pybuild

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/khmer.git