This is an automated email from the git hooks/post-receive script. sascha-guest pushed a commit to branch master in repository soapdenovo2.
commit 161c4d2e321c26933311f78f8b53724089b4b748 Author: Andreas Tille <[email protected]> Date: Thu Sep 25 17:11:27 2014 +0200 Imported Debian patch 240+dfsg-2 --- debian/changelog | 11 ++++++++++ debian/control | 18 ++++++++++----- debian/copyright | 40 +++++++++++++++++----------------- debian/rules | 11 ---------- debian/{upstream => upstream/metadata} | 0 debian/watch | 2 +- 6 files changed, 44 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac7018f..a460f1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +soapdenovo2 (240+dfsg-2) unstable; urgency=medium + + * Fix watch file to not report "-mac" + * cme fix dpkg-control + * d/copyright: + - re-order to fit DEP5 + - do not mention files (bam.h) which are not part of the source) + * d/control+d/rules: hardening-includes is obsolete + + -- Andreas Tille <[email protected]> Thu, 25 Sep 2014 17:11:27 +0200 + soapdenovo2 (240+dfsg-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index cc1e908..003df16 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,24 @@ Source: soapdenovo2 +Maintainer: Debian Med Packaging Team <[email protected]> +Uploaders: Olivier Sallou <[email protected]>, + Andreas Tille <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 9), hardening-includes, zlib1g-dev, libbam-dev, libaio-dev -Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Olivier Sallou <[email protected]> -Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/soap/soapdenovo2/trunk/ +Build-Depends: debhelper (>= 9), + zlib1g-dev, + libbam-dev, + libaio-dev +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/soap/soapdenovo2/ -Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/soap/soapdenovo2/trunk/ Homepage: http://soap.genomics.org.cn/soapdenovo.html Package: soapdenovo2 Architecture: any-amd64 any-ppc64 any-ia64 #Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, zlib1g +Depends: ${shlibs:Depends}, + ${misc:Depends}, + zlib1g Description: short-read assembly method to build de novo draft assembly SOAPdenovo is a novel short-read assembly method that can build a de novo draft assembly for the human-sized genomes. The program is specially designed to diff --git a/debian/copyright b/debian/copyright index 1f8ee66..155da3c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,7 +16,26 @@ Files-Excluded: standardPregraph/inc/*.so sparsePregraph/*.a -Files: standardPregraph/inc/bam.h standardPregraph/inc/faidx.h sparsePregraph/inc/bam.h sparsePregraph/inc/faidx.h +Files: * +Copyright: 2008-2012 BGI-Shenzhen +License: GPL-3+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +Files: standardPregraph/inc/faidx.h sparsePregraph/inc/faidx.h Copyright: 2008 Genome Research Ltd (GRL) License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy @@ -59,25 +78,6 @@ License: MIT THE SOFTWARE. -Files: * -Copyright: 2008-2012 BGI-Shenzhen -License: GPL-3+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/> - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - Files: debian/* Copyright: 2012 Olivier Sallou <[email protected]> License: GPL-2+ diff --git a/debian/rules b/debian/rules index bc351d6..6959327 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,5 @@ #!/usr/bin/make -f # -*- makefile -*- -export DEB_BUILD_HARDENING=1 -export DEB_BUILD_HARDENING_FORTIFY=1 - -include /usr/share/hardening-includes/hardening.make - -CFLAGS=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -CFLAGS+=$(HARDENING_CFLAGS) -CXXFLAGS+=$(HARDENING_CXXFLAGS) -LDFLAGS+=$(HARDENING_LDFLAGS) - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 diff --git a/debian/upstream b/debian/upstream/metadata similarity index 100% rename from debian/upstream rename to debian/upstream/metadata diff --git a/debian/watch b/debian/watch index 613d606..adc828f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ # Compulsory line, this is a version 3 file version=3 -opts="dversionmangle=s/\+dfsg//g" http://qa.debian.org/watch/sf.php/soapdenovo2/SOAPdenovo2-src-r(.+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) +opts="dversionmangle=s/\+dfsg//g" http://qa.debian.org/watch/sf.php/soapdenovo2/SOAPdenovo2-src-r([.\d]+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/soapdenovo2.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
