[med-svn] [Git][med-team/gentle][master] 7 commits: debhelper 11

Andreas Tille gitlab at salsa.debian.org
Fri Aug 24 14:14:46 BST 2018


Andreas Tille pushed to branch master at Debian Med / gentle


Commits:
cef74cb5 by Andreas Tille at 2018-08-24T11:01:17Z
debhelper 11

- - - - -
e3914c38 by Andreas Tille at 2018-08-24T11:01:34Z
Point Vcs fields to salsa.debian.org

- - - - -
5ec967e9 by Andreas Tille at 2018-08-24T11:01:34Z
Standards-Version: 4.2.0

- - - - -
1d939aa5 by Andreas Tille at 2018-08-24T11:17:07Z
Fix version number

- - - - -
5b0ec647 by Andreas Tille at 2018-08-24T12:09:24Z
do not parse d/changelog

- - - - -
6a34e7fc by Andreas Tille at 2018-08-24T12:28:02Z
Add Files-Excluded, d/watch: Add comment what we could use to fetch source from Git but it seems that Github is lagging behind the code we have in this tarball

- - - - -
88576dc5 by Andreas Tille at 2018-08-24T12:36:36Z
Do not install todo.txt, upload to unstable

- - - - -


7 changed files:

- debian/README.source
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/rules
- debian/watch


Changes:

=====================================
debian/README.source
=====================================
--- a/debian/README.source
+++ b/debian/README.source
@@ -12,4 +12,6 @@ Patches:
    remove_tinyxml.patch - small changes to Makefile.am since tinyurl is now gone
    remove_clustalw.patch - small changes to Makefile.am since clustalw is now gone
 
-
+d/watch:
+   Ccomment what we could use to fetch source from Git but
+   it seems that Github is lagging behind the code we have in this tarball


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
-gentle (1.9+cvs20100605+dfsg1-6) UNRELEASED; urgency=medium
+gentle (1.9+cvs20100605+dfsg1-7) unstable; urgency=medium
 
+  [ Steffen Moeller ]
   * d/u/metadata: Added RRIDs
 
- -- Steffen Moeller <moeller at debian.org>  Fri, 30 Mar 2018 22:24:26 +0200
+  [ Andreas Tille ]
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.0
+  * d/rules: do not parse d/changelog
+  * d/copyright: Add Files-Excluded
+  * d/watch: Add comment what we could use to fetch source from Git but
+    it seems that Github is lagging behind the code we have in this tarball
+  * Do not install todo.txt
+
+ -- Andreas Tille <tille at debian.org>  Fri, 24 Aug 2018 14:28:20 +0200
 
 gentle (1.9+cvs20100605+dfsg1-6) unstable; urgency=medium
 


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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,14 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: autotools-dev,
-               debhelper (>= 10),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 11~),
                default-libmysqlclient-dev,
                libsqlite3-dev,
                libtinyxml-dev,
                libwxgtk3.0-dev
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/gentle.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/gentle.git
+Standards-Version: 4.2.0
+Vcs-Browser: https://salsa.debian.org/med-team/gentle
+Vcs-Git: https://salsa.debian.org/med-team/gentle.git
 Homepage: http://gentle.magnusmanske.de
 
 Package: gentle


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,15 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GENtle
 Upstream-Contact: Magnus Manske <magnusmanske+gentle at googlemail.com>
 Source: https://github.com/magnusmanske/gentle-m
+Files-Excluded: */clustalw
+                */tinyxml
+                */.cvsignore
+                */*.dll
+                */*.a
+                */Makefile.in
+Comment: These could be excluded as well
+                */ncoils*
+                */coils
 
 Files: *
 Copyright: © 2003-2010 Magnus Manske <magnusmanske+gentle at googlemail.com>


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -6,20 +6,21 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 #export DH_VERBOSE=1
 
 export DEB_CXXFLAGS_MAINT_APPEND = -D__DEBIAN__ -O2 -g -Wno-write-strings -DUSE_EXTERNAL_CLUSTALW
-DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+include /usr/share/dpkg/default.mk
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_install:
 	dh_install --list-missing
-	cd debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME); for i in help/*.html help/*.css *.db help/*.htm */*.png */*.x[bp]m */*.bmp *.txt */*.txt *.csv; do chmod -x "$$i"; done
+	cd debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE); for i in help/*.html help/*.css *.db help/*.htm */*.png */*.x[bp]m */*.bmp *.txt */*.txt *.csv; do chmod -x "$$i"; done
 	find debian -name "license.txt" | xargs -r rm
 
 override_dh_installdocs:
 	dh_installdocs
-	cp -a docs/GENtle*en*.pdf    debian/$(DEBPKGNAME)/usr/share/doc/$(DEBPKGNAME)/GENtle_manual.pdf
-	cp -a docs/GENtle*Manual.pdf debian/$(DEBPKGNAME)/usr/share/doc/$(DEBPKGNAME)/GENtle_manual_de.pdf
+	cp -a docs/GENtle*en*.pdf    debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/GENtle_manual.pdf
+	cp -a docs/GENtle*Manual.pdf debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/GENtle_manual_de.pdf
+	find debian -name todo.txt -delete
 
 override_dh_auto_clean:
 	dh_auto_clean


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,10 @@
 version=4
 
+# At the time of drafting this we would get
+#    1.9+git20060619.172a741+dfsg-1
+#opts="mode=git,pretty=1.9+git%cd.%h,repacksuffix=+dfsg,dversionmangle=s/\+dfsg\d*//g,repack,compression=xz" \
+#    https://github.com/magnusmanske/gentle-m.git HEAD
+
 # See issue https://github.com/magnusmanske/gentle-m/issues/1
 # https://github.com/magnusmanske/gentle-m/releases .*/archive/(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
 



View it on GitLab: https://salsa.debian.org/med-team/gentle/compare/b77a6786b84790847fd48e878d2b0579c792926d...88576dc5d7291f369857dd0c9c7d9fd4433c9599

-- 
View it on GitLab: https://salsa.debian.org/med-team/gentle/compare/b77a6786b84790847fd48e878d2b0579c792926d...88576dc5d7291f369857dd0c9c7d9fd4433c9599
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/20180824/7599df44/attachment-0001.html>


More information about the debian-med-commit mailing list