[med-svn] r15243 - trunk/packages/seqan/trunk/debian

Fri Nov 22 12:21:23 UTC 2013

Author: tille
Date: 2013-11-22 12:21:23 +0000 (Fri, 22 Nov 2013)
New Revision: 15243

Removed:
   trunk/packages/seqan/trunk/debian/patches/
Modified:
   trunk/packages/seqan/trunk/debian/changelog
   trunk/packages/seqan/trunk/debian/compat
   trunk/packages/seqan/trunk/debian/control
   trunk/packages/seqan/trunk/debian/copyright
   trunk/packages/seqan/trunk/debian/rules
   trunk/packages/seqan/trunk/debian/watch
Log:
Mass commit my current changes to seqan; Attention: I can not test the build since it needs more memory than my current Build machine


Modified: trunk/packages/seqan/trunk/debian/changelog
===================================================================

--- trunk/packages/seqan/trunk/debian/changelog	2013-11-22 10:49:13 UTC (rev 15242)
+++ trunk/packages/seqan/trunk/debian/changelog	2013-11-22 12:21:23 UTC (rev 15243)
@@ -1,6 +1,6 @@
 seqan (1.4.1-1) UNRELEASED; urgency=low
 
-  * New upstream version
+  * New upstream version (patch became unneeded)
   * debian/upstream:
      - Moved DOI+PMID to References
      - Added eprint
@@ -8,8 +8,18 @@
   * debian/watch: adapted to changes at upstream
   * debian/orig-tar.sh: Removed because the removed file is not part
     of the source any more
+  * debian/control:
+     - debhelper 9
+     - remove cdbs from Build-Depends
+     - cme fix dpkg-control
+     - canonical Vcs URLs
+  * debian/copyright:
+     - DEP5
+     - Add Upstream-Contact according to latest discussion
+     - Update Source to actual download tarball
+  * debian/rules: cdbs -> dh
 
- -- Andreas Tille <tille at debian.org>  Sat, 17 Aug 2013 16:52:02 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 22 Nov 2013 10:06:25 +0100
 
 seqan (1.3.1-1) unstable; urgency=low
 

Modified: trunk/packages/seqan/trunk/debian/compat
===================================================================
--- trunk/packages/seqan/trunk/debian/compat	2013-11-22 10:49:13 UTC (rev 15242)
+++ trunk/packages/seqan/trunk/debian/compat	2013-11-22 12:21:23 UTC (rev 15243)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/seqan/trunk/debian/control
===================================================================
--- trunk/packages/seqan/trunk/debian/control	2013-11-22 10:49:13 UTC (rev 15242)
+++ trunk/packages/seqan/trunk/debian/control	2013-11-22 12:21:23 UTC (rev 15243)
@@ -1,18 +1,23 @@
 Source: seqan
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Soeren Sonnenburg <sonne at debian.org>,
+           Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Soeren Sonnenburg <sonne at debian.org>,
- Andreas Tille <tille at debian.org>
-Build-Depends: cdbs, debhelper (>= 8), cmake, zlib1g-dev, libbam-dev, libboost-dev
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9),
+               cmake,
+               zlib1g-dev,
+               libbam-dev,
+               libboost-dev
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/seqan/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/seqan/trunk/
 Homepage: http://www.seqan.de/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/seqan/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/seqan/trunk/
 
 Package: seqan-apps
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: C++ library for the analysis of biological sequences
  SeqAn is a C++ template library of efficient algorithms and data
  structures for the analysis of sequences with the focus on
@@ -24,9 +29,10 @@
  micro_razers, seqan_tcoffee, seqcons, razers and tree_recon.
 
 Package: seqan-dev
+Architecture: all
 Section: libdevel
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: C++ library for the analysis of biological sequences (development)
  SeqAn is a C++ template library of efficient algorithms and data
  structures for the analysis of sequences with the focus on

