[med-svn] [Git][med-team/phyutility][master] 9 commits: Stick to Java 8 compatibility level to avoid conflicts with org.xml.sax classes…

Sat Mar 17 07:38:03 UTC 2018

Andreas Tille pushed to branch master at Debian Med / phyutility


Commits:
71b56994 by Andreas Tille at 2018-03-17T08:15:48+01:00
Stick to Java 8 compatibility level to avoid conflicts with org.xml.sax classes that should be removed

- - - - -
ad0921bd by Andreas Tille at 2018-03-17T08:16:22+01:00
cme fix dpkg-control

- - - - -
f385a465 by Andreas Tille at 2018-03-17T08:16:47+01:00
debhelper 11

- - - - -
e3552af9 by Andreas Tille at 2018-03-17T08:27:07+01:00
Repack upstream tarball to get rid of useless binary without source

- - - - -
98179530 by Andreas Tille at 2018-03-17T08:27:23+01:00
New upstream version 2.7.3+dfsg
- - - - -
d3f3c15d by Andreas Tille at 2018-03-17T08:27:25+01:00
Update upstream source from tag 'upstream/2.7.3+dfsg'

Update to upstream version '2.7.3+dfsg'
with Debian dir bcde0f679032194d5c0cb256074097f711f0102f
- - - - -
820d65ae by Andreas Tille at 2018-03-17T08:29:55+01:00
DEP5 fixes

- - - - -
1c79ae22 by Andreas Tille at 2018-03-17T08:35:20+01:00
Fix spelling

- - - - -
4902220f by Andreas Tille at 2018-03-17T08:37:40+01:00
Upload to unstable

- - - - -


9 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- + debian/patches/series
- + debian/patches/stick_to_java_8_until_xml.sax_is_removed.patch
- debian/phyutility.1
- debian/watch
- − src/jade/lib/libmatrixExp.so


Changes:

=====================================
debian/changelog
=====================================

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+phyutility (2.7.3+dfsg-1) unstable; urgency=medium
+
+  [ Emmanuel Bourg ]
+  * Stick to Java 8 compatibility level to avoid conflicts with org.xml.sax
+    classes that should be removed
+    Closes: #874155
+
+  [ Andreas Tille ]
+  * cme fix dpkg-control
+  * debhelper 11
+  * Repack upstream tarball to get rid of useless binary without source
+  * DEP5 fixes
+
+ -- Andreas Tille <tille at debian.org>  Sat, 17 Mar 2018 08:30:04 +0100
+
 phyutility (2.7.3-1) unstable; urgency=medium
 
   * Initial release. (Closes: #741900)


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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Uploaders: Andreas Tille <tille at debian.org>,
            Stephen Smith <blackrim at gmail.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11~),
                javahelper,
                default-jdk,
                ant
-Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/debian-med/phyutility.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/phyutility.git
+Standards-Version: 4.1.3
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/phyutility.git
+Vcs-Git: https://anonscm.debian.org/git/debian-med/phyutility.git
 Homepage: http://github.com/blackrim/phyutility
 
 Package: phyutility


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: phyutility
 Upstream-Contact: Stephen Smith <blackrim at gmail.com>
 Source: https://github.com/blackrim/phyutility/
+Files-Excluded: */*.so
 
 Files: *
 Copyright: © 2007-2014 Stephen Smith <blackrim at gmail.com>
@@ -24,11 +25,11 @@ Copyright: © 2002-2006 Marc A. Suchard
            © 2002-2006 Stephen Smith <blackrim at gmail.com>
 License: LGPL-2.1
 
-Files: src/jade/drb/*
+Files: src/phyutility/drb/*
 Copyright: © 2004-2014 The Apache Software Foundation
-License: Apache 2.0
+License: Apache-2.0
 
-Files: src/jade/data/
+Files: src/jade/data/*
 Copyright: © 1999-2001 PAL Development Core Team
 License: LGPL-2.1
 
@@ -79,7 +80,7 @@ License: LGPL-2.1
  Public License version 3 can be found in
  "/usr/share/common-licenses/LGPL-2.1".
 
-License: Apache 2.0
+License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+stick_to_java_8_until_xml.sax_is_removed.patch


=====================================
debian/patches/stick_to_java_8_until_xml.sax_is_removed.patch
=====================================
--- /dev/null
+++ b/debian/patches/stick_to_java_8_until_xml.sax_is_removed.patch
@@ -0,0 +1,18 @@
+Author: Emmanuel Bourg <ebourg at apache.org>
+Last-Update: Mon, 12 Mar 2018 22:42:50 +0100
+Bug-Debian: https://bugs.debian.org/874155
+Description:
+ The org.xml.sax classes should be removed from the package. Until that
+ happens, the build failure can be solved with this patch:
+
+--- a/build.xml
++++ b/build.xml
+@@ -4,7 +4,7 @@
+     </target>
+     <target name="compile">
+         <mkdir dir="build/classes"/>
+-        <javac srcdir="src" destdir="build/classes"/>
++        <javac srcdir="src" destdir="build/classes" source="1.8" target="1.8"/>
+     </target>
+     <target name="jar">
+         <mkdir dir="build/jar"/>


=====================================
debian/phyutility.1
=====================================
--- a/debian/phyutility.1
+++ b/debian/phyutility.1
@@ -35,7 +35,7 @@ To get help on a specific command use option \fB\-h\fR <command>
 .IP ncbiget
  Fetch seqs from NCBI. For options run phyutility \-h ncbiget.
 .IP ncbisearch
- Seach NCBI. For options run phyutility \-h ncbisearch.
+ Search NCBI. For options run phyutility \-h ncbisearch.
 .IP parse
  Parse genbank results. For options run phyutility \-h parse.
 .SH EXAMPLE


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
-version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/phyutility-$1\.tar\.gz/ \
-     https://github.com/blackrim/phyutility/tags .*/v?(\d\S*)\.tar\.gz
+version=4
+
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
+  https://github.com/blackrim/phyutility/releases .*/archive/v at ANY_VERSION@@ARCHIVE_EXT@
\ No newline at end of file


=====================================
src/jade/lib/libmatrixExp.so deleted
=====================================
Binary files a/src/jade/lib/libmatrixExp.so and /dev/null differ



View it on GitLab: https://salsa.debian.org/med-team/phyutility/compare/8c26d45be94e027a835fba16e7798274a93740fb...4902220f7d43de2802635c968a3a9c8b7869ea31

---
View it on GitLab: https://salsa.debian.org/med-team/phyutility/compare/8c26d45be94e027a835fba16e7798274a93740fb...4902220f7d43de2802635c968a3a9c8b7869ea31
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180317/6d8872d7/attachment-0001.html>
