[batik] 04/08: Build with Maven instead of Ant

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Oct 2 14:55:35 UTC 2017


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository batik.

commit 5d686291b65844024a0d499559ea5d68d1b2c07b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 2 15:00:07 2017 +0200

    Build with Maven instead of Ant
---
 debian/changelog                |   1 +
 debian/control                  |  16 ++---
 debian/libbatik-java.dirs       |   1 -
 debian/libbatik-java.links      |   2 +
 debian/libbatik-java.poms       |  71 ++++++++++----------
 debian/maven.ignoreRules        |   1 +
 debian/maven.properties         |   5 ++
 debian/maven.rules              |   2 -
 debian/patches/classpath.patch  | 145 ----------------------------------------
 debian/patches/series           |   2 -
 debian/patches/source-1.5.patch |  48 -------------
 debian/rules                    |  20 +-----
 12 files changed, 52 insertions(+), 262 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d64f13..1ab2ebe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 batik (1.9-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with Maven instead of Ant
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index cc788cf..7b72b53 100644
--- a/debian/control
+++ b/debian/control
@@ -9,13 +9,15 @@ Build-Depends: debhelper (>= 10)
 Build-Depends-Indep: ant,
                      default-jdk,
                      javahelper,
+                     jython,
                      libbsf-java,
                      libcommons-io-java,
                      libcommons-logging-java,
+                     libmaven-assembly-plugin-java,
                      libxalan2-java,
                      libxml-commons-external-java,
                      libxmlgraphics-commons-java (>= 2.0.1),
-                     maven-repo-helper,
+                     maven-debian-helper,
                      rhino
 Homepage: https://xmlgraphics.apache.org/batik/
 Standards-Version: 4.1.1
@@ -24,15 +26,9 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/batik.git
 
 Package: libbatik-java
 Architecture: all
-Depends: java-wrappers,
-         libbsf-java,
-         libcommons-io-java,
-         libcommons-logging-java,
-         libxalan2-java,
-         libxml-commons-external-java,
-         libxmlgraphics-commons-java (>= 2.0.1),
-         ${misc:Depends}
-Recommends: default-jre, fop, rhino
+Depends: ${misc:Depends}, ${maven:Depends}, java-wrappers
+Suggests: ${maven:OptionalDepends}
+Recommends: default-jre
 Breaks: elki (<= 0.6.5),
         libfop-java (<< 2.0)
 Description: xml.apache.org SVG Library
diff --git a/debian/libbatik-java.dirs b/debian/libbatik-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libbatik-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libbatik-java.links b/debian/libbatik-java.links
new file mode 100644
index 0000000..05e306a
--- /dev/null
+++ b/debian/libbatik-java.links
@@ -0,0 +1,2 @@
+/usr/share/java/batik-all.jar /usr/share/java/batik.jar
+/usr/share/java/batik-all.jar /usr/share/java/batik-libs.jar
diff --git a/debian/libbatik-java.poms b/debian/libbatik-java.poms
index 528acf8..a78b6aa 100644
--- a/debian/libbatik-java.poms
+++ b/debian/libbatik-java.poms
@@ -25,39 +25,38 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-./pom.xml
-./batik-all/pom.xml --artifact=batik-1.9/lib/batik-all-1.9.jar --java-lib
-./batik-anim/pom.xml --artifact=batik-1.9/lib/batik-anim-1.9.jar --java-lib
-./batik-awt-util/pom.xml --artifact=batik-1.9/lib/batik-awt-util-1.9.jar --java-lib
-./batik-bridge/pom.xml --artifact=batik-1.9/lib/batik-bridge-1.9.jar --java-lib
-./batik-codec/pom.xml --artifact=batik-1.9/lib/batik-codec-1.9.jar --java-lib
-./batik-constants/pom.xml --ignore-pom
-./batik-css/pom.xml --artifact=batik-1.9/lib/batik-css-1.9.jar --java-lib
-./batik-dom/pom.xml --artifact=batik-1.9/lib/batik-dom-1.9.jar --java-lib
-./batik-extension/pom.xml --artifact=batik-1.9/lib/batik-extension-1.9.jar --java-lib
-./batik-ext/pom.xml --artifact=batik-1.9/lib/batik-ext-1.9.jar --java-lib
-./batik-gui-util/pom.xml --artifact=batik-1.9/lib/batik-gui-util-1.9.jar --java-lib
-./batik-gvt/pom.xml --artifact=batik-1.9/lib/batik-gvt-1.9.jar --java-lib
-./batik-i18n/pom.xml --ignore-pom
-./batik-parser/pom.xml --artifact=batik-1.9/lib/batik-parser-1.9.jar --java-lib
-./batik-rasterizer-ext/pom.xml --ignore-pom
-./batik-rasterizer/pom.xml --artifact=batik-1.9/batik-rasterizer-1.9.jar --java-lib
-./batik-script/pom.xml --artifact=batik-1.9/lib/batik-script-1.9.jar --java-lib
-./batik-slideshow/pom.xml --artifact=batik-1.9/batik-slideshow-1.9.jar --java-lib
-./batik-squiggle-ext/pom.xml --ignore-pom
-./batik-squiggle/pom.xml --artifact=batik-1.9/batik-squiggle-1.9.jar --java-lib
-./batik-svgbrowser/pom.xml --ignore-pom
-./batik-svg-dom/pom.xml --artifact=batik-1.9/lib/batik-svg-dom-1.9.jar --java-lib
-./batik-svggen/pom.xml --artifact=batik-1.9/lib/batik-svggen-1.9.jar --java-lib
-./batik-svgpp/pom.xml --artifact=batik-1.9/batik-svgpp-1.9.jar --java-lib
-./batik-svgrasterizer/pom.xml --ignore-pom
-./batik-swing/pom.xml --artifact=batik-1.9/lib/batik-swing-1.9.jar --java-lib
-./batik-test/pom.xml --ignore-pom
-./batik-test-svg/pom.xml --ignore-pom
-./batik-test-swing/pom.xml --ignore-pom
-./batik-test-util/pom.xml --ignore-pom
-./batik-transcoder/pom.xml --artifact=batik-1.9/lib/batik-transcoder-1.9.jar --java-lib
-./batik-ttf2svg/pom.xml --artifact=batik-1.9/batik-ttf2svg-1.9.jar --java-lib
-./batik-util/pom.xml --artifact=batik-1.9/lib/batik-util-1.9.jar --java-lib
-./batik-xml/pom.xml --artifact=batik-1.9/lib/batik-xml-1.9.jar --java-lib
-
+pom.xml                         --has-package-version
+batik-all/pom.xml               --has-package-version --java-lib
+batik-anim/pom.xml              --has-package-version --java-lib
+batik-awt-util/pom.xml          --has-package-version --java-lib
+batik-bridge/pom.xml            --has-package-version --java-lib
+batik-codec/pom.xml             --has-package-version --java-lib
+batik-constants/pom.xml         --has-package-version --java-lib
+batik-css/pom.xml               --has-package-version --java-lib
+batik-dom/pom.xml               --has-package-version --java-lib
+batik-extension/pom.xml         --has-package-version --java-lib
+batik-ext/pom.xml               --has-package-version --java-lib
+batik-gui-util/pom.xml          --has-package-version --java-lib
+batik-gvt/pom.xml               --has-package-version --java-lib
+batik-i18n/pom.xml              --has-package-version --java-lib
+batik-parser/pom.xml            --has-package-version --java-lib
+batik-rasterizer-ext/pom.xml    --has-package-version --java-lib
+batik-rasterizer/pom.xml        --has-package-version --java-lib
+batik-script/pom.xml            --has-package-version --java-lib
+batik-slideshow/pom.xml         --has-package-version --java-lib
+batik-squiggle-ext/pom.xml      --has-package-version --java-lib
+batik-squiggle/pom.xml          --has-package-version --java-lib
+batik-svgbrowser/pom.xml        --has-package-version --java-lib
+batik-svg-dom/pom.xml           --has-package-version --java-lib
+batik-svggen/pom.xml            --has-package-version --java-lib
+batik-svgpp/pom.xml             --has-package-version --java-lib
+batik-svgrasterizer/pom.xml     --has-package-version --java-lib
+batik-swing/pom.xml             --has-package-version --java-lib
+batik-test/pom.xml              --ignore
+batik-test-svg/pom.xml          --ignore
+batik-test-swing/pom.xml        --ignore
+batik-test-util/pom.xml         --ignore
+batik-transcoder/pom.xml        --has-package-version --java-lib
+batik-ttf2svg/pom.xml           --has-package-version --java-lib
+batik-util/pom.xml              --has-package-version --java-lib
+batik-xml/pom.xml               --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..3f9d7d9
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+* * * * * test
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
index 9125439..e69de29 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +0,0 @@
-org.apache.xmlgraphics s/batik-constants/batik-util/ jar * * *
-org.apache.xmlgraphics s/batik-i18n/batik-util/ jar * * *
diff --git a/debian/patches/classpath.patch b/debian/patches/classpath.patch
deleted file mode 100644
index fd6eeee..0000000
--- a/debian/patches/classpath.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Subject: Set classpath for jars to /usr/share/java
-  Upstream bundles dependencies as jar files in libs/, which are removed during
-  repack. Modify classpaths in build.xml to use /usr/share/java/ instead.
-Forwarded: not-needed
-Author: Christopher Hoskin <mans0954 at debian.org>
-Last-Update: 2017-09-03
-
---- a/build.xml
-+++ b/build.xml
-@@ -87,7 +87,7 @@
-     <property name="revisionType"       value="" />
-     <property name="revisionNumber"     value="" />
-     <property name="completeVersion"    value="${version}${revisionType}${revisionNumber}" />
--    <property name="xgcVersion"         value="2.2" />
-+    <property name="xgcVersion"         value="2.1" />
-     <property name="fopVersion"         value="2.2" />
-     <property name="vendor"             value="The Apache Software Foundation (http://xmlgraphics.apache.org/batik/)" />
- 
-@@ -1048,13 +1048,20 @@
-   <!-- All batik in a single jar (dependencies: none) -->
-   <target name="all-jar" depends="init, compile, prepare-build"
-           description="Creates a combined JAR file of the Batik libraries in ${build}/lib">
--    <jar jarfile="${build}/lib/${project}-all-${completeVersion}.jar">
-+    <jar flattenAttributes="true" jarfile="${build}/lib/${project}-all-${completeVersion}.jar">
-       <manifest>
-         <attribute name="Implementation-Title" value="Batik all-in-one JAR"/>
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-         <attribute name="Main-Class" value="${class-prefix}.apps.svgbrowser.Main"/>
-+        <attribute name="Class-Path" value="/usr/share/java/xercesImpl-2.9.1.jar" />
-+        <attribute name="Class-Path" value="/usr/share/java/xalan-2.7.2.jar" />
-+        <attribute name="Class-Path" value="/usr/share/java/xml-apis-1.3.04.jar" />
-+        <attribute name="Class-Path" value="/usr/share/java/xml-apis-ext-1.3.04.jar" />
-+        <attribute name="Class-Path" value="/usr/share/java/js.jar" />
-+        <attribute name="Class-Path" value="/usr/share/java/fop-transcoder-allinone-${fopVersion}.jar" />
-+        <attribute name="Class-Path" value="/usr/share/java/xmlgraphics-commons-${xgcVersion}.jar" />
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}" excludes="**/.svn/">
-@@ -1714,7 +1721,7 @@
-   <!-- SVG Pretty-printer (dependencies: ???) -->
-   <target name="svg-pp-jar" depends="init, compile, prepare-build">
-     <antcall target = "svg-pp-jar-call">
--      <param name="jarsLibDir" value="lib/" />
-+      <param name="jarsLibDir" value="/usr/share/java/" />
-       <param name="jarVersion" value="${completeVersion}" />
-       <param name="svg-ppJar" value= "${build}/${project}-svgpp-${completeVersion}.jar" />
-     </antcall>
-@@ -1736,7 +1743,7 @@
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1751,7 +1758,7 @@
-   <!-- SVG Slide-show (dependencies: ???) -->
-   <target name="svg-slideshow-jar" depends="init, compile, prepare-build">
-       <antcall target="svg-slideshow-jar-call">
--        <param name="jarsLibDir" value="lib/" />
-+        <param name="jarsLibDir" value="/usr/share/java/" />
-         <param name="jarVersion" value="${completeVersion}" />
-         <param name="svg-slideshowJar" value= "${build}/${project}-slideshow-${completeVersion}.jar"/>
-       </antcall>
-@@ -1782,10 +1789,10 @@
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xercesImpl.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xalan2.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-@@ -1802,7 +1809,7 @@
-   <!-- Squiggle (dependencies: all) -->
-   <target name="squiggle-jar" depends="init, compile, prepare-build">
-     <antcall target="squiggle-jar-call">
--      <param name="jarsLibDir" value="lib/" />
-+      <param name="jarsLibDir" value="/usr/share/java/" />
-       <param name="jarVersion" value="${completeVersion}" />
-       <param name="squiggleJar" value="${build}/${project}-squiggle-${completeVersion}.jar" />
-     </antcall>
-@@ -1840,10 +1847,10 @@
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xercesImpl.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xalan2.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
-       </manifest>
-@@ -1872,7 +1879,7 @@
-   <target name="squiggle-ext-jar" depends="init, squiggle-jar">
-     <mkdir dir="${build}/extensions"/>
-     <antcall target="squiggle-ext-jar-call">
--      <param name="jarsLibDir" value="lib/" />
-+      <param name="jarsLibDir" value="/usr/share/java/" />
-       <param name="jarVersion" value="" />
-       <param name="squiggle-extJar" value="${build}/extensions/${project}-squiggle-ext-${completeVersion}.jar" />
-     </antcall>
-@@ -1913,7 +1920,7 @@
-   <!-- Rasterizer (dependencies: all except GUI util) -->
-   <target name="rasterizer-jar" depends="init, compile, prepare-build">
-     <antcall target="rasterizer-jar-call">
--      <param name="jarsLibDir" value="lib/" />
-+      <param name="jarsLibDir" value="/usr/share/java/" />
-       <param name="jarVersion" value="${completeVersion}" />
-       <param name="rasterizerJar" value="${build}/${project}-rasterizer-${completeVersion}.jar" />
-     </antcall>
-@@ -1950,10 +1957,10 @@
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xercesImpl.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xalan2.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
--        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-+        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}fop-transcoder-allinone-${fopVersion}.jar" />
-         <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar" />
-@@ -2018,7 +2025,7 @@
-   <!-- batik-ttf2svg.jar (dependencies: all) -->
-   <target name="ttf2svg-jar" depends="init, compile, prepare-build">
-     <antcall target="ttf2svg-jar-call" >
--      <param name="jarsLibDir" value="lib/" />
-+      <param name="jarsLibDir" value="/usr/share/java/" />
-       <param name="jarVersion" value="${completeVersion}" />
-       <param name="ttf2svgJar" value="${build}/${project}-ttf2svg-${completeVersion}.jar"/>
-     </antcall>
diff --git a/debian/patches/series b/debian/patches/series
index 8b1e865..f7a33cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-#source-1.5.patch
 06_fix_paths_in_policy_files.patch
