[med-svn] [SCM] jellyfish branch, master, updated. upstream/1.1.2-13-gb69dfee

[Andreas Tille]

The following commit has been merged in the master branch:
commit 02174e194fbcff8cd067846fa86783367d113287
Author: Andreas Tille <tille at debian.org>
Date:   Sat Mar 31 08:46:29 2012 +0200

    Move citation from long desciption to debian/upstream

diff --git a/debian/changelog b/debian/changelog
index dbdc8ff..4254f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ jellyfish (1.1.4-1) UNRELEASED; urgency=low
   * debian/source/local-options: Add dpkg-source local-options hints
   * debian/control:
      - Standards-Version: 3.9.3 (no changes needed)
+     - Move citation from long desciption to debian/upstream
+  * debian/upstream: Use the agreed way to specify citations
 
- -- Andreas Tille <tille at debian.org>  Sat, 31 Mar 2012 08:38:05 +0200
+ -- Andreas Tille <tille at debian.org>  Sat, 31 Mar 2012 08:45:23 +0200
 
 jellyfish (1.1.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5c471e6..75f5825 100644
--- a/debian/control
+++ b/debian/control
@@ -29,9 +29,3 @@ Description: count k-mers in DNA sequences
  files containing DNA sequences. It outputs its k-mer counts in an
  binary format, which can be translated into a human-readable text
  format using the "jellyfish dump" command.
- .
- If you use JELLYFISH in your research, please cite:
- Guillaume Marcais and Carl Kingsford, A fast, lock-free approach for
- efficient parallel counting of occurrences of k-mers. Bioinformatics
- (2011) 27(6): 764-770 (first published online January 7, 2011)
- doi:10.1093/bioinformatics/btr011
diff --git a/debian/upstream b/debian/upstream
new file mode 100644
index 0000000..776ef70
--- /dev/null
+++ b/debian/upstream
@@ -0,0 +1,9 @@
+Reference:
+  Author: Guillaume Marcais and Carl Kingsford
+  Title: A fast, lock-free approach for efficient parallel counting of occurrences of k-mers
+  Journal: Bioinformatics
+  Year: 2011
+  Volume: 27
+  Number: 6
+  Pages: 764-770
+  DOI: 10.1093/bioinformatics/btr011

-- 
count k-mers of DNA