[med-svn] [Git][med-team/samtools][debian/samtools-legacy] 8 commits: Switch from cdbs to dh

Andreas Tille gitlab at salsa.debian.org
Tue Jul 3 13:15:45 BST 2018


Andreas Tille pushed to branch debian/samtools-legacy at Debian Med / samtools


Commits:
fcf4b9c8 by Andreas Tille at 2018-07-03T13:51:16+02:00
Switch from cdbs to dh

- - - - -
20060af1 by Andreas Tille at 2018-07-03T13:51:25+02:00
s/gdb-dch/dch/, drop second instance of pristine-tar

- - - - -
895679f5 by Andreas Tille at 2018-07-03T14:04:12+02:00
Add watch file

- - - - -
007eb2d1 by Andreas Tille at 2018-07-03T14:06:13+02:00
Cleanup debian/upstream/metadata

- - - - -
81f4dcc4 by Andreas Tille at 2018-07-03T14:07:38+02:00
  * cme fix dpkg-control
     - Point VCS fields to Salsa
     - Standards-Version: 4.1.4
     - Fix spacing in short description

- - - - -
fb63c383 by Andreas Tille at 2018-07-03T14:08:34+02:00
debhelper 11

- - - - -
2cd108e8 by Andreas Tille at 2018-07-03T14:09:04+02:00
Fix Homepage

- - - - -
7731b028 by Andreas Tille at 2018-07-03T14:15:31+02:00
Fix test target

- - - - -


9 changed files:

- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- debian/copyright
- debian/gbp.conf
- debian/rules
- debian/upstream/metadata
- + debian/watch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+samtools-legacy (0.1.19-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Switch from cdbs to dh
+  * Add watch file
+  * Cleanup debian/upstream/metadata
+  * cme fix dpkg-control
+     - Point VCS fields to Salsa
+     - Standards-Version: 4.1.4
+     - Fix spacing in short description
+  * debhelper 11
+  * Fix Homepage
+
+ -- Andreas Tille <tille at debian.org>  Tue, 03 Jul 2018 13:50:54 +0200
+
 samtools-legacy (0.1.19-2) unstable; urgency=medium
 
   1bb181e Build libbam-dev from version 0.1.19 in a “legacy” source package.


=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,14 @@
+examples/calDepth
+examples/ex1.bam
+examples/ex1.bam.bai
+examples/ex1.fa.fai
+examples/ex1.glf
+examples/ex1.glfview.gz
+examples/ex1.pileup.gz
+examples/ex1a.bam
+examples/ex1b.bam
+examples/ex1f-rmduppe.bam
+examples/ex1f-rmdupse.bam
+examples/ex1f.bam
+examples/ex1f.rg
+examples/ex1.bcf


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,20 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Charles Plessy <plessy at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               cdbs,
-               quilt,
+Build-Depends: debhelper (>= 11~),
                libncurses5-dev,
                zlib1g-dev
-Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/samtools.git
-Vcs-Git: git://anonscm.debian.org/debian-med/samtools.git -b samtools-legacy
-Homepage: http://samtools.sourceforge.net
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/samtools-legacy
+Vcs-Git: https://salsa.debian.org/med-team/samtools-legacy.git
+Homepage: http://www.htslib.org/
 
 Package: libbam-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: manipulates nucleotide sequence alignments in BAM or SAM format 
+Description: manipulates nucleotide sequence alignments in BAM or SAM format
  The BAM library provides I/O and various operations on manipulating nucleotide
  sequence alignments in the BAM (Binary Alignment/Mapping) or SAM (Sequence
  Alignment/Map) format. It now supports importing from or exporting to SAM,


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,5 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SAM tools
 Source: https://github.com/samtools/samtools/archive/0.1.19.tar.gz
 
 Files: *


=====================================
debian/gbp.conf
=====================================
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,9 +6,6 @@ debian-branch = debian/samtools-legacy
 upstream-tag = upstream/0.1.19
 pristine-tar = True
 
-# use pristine-tar:
-pristine-tar = True
-
-[git-dch]
+[dch]
 # include 7 digits of the commit id in the changelog enty:
 id-length = 7


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
 CFLAGS += -fPIC $(LDFLAGS) $(CPPFLAGS)
 
-DEB_MAKE_BUILD_TARGET = all all-recur razip lib
-DEB_MAKE_CHECK_TARGET = -C examples all
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build -- all all-recur razip lib
 
-clean::
-	$(RM) examples/calDepth examples/ex1.bam examples/ex1.bam.bai examples/ex1.fa.fai examples/ex1.glf examples/ex1.glfview.gz examples/ex1.pileup.gz examples/ex1a.bam examples/ex1b.bam examples/ex1f-rmduppe.bam examples/ex1f-rmdupse.bam examples/ex1f.bam examples/ex1f.rg examples/ex1.bcf
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	$(MAKE) -C examples all
+endif


=====================================
debian/upstream/metadata
=====================================
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,9 +1,3 @@
-Archive: SourceForge
-Changelog: https://raw.github.com/samtools/samtools/HEAD/NEWS
-Homepage: http://samtools.sourceforge.net
-mr:
-  checkout: debcheckout -a git://git.debian.org/debian-med/samtools.git
-Name: SAM tools
 Reference: 
  author: Heng Li and Bob Handsaker and Alec Wysoker and Tim Fennell and Jue Ruan and Nils Homer and Gabor Marth and Goncalo Abecasis and Richard Durbin and 1000 Genome Project Data Processing Subgroup
  title: The Sequence Alignment/Map (SAM) Format and SAMtools


=====================================
debian/watch
=====================================
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+
+https://github.com/samtools/samtools/releases?after=0.2.0-rc1 .*/archive/(0\.1\.\d+)\.tar\.gz



View it on GitLab: https://salsa.debian.org/med-team/samtools/compare/216fe127be675106f4249903afd3483e424bdc86...7731b028e287fddc8086deb38da0cd0e9be61cc4

-- 
View it on GitLab: https://salsa.debian.org/med-team/samtools/compare/216fe127be675106f4249903afd3483e424bdc86...7731b028e287fddc8086deb38da0cd0e9be61cc4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180703/d14164dd/attachment-0001.html>


More information about the debian-med-commit mailing list