[mpj] 14/22: New upstream version with adapted patch and consequent usage of Files-Excluded
Andreas Tille
tille at debian.org
Wed May 11 06:46:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository mpj.
commit 4a3b769658ddb9d4420199c2aba94d8591590705
Author: Andreas Tille <tille at debian.org>
Date: Thu Jul 24 13:10:28 2014 +0000
New upstream version with adapted patch and consequent usage of Files-Excluded
---
debian/changelog | 9 ++++
debian/get-orig-source | 62 ---------------------------
debian/patches/use_debian_packaged_jars.patch | 42 +++++++++---------
debian/rules | 2 +-
debian/watch | 5 +--
5 files changed, 33 insertions(+), 87 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54dc1ac..6e8328d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mpj (0.42+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream version (adapted patch)
+ * Adapted d/watch, droped d/get-orig-source
+ * New Build-Depends: libcommons-cli-java, libcommons-codec-java,
+ libcommons-io-java
+
+ -- Andreas Tille <tille at debian.org> Thu, 24 Jul 2014 13:43:16 +0200
+
mpj (0.38+dfsg-2) unstable; urgency=low
* Upload to unstable
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index 5eb2977..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# get source for libmpj-java and remove unneeded jars and binaries
-
-set -e
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-
-if ! echo $@ | grep -q upstream-version ; then
- VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-else
- VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${NAME}.*?\1?"`
- if echo "$VERSION" | grep -q "upstream-version" ; then
- echo "Unable to parse version number"
- exit
- fi
-fi
-
-# unmangle version
-UVERSION=`echo ${VERSION} | sed 's/\./_/'`
-UARCHIVEDIR=${NAME}-v${UVERSION}
-UPSTREAMARCHIVE=${UARCHIVEDIR}.zip
-
-mkdir -p ../tarballs
-cd ../tarballs
-mv ../${UPSTREAMARCHIVE} .
-unzip -q ${UPSTREAMARCHIVE}
-cd ${UARCHIVEDIR}
-
-# Remove unneeded binaries
-rm -rf bin/daemon*
-rm -rf bin/*.bat
-rm -rf bin/*.exe
-find . -name "*.dll" -delete
-find . -name "*macosx*" -delete
-find . -name "*solaris*" -delete
-
-# Unfortunately there is no source for the PDFs
-find . -name "*.pdf" -delete
-
-# Remove binaries which are provided by Debian packages anyway
-find . -name "libwrapper*" -delete # libservice-wrapper-jni
-rm -f lib/log4j*.jar # liblog4j1.2-java
-rm -f lib/wrapper.jar # libservice-wrapper-java
-
-# The test suite contains code with unspecified license
-# because it is not used in the build process it will
-# be simply removed to enable upload to Debian main.
-# Volunteers to do further investigation are really welcome
-rm -rf test
-
-# finally all precompiled JARs are either builded in the build process
-# or not needed for the build process of mpj.jar which is in our main interest
-rm -f lib/*
-
-# After removing the subject of this license file it can be removed as well
-rm -f THIRDPARTYLICENSES.txt
-
-# ... and once we are talking about deleting useless stuff
-rm -f README-win.txt
-
-cd ..
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"~dfsg.orig.tar.gz "${UARCHIVEDIR}"
-rm -rf ${UARCHIVEDIR}
diff --git a/debian/patches/use_debian_packaged_jars.patch b/debian/patches/use_debian_packaged_jars.patch
index e5ba185..cc70d02 100644
--- a/debian/patches/use_debian_packaged_jars.patch
+++ b/debian/patches/use_debian_packaged_jars.patch
@@ -1,36 +1,36 @@
Author: Andreas Tille <tille at debian.org>
-Date: Sat, 21 Jan 2012 15:15:57 +0100
+Last-Update: Thu, 24 Jul 2014 13:53:02 +0200
Description: Use Debian packaged libraries
- Set classpath to those Debian JARs which are used
- Remove jetty from classpath which is actually not used and thus there
is no need to worry about its copyright explicitely
---- mpj-v0_38.orig/build.xml
-+++ mpj-v0_38/build.xml
-@@ -79,7 +79,7 @@
+--- a/build.xml
++++ b/build.xml
+@@ -82,7 +82,7 @@
depends="generateJava">
<javac srcdir="${src.dir}"
-- classpath="lib/wrapper.jar:lib/org.mortbay.jetty.jar:lib/log4j-1.2.11.jar"
-+ classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.jar"
+- classpath="lib/wrapper.jar:lib/org.mortbay.jetty.jar:lib/log4j-1.2.11.jar:lib/commons-cli-1.2.jar:lib\commons-codec-1.8.jar:lib\commons-io-2.4.jar"
++ classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.11.jar:/usr/share/java/commons-cli-1.2.jar:/usr/share/java/commons-codec-1.9.jar:/usr/share/java/commons-io-2.4.jar"
sourcepath="${src.dir}"
debug="true"
/>
-@@ -190,7 +190,7 @@
- <manifest>
- <attribute name="Main-class" value="runtime.starter.MPJRun" />
- <attribute name="Class-path"
-- value="org.mortbay.jetty.jar log4j-1.2.11.jar javax.servlet.jar"/>
-+ value="log4j-1.2.11.jar javax.servlet.jar"/>
- </manifest>
- </jar>
- </target>
-@@ -273,7 +273,7 @@
+@@ -202,7 +202,7 @@
+ <manifest>
+ <attribute name="Main-class" value="runtime.starter.MPJRun" />
+ <attribute name="Class-path"
+- value="org.mortbay.jetty.jar log4j-1.2.11.jar runtimecommon.jar"/>
++ value="log4j-1.2.11.jar runtimecommon.jar"/>
+ </manifest>
+ </jar>
+
+@@ -303,7 +303,7 @@
<target name="java-docs" depends="figures">
<javadoc
destdir="${doc.dir}/javadocs"
-- classpath="${lib.dir}/org.mortbay.jetty.jar:${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar">
-+ classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar">
- <fileset dir="${mpi.dir}" defaultexcludes="yes">
- <include name="**/Cartcomm.java"/>
- <include name="**/CartParms.java"/>
+- classpath="${lib.dir}/org.mortbay.jetty.jar:${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar;${lib.dir}/commons-cli-1.2.jar">
++ classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar;${lib.dir}/commons-cli-1.2.jar">
+ <fileset dir="${mpi.dir}" defaultexcludes="yes">
+ <include name="**/Cartcomm.java"/>
+ <include name="**/CartParms.java"/>
diff --git a/debian/rules b/debian/rules
index d52d2e5..b02b2bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,4 @@ override_dh_auto_build:
dh_auto_build -- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
get-orig-source:
- uscan --verbose --force-download
+ uscan --verbose --force-download --repack --compress xz
diff --git a/debian/watch b/debian/watch
index 4d338ae..b81fb36 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
version=3
-opts="uversionmangle=s/_/./g,dversionmangle=s/\+dfsg//" \
- http://sf.net/mpjexpress/mpj-v(.+)\.zip \
- debian debian/get-orig-source
+opts="uversionmangle=s/_/./g;s/$/+dfsg/" \
+ http://sf.net/mpjexpress/mpj-v(.+)\.zip
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mpj.git
More information about the pkg-java-commits
mailing list