Modified: trunk/packages/seqan/trunk/debian/copyright
===================================================================
--- trunk/packages/seqan/trunk/debian/copyright	2013-11-22 10:49:13 UTC (rev 15242)
+++ trunk/packages/seqan/trunk/debian/copyright	2013-11-22 12:21:23 UTC (rev 15243)
@@ -1,8 +1,10 @@
-Format: http://dep.debian.net/deps/dep5/
-Source: http://www.seqan.de/uploads/media/Seqan_Release_1.3.zip
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Manuel Holtgrewe <manuel.holtgrewe at fu-berlin.de>
+                  Hannes Röst <roest at imsb.biol.ethz.ch>
+Source: http://packages.seqan.de/seqan-src/seqan-src-1.4.1.tar.gz
 
 Files: *
-Copyright: © 2007-2010
+Copyright: © 2007-2013
            Andreas Döring <doering at inf.fu-berlin.de>
            David Weese <weese at inf.fu-berlin.de>
            Tobias Rausch <rausch at inf.fu-berlin.de>
@@ -11,6 +13,8 @@
            Carsten Kemena <kemena at inf.fu-berlin.de>
            Konrad Ludwig Moritz Rudolph <krudolph at inf.fu-berlin.de>
            Marcel H. Schulz. <marcel.schulz at molgen.mpg.de>
+           Manuel Holtgrewe <manuel.holtgrewe at fu-berlin.de>
+           Hannes Röst <roest at imsb.biol.ethz.ch>
 License: LGPL-3+
 
 Files: apps/mason/* apps/rabema/* demos/tutorial/read_mapping/minimapper.cpp

Modified: trunk/packages/seqan/trunk/debian/rules
===================================================================
--- trunk/packages/seqan/trunk/debian/rules	2013-11-22 10:49:13 UTC (rev 15242)
+++ trunk/packages/seqan/trunk/debian/rules	2013-11-22 12:21:23 UTC (rev 15243)
@@ -1,19 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+%:
+	dh $@
 
-DEB_SRCDIR              := cmake
-DEB_MAKE_INSTALL_TARGET :=
-
-DEB_DH_BUILDDEB_ARGS = -- -Zxz
-
 ## dh does not seem to propagate the correct options to cmake configure step
 #%:
 #	dh $@ --parallel --buildsystem=cmake
 
 #override_dh_auto_build:
-makebuilddir::
+__makebuilddir::
 	# create backups of original *generated_forwards.h files to build twice in a row
 	for header in `find seqan -name "*generated_forwards.h"` ; do \
 	  mkdir -p orig/`dirname $$header` ; \
@@ -23,8 +18,8 @@
 
 #override_dh_auto_install:
 #	dh_auto_install
-install/seqan-apps:: debian/stamp-install-seqan-apps
-debian/stamp-install-seqan-apps:
+__install/seqan-apps:: debian/stamp-install-seqan-apps
+__debian/stamp-install-seqan-apps:
 	#install binaries
 	for APP in `find $(CURDIR)/obj*/apps -mindepth 1 -maxdepth 1 -executable -type f` ; do \
 	  cp -a $$APP $(CURDIR)/debian/seqan-apps/usr/lib/sequan/bin/ ; done
@@ -36,14 +31,13 @@
 	done
 
 # Delete extra license files
-install/seqan-dev::
+__install/seqan-dev::
 	@echo "This should be post-install action after installing files for seqan-dev ... but the doc is lying :-("
 	find debian -type f -name LICENSE -delete
 	# FIXME: Anybody able to convince cdbs to do what the doc is promising and remove the unneeded LICENSE files?
 
-#override_dh_auto_clean:
-#	dh_auto_clean
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	if [ -d orig ] ; then \
 	  for header in `find orig -name "*generated_forwards.h"` ; do \
 	    mv $${header} `echo $$header | sed 's?orig/??'` ; \
@@ -52,7 +46,5 @@
 	rm -rf orig
 
 get-orig-source:
-	uscan --force-download
-	@echo successfully retrieved upstream tarball
+	uscan --verbose --force-download
 
-

Modified: trunk/packages/seqan/trunk/debian/watch
===================================================================
--- trunk/packages/seqan/trunk/debian/watch	2013-11-22 10:49:13 UTC (rev 15242)
+++ trunk/packages/seqan/trunk/debian/watch	2013-11-22 12:21:23 UTC (rev 15243)
@@ -1,2 +1,2 @@
 version=3
-http://packages.seqan.de/ seqan-library/seqan-library-([.\d]+)\.tar.bz2
+http://packages.seqan.de/ seqan-library/seqan-src-([.\d]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))


