[med-svn] [kmer-tools] 01/02: Merge tag 'debian/0_20150903+r2013-1' into debian/jessie-backports

Afif Elghraoui afif-guest at moszumanska.debian.org
Sat Jan 16 05:33:34 UTC 2016


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

afif-guest pushed a commit to branch debian/jessie-backports
in repository kmer-tools.

commit 55c547ef069201fd3fde5edeb5c8c823ced9d860
Merge: 87104aa 05de1bf
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Fri Jan 15 21:06:53 2016 -0800

    Merge tag 'debian/0_20150903+r2013-1' into debian/jessie-backports
    
    Conflicts:
    	debian/changelog

 PACKAGING                                      |  104 +
 configure.sh                                   |    6 +-
 debian/README.Debian                           |   10 +
 debian/README.source                           |   24 +-
 debian/changelog                               |   23 +
 debian/control                                 |   59 +-
 debian/copyright                               |  101 +-
 debian/docs                                    |    3 -
 debian/get-orig-source                         |   32 +-
 debian/leaff.docs                              |    1 +
 debian/leaff.install                           |    1 +
 debian/leaff.manpages                          |    1 +
 debian/man/leaff/leaff.1                       |  159 +
 debian/{ => man/meryl}/existDB.1               |   21 +-
 debian/{ => man/meryl}/kmer-mask.1             |    0
 debian/{ => man/meryl}/mapMers-depth.1         |    0
 debian/{ => man/meryl}/mapMers.1               |    0
 debian/{ => man/meryl}/meryl.1                 |    0
 debian/{ => man/meryl}/positionDB.1            |    0
 debian/{ => man/meryl}/simple.1                |    0
 debian/man/sim4db/cleanPolishes.1              |    1 +
 debian/man/sim4db/comparePolishes.1            |    1 +
 debian/man/sim4db/convertPolishes.1            |    1 +
 debian/man/sim4db/convertToAtac.1              |    1 +
 debian/man/sim4db/convertToExtent.1            |    1 +
 debian/man/sim4db/depthOfPolishes.1            |    1 +
 debian/man/sim4db/detectChimera.1              |    1 +
 debian/man/sim4db/filterPolishes.1             |    1 +
 debian/man/sim4db/fixPolishesIID.1             |    1 +
 debian/man/sim4db/headPolishes.1               |    1 +
 debian/man/sim4db/mappedCoverage.1             |    1 +
 debian/man/sim4db/mergePolishes.1              |    1 +
 debian/man/sim4db/parseSNP.1                   |    1 +
 debian/man/sim4db/pickBestPolish.1             |    1 +
 debian/man/sim4db/pickUniquePolish.1           |    1 +
 debian/man/sim4db/plotCoverageVsIdentity.1     |    1 +
 debian/man/sim4db/realignPolishes.1            |    1 +
 debian/man/sim4db/removeDuplicate.1            |    1 +
 debian/man/sim4db/reportAlignmentDifferences.1 |    1 +
 debian/man/sim4db/sim4db.1                     |  123 +
 debian/man/sim4db/sim4dbutils.1                |   60 +
 debian/man/sim4db/sortPolishes.1               |    1 +
 debian/man/sim4db/summarizePolishes.1          |    1 +
 debian/man/sim4db/uniqPolishes.1               |    1 +
 debian/man/sim4db/vennPolishes.1               |    1 +
 debian/meryl.manpages                          |    8 +-
 debian/patches/allow-freebsd-build.patch       |  121 +
 debian/patches/kazlib.patch                    |   41 -
 debian/patches/remove-kazlib.patch             |   39 -
 debian/patches/series                          |    3 +-
 debian/rules                                   |   19 +-
 debian/sim4db.docs                             |    1 +
 debian/sim4db.install                          |   43 +
 debian/sim4db.manpages                         |    1 +
 debian/upstream/metadata                       |    4 +-
 libutil/kazlib/Make.include                    |   27 +
 libutil/kazlib/blast.pl                        |   33 +
 libutil/kazlib/dict.c                          | 1238 +++++++
 libutil/kazlib/dict.h                          |  142 +
 libutil/kazlib/docs/CHANGES                    |  290 ++
 libutil/kazlib/docs/MUST_READ                  |   25 +
 libutil/kazlib/docs/README                     |   66 +
 libutil/kazlib/docs/docs.ist                   |    4 +
 libutil/kazlib/docs/docs.ltx                   | 4155 ++++++++++++++++++++++++
 libutil/kazlib/drivers/dict-main.c             |  300 ++
 libutil/kazlib/drivers/except-main.c           |   57 +
 libutil/kazlib/drivers/hash-main.c             |  187 ++
 libutil/kazlib/drivers/list-main.c             |  152 +
 libutil/kazlib/drivers/sfx-main.c              |   41 +
 libutil/kazlib/except.c                        |  347 ++
 libutil/kazlib/except.h                        |  147 +
 libutil/kazlib/hash.c                          |  837 +++++
 libutil/kazlib/hash.h                          |  238 ++
 libutil/kazlib/list.c                          |  766 +++++
 libutil/kazlib/list.h                          |  152 +
 libutil/kazlib/sfx.c                           | 1138 +++++++
 libutil/kazlib/sfx.h                           |   46 +
 meryl/args.C                                   |    2 +-
 meryl/build.C                                  |   70 +-
 meryl/estimate.C                               |  136 +-
 meryl/kmer-mask.C                              |  344 +-
 meryl/mapMers.C                                |   26 +-
 meryl/meryl.H                                  |    7 +-
 sim4dbutils/reportAlignmentDifferences.C       |    2 +-
 84 files changed, 11585 insertions(+), 421 deletions(-)

diff --cc debian/changelog
index 1c81c24,60ed7ba..21cbbbd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,32 @@@
+ kmer-tools (0~20150903+r2013-1) unstable; urgency=low
+ 
+   * Simplify get-orig-source script
+   * Imported Upstream version 0~20150903+r2013
+   * Clean up source package: move meryl manpages to a subdirectory of debian/
+   * New binary packages:
+     - leaff
+     - sim4db
+   * Drop build-dependency on libbz2-dev
+   * Drop kazlib quilt patches
+   * Fix section/architecture of the kmer metapackage
+   * Set Vcs-Browser to point to cgit
+   * Don't install other READMEs to metapackage docs
+   * Update d/copyright
+   * Update README.source
+     - document situation with bundled kazlib
+     - document reason for monolithic source package
+   * Make the build system more flexible to hopefully fix build on kFreeBSD
+   * Add README.Debian to let users know some components aren't yet packaged
+   * Add comment for why we can't use dh --parallel
+ 
+  -- Afif Elghraoui <afif at ghraoui.name>  Sat, 02 Jan 2016 16:49:00 -0800
+ 
 +kmer-tools (0~20150520+2004-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at ghraoui.name>  Sun, 20 Sep 2015 01:41:57 -0700
 +
  kmer-tools (0~20150520+2004-1) unstable; urgency=low
  
    * Initial release (Closes: #784863)

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



More information about the debian-med-commit mailing list