[med-svn] [khmer] branch master updated (10fcdeb -> 6c013a3)

[Michael Crusoe]

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

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

from 10fcdeb Fix some trivial things in autopkgtest
new 510bd87 work around module renaming
new 6c013a3 cleanup changelog

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
debian/changelog | 26 +-------------------------
debian/khmer.links | 1 +
debian/rules | 3 ++-
3 files changed, 4 insertions(+), 26 deletions(-)
create mode 100644 debian/khmer.links

[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 510bd874295813c9d436bde5ddc315cca737bcea
Author: Michael R. Crusoe <***@msu.edu>
Date: Wed Feb 11 08:48:29 2015 -0500

work around module renaming
---
debian/khmer.links | 1 +
debian/rules | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/khmer.links b/debian/khmer.links
new file mode 100644
index 0000000..7b774a8
--- /dev/null
+++ b/debian/khmer.links
@@ -0,0 +1 @@
+usr/lib/python2.7/dist-packages/khmer/_khmermodule.x86_64-linux-gnu.so usr/lib/python2.7/dist-packages/khmer/_khmermodule.so
diff --git a/debian/rules b/debian/rules
index ea9e664..b64e2b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,8 @@ override_dh_auto_build:
dh_auto_build
ln -s "`pwd`"/.pybuild/pythonX.Y_*/build/khmer/*.so khmer && \
./setup.py build_sphinx
- ronn -r --manual=khmer --organization='Michigan State University' debian/khmer.1.ronn
+ ronn -r --manual=khmer --organization='Michigan State University' \
+ debian/khmer.1.ronn

override_dh_auto_test:
PYBUILD_SYSTEM=custom \

[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 6c013a30907ed48c2c866efde2bf25de401d71af
Author: Michael R. Crusoe <***@msu.edu>
Date: Wed Feb 11 09:31:02 2015 -0500

cleanup changelog
---
debian/changelog | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e675ca..bdfbc06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,29 +1,5 @@
khmer (1.3+dfsg-1) UNRELEASED; urgency=medium

- * Update for new release
+ * Initial upload (Closes: #777688)

-- Michael R. Crusoe <***@msu.edu> Tue, 27 Jan 2015 16:07:19 -0500
-
-khmer (1.2~rc1-77-g7ca05b4-4) trusty; urgency=medium
-
- * Build-depends on python-nose
-
- -- Michael R. Crusoe <***@gmail.com> Thu, 25 Sep 2014 09:35:59 -0400
-
-khmer (1.2~rc1-77-g7ca05b4-3) trusty; urgency=medium
-
- * Build-depend on zlib & bzip2
-
- -- Michael R. Crusoe <***@gmail.com> Thu, 25 Sep 2014 03:24:43 -0400
-
-khmer (1.2~rc1-77-g7ca05b4-2) trusty; urgency=medium
-
- * Use an older version of setuptools
-
- -- Michael R. Crusoe <***@gmail.com> Thu, 25 Sep 2014 03:16:54 -0400
-
-khmer (1.2~rc1-77-g7ca05b4-1) trusty; urgency=medium
-
- * Initial release.
-
- -- Michael R. Crusoe <***@gmail.com> Wed, 24 Sep 2014 23:10:47 -0400