[med-svn] [Git][med-team/ipig][master] 6 commits: debhelper 11

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ipig


Commits:
593c0f67 by Andreas Tille at 2018-07-04T09:00:33+02:00
debhelper 11

- - - - -
ba801af1 by Andreas Tille at 2018-07-04T09:17:06+02:00
Point Vcs fields to salsa.debian.org

- - - - -
fa352f33 by Andreas Tille at 2018-07-04T09:17:06+02:00
Standards-Version: 4.1.4

- - - - -
fc62b914 by Andreas Tille at 2018-07-04T09:59:02+02:00
Java Policy conform versioning of JAR

- - - - -
f1250536 by Andreas Tille at 2018-07-04T10:23:20+02:00
Try hard to make JAR name conform to Java policy ... but failed.

- - - - -
980a6ca8 by Andreas Tille at 2018-07-04T10:27:27+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-ipig (0.0.r5-3) UNRELEASED; urgency=medium
+ipig (0.0.r5-3) unstable; urgency=medium
 
+  [ Steffen Moeller ]
   * debian/upstream/metadata: Added refs to registries
 
- -- Steffen Moeller <moeller at debian.org>  Thu, 03 Aug 2017 13:37:12 +0200
+  [ Andreas Tille ]
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.1.4
+  * Java Policy conform versioning of JAR
+
+ -- Andreas Tille <tille at debian.org>  Wed, 04 Jul 2018 10:24:12 +0200
 
 ipig (0.0.r5-2) unstable; urgency=medium
 


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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,26 @@
 Source: ipig
-Section: science
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9),
-               javahelper (>=0.25),
+Section: science
+Priority: optional
+Build-Depends: debhelper (>= 11~),
+               javahelper,
                default-jdk,
                ant,
                libcommons-compress-java,
                libcommons-net-java,
                libjdom1-java,
                libxerces2-java
-Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/ipig.git
-Vcs-Git: git://anonscm.debian.org/debian-med/ipig.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/ipig
+Vcs-Git: https://salsa.debian.org/med-team/ipig.git
 Homepage: http://sourceforge.net/projects/ipig/
 
 Package: ipig
 Architecture: any
 Depends: ${misc:Depends},
-         ${java:Depends},
-Description: integrating PSMs into genome browser visualisations 
+         ${java:Depends}
+Description: integrating PSMs into genome browser visualisations
  iPiG targets the integration of peptide spectrum matches (PSMs) from
  mass spectrometry (MS) peptide identifications into genomic
  visualisations provided by genome browser such as the UCSC genome


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,8 @@
 
 # DH_VERBOSE := 1
 
-SRC_VERSION =$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+include /usr/share/dpkg/default.mk
+#jarversion=$(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/r//')
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
@@ -22,6 +23,11 @@ override_dh_install:
 
 override_dh_auto_build:
 	cp debian/build.xml build.xml
-	sed -i "s/DEBVERSION/"$(SRC_VERSION)"/g" build.xml
+#	sed -i "s/DEBVERSION/$(jarversion)/g" build.xml
+	sed -i "s/DEBVERSION/$(DEB_VERSION_UPSTREAM)/g" build.xml
 	dh_auto_build
-	
+
+#override_jh_installlibs:
+#	jh_installlibs
+#	mv debian/$(DEB_SOURCE)/usr/share/java/iPiG-$(DEB_VERSION_UPSTREAM).jar debian/$(DEB_SOURCE)/usr/share/java/iPiG-$(jarversion).jar
+#	ln -sf iPiG-$(jarversion).jar debian/$(DEB_SOURCE)/usr/share/java/iPiG.jar



View it on GitLab: https://salsa.debian.org/med-team/ipig/compare/9db4e8f97301fac867fb93442f8fb51118d3130a...980a6ca8a0cbcc5d0e133c6c4e530febc3e4a5e2

-- 
View it on GitLab: https://salsa.debian.org/med-team/ipig/compare/9db4e8f97301fac867fb93442f8fb51118d3130a...980a6ca8a0cbcc5d0e133c6c4e530febc3e4a5e2
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/20180704/182b7bd4/attachment-0001.html>