-classpath.patch
diff --git a/debian/patches/source-1.5.patch b/debian/patches/source-1.5.patch
deleted file mode 100644
index a7f2b46..0000000
--- a/debian/patches/source-1.5.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Mon, 14 Oct 2013 14:59:02 +0200
-Subject: source-1.5
-
----
- build.xml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: batik-1.8/build.xml
-===================================================================
---- batik-1.8.orig/build.xml
-+++ batik-1.8/build.xml
-@@ -747,7 +747,7 @@ JAVA=/usr/bin/java
-     <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
- 
-     <javac srcdir="${testsrc}" destdir="${dest}"  deprecation="${deprecation}" 
--           debug="${debug}" optimize="${optimize}" encoding="UTF-8">
-+           debug="${debug}" optimize="${optimize}" encoding="UTF-8" target="1.5"  source="1.5">
-       <classpath>
-         <pathelement location="${dest}"/>
-         <path refid="libs-classpath"/>
-@@ -770,7 +770,7 @@ JAVA=/usr/bin/java
- 
-     <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
- 
--    <javac srcdir="${samples}/tests/resources/java/sources" destdir="${samples}/tests/resources/java/classes"  deprecation="${deprecation}" 
-+    <javac srcdir="${samples}/tests/resources/java/sources" destdir="${samples}/tests/resources/java/classes"  deprecation="${deprecation}"  target="1.5"  source="1.5"
-            debug="${debug}" optimize="${optimize}" encoding="UTF-8">
-       <classpath>
-         <pathelement location="${dest}"/>
-@@ -780,7 +780,7 @@ JAVA=/usr/bin/java
-       </classpath>
-     </javac>
- 
--    <javac srcdir="${testresources}" destdir="${testresources}/classes"  deprecation="${deprecation}" 
-+    <javac srcdir="${testresources}" destdir="${testresources}/classes"  deprecation="${deprecation}"  target="1.5"  source="1.5"
-            debug="${debug}" optimize="${optimize}" encoding="UTF-8">
-       <classpath>
-         <pathelement location="${dest}"/>
-@@ -917,7 +917,7 @@ JAVA=/usr/bin/java
- 
-   <target name="compile" depends="init, compile-prepare" unless="compile.done">
-     <javac destdir="${dest}" deprecation="${deprecation}" 
--           debug="${debug}" optimize="${optimize}" encoding="UTF-8"
-+           debug="${debug}" optimize="${optimize}" encoding="UTF-8" target="1.5"  source="1.5"
-            includeAntRuntime="true">
-       <src path="${src}"/>
-       <classpath refid="libs-classpath"/>
diff --git a/debian/rules b/debian/rules
index 4a01324..791832a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,9 @@
 #!/usr/bin/make -f
 
-export CLASSPATH=/usr/share/java/js.jar:/usr/share/java/xalan2.jar:/usr/share/java/xmlgraphics-commons.jar
-
-UPSTREAM_VERSION = 1.9
+export JAVA_HOME = /usr/lib/jvm/default-java
 
 %:
-	dh $@ --buildsystem=ant --with maven-repo-helper
-
-override_dh_auto_build:
-	dh_auto_build -- all-jar libs-jar ext-jar transcoder-jar jars
-
-override_dh_auto_install:
-	dh_auto_install
-
-	# Install batik-libs.jar
-	install -m 644 batik-$(UPSTREAM_VERSION)/lib/batik-libs-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-libs-$(UPSTREAM_VERSION).jar
-	ln -s batik-libs-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-libs.jar
-
-	# Link batik.jar and batik-1.9.jar to batik-all-1.9.jar
-	ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$(UPSTREAM_VERSION).jar
-	ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik.jar
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/batik.git



More information about the pkg-java-commits mailing list