[med-svn] [Git][med-team/megan-ce][master] 4 commits: Refresh patches

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / megan-ce


Commits:
270524ab by Andreas Tille at 2018-05-27T07:00:07+02:00
Refresh patches

- - - - -
7904368a by Andreas Tille at 2018-05-27T07:00:25+02:00
Build-Depends libsis-jhdf5-java

- - - - -
0f392055 by Andreas Tille at 2018-05-27T07:01:13+02:00
cme fix dpkg-control

- - - - -
7160c521 by Andreas Tille at 2018-05-27T07:01:57+02:00
debhelper 11

- - - - -


6 changed files:

- debian/compat
- debian/control
- debian/patches/fix_megan_source_path.patch
- debian/patches/ignore_malt_source_for_the_moment.patch
- debian/patches/use_debian_packaged_jloda.patch
- debian/rules


Changes:

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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                javahelper,
                default-jdk,
                ant,
@@ -16,10 +16,10 @@ Build-Depends: debhelper (>= 10),
                libspring-web-java,
                libcontrolsfx-java,
                libgoogle-gson-java,
-# Source contains jar of libgoogle-gson-java version 2.6.2 while Debian has only 2.4
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/megan-ce.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/megan-ce.git
+               libsis-jhdf5-java
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/megan-ce
+Vcs-Git: https://salsa.debian.org/med-team/megan-ce.git
 Homepage: https://github.com/danielhuson/megan-ce
 
 Package: megan-ce


=====================================
debian/patches/fix_megan_source_path.patch
=====================================
--- a/debian/patches/fix_megan_source_path.patch
+++ b/debian/patches/fix_megan_source_path.patch
@@ -4,7 +4,7 @@ Description: megan source is just here ...
 
 --- a/antbuild/build.xml
 +++ b/antbuild/build.xml
-@@ -44,7 +44,7 @@
+@@ -43,7 +43,7 @@
          <mkdir dir="${classDir}/resources/css"/>
          <mkdir dir="${classDir}/resources/files"/>
          <copy todir="${classDir}">


=====================================
debian/patches/ignore_malt_source_for_the_moment.patch
=====================================
--- a/debian/patches/ignore_malt_source_for_the_moment.patch
+++ b/debian/patches/ignore_malt_source_for_the_moment.patch
@@ -13,23 +13,15 @@ Description: No idea whether MALT is needed to build megan-ce - assume
      <property name="meganSrcDir" value="../src"/>
      <property name="srcDir" value="src"/>
      <property name="classDir" value="classes"/>
-@@ -22,7 +21,6 @@
- 
-     <path id="build.classpath">
-         <fileset dir="/usr/share/java/"  includes="jloda.jar"/>
--        <fileset dir="../../malt/jars"  includes="*.jar"/>
- 
-         <fileset dir="../../megan-ce/jars/megan6server"  includes="*.jar"/>
- 	<fileset dir="../../megan-ce/jars" includes="*.jar"/>
-@@ -49,7 +47,6 @@
+@@ -48,7 +47,6 @@
      <!-- copy sources -->
      <target name="copy_sources" depends="copy_resources">
          <copy todir="${srcDir}">
 -            <fileset dir="${maltSrcDir}" excludes=""/>
              <fileset dir="${meganSrcDir}" excludes=""/>
          </copy>
-     </target>
-@@ -72,7 +69,7 @@
+ </target>
+@@ -78,7 +76,7 @@
      <target name="jar" depends="compile">
          <jar jarfile="${jar}"
               basedir="${classDir}"


=====================================
debian/patches/use_debian_packaged_jloda.patch
=====================================
--- a/debian/patches/use_debian_packaged_jloda.patch
+++ b/debian/patches/use_debian_packaged_jloda.patch
@@ -13,18 +13,17 @@ Description: There is no point in copying jloda source since the packaged
      <property name="maltSrcDir" value="../../malt/src"/>
      <property name="meganSrcDir" value="../src"/>
      <property name="srcDir" value="src"/>
-@@ -22,9 +21,8 @@
+@@ -22,8 +21,7 @@
      <!-- class path -->
  
      <path id="build.classpath">
 -        <fileset dir="../../jloda/jars"  includes="*.jar"/>
-+        <fileset dir="/usr/share/java/"  includes="jloda.jar"/>
-         <fileset dir="../../malt/jars"  includes="*.jar"/>
 -	<fileset dir="../../jloda/jars/batik-1.8"  includes="*.jar"/>
++        <fileset dir="/usr/share/java/"  includes="jloda.jar"/>
  
          <fileset dir="../../megan-ce/jars/megan6server"  includes="*.jar"/>
  	<fileset dir="../../megan-ce/jars" includes="*.jar"/>
-@@ -51,7 +49,6 @@
+@@ -50,7 +48,6 @@
      <!-- copy sources -->
      <target name="copy_sources" depends="copy_resources">
          <copy todir="${srcDir}">


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export LC_ALL=C.UTF-8
 DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 
 DEBJAR    := /usr/share/java
-CLASS_PATH := $(DEBJAR)/jloda.jar:$(DEBJAR)/colt.jar:$(DEBJAR)/commons-math3.jar:$(DEBJAR)/gson.jar:$(DEBJAR)/openjfx/jre/lib/ext/jfxrt.jar
+CLASS_PATH := $(DEBJAR)/jloda.jar:$(DEBJAR)/colt.jar:$(DEBJAR)/commons-math3.jar:$(DEBJAR)/gson.jar:$(DEBJAR)/openjfx/jre/lib/ext/jfxrt.jar:$(DEBJAR)/sis-jhdf5.jar
 
 %:
 	dh $@ --with javahelper



View it on GitLab: https://salsa.debian.org/med-team/megan-ce/compare/41bff6fbc42d5a95d2ececbfd78babbc7854755f...7160c521de55270da18a07a37867fdf64bc90b5e

-- 
View it on GitLab: https://salsa.debian.org/med-team/megan-ce/compare/41bff6fbc42d5a95d2ececbfd78babbc7854755f...7160c521de55270da18a07a37867fdf64bc90b5e
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/20180527/3baceac3/attachment-0001.html>