diff -Nru mtj-0.9.14+dfsg/debian/changelog mtj-0.9.14+dfsg/debian/changelog --- mtj-0.9.14+dfsg/debian/changelog 2013-08-23 12:42:39.000000000 +0000 +++ mtj-0.9.14+dfsg/debian/changelog 2016-06-27 10:24:20.000000000 +0000 @@ -1,3 +1,20 @@ +mtj (0.9.14+dfsg-4) unstable; urgency=medium + + * Upload to unstable (main) + + -- Andreas Tille Mon, 27 Jun 2016 12:23:40 +0200 + +mtj (0.9.14+dfsg-3) experimental; urgency=medium + + * Upload to main + * Packaging moved from Debian Med SVN to Debian Java Git + * Upstream moved to Github - adapt d/watch and remove get-orig-source + * README.source: explain why not upgraded to latest upstream + * cme fix dpkg-control + * d/rules: do not force 1.5 format + + -- Andreas Tille Fri, 20 May 2016 21:32:54 +0200 + mtj (0.9.14+dfsg-2) unstable; urgency=low * Upload to unstable diff -Nru mtj-0.9.14+dfsg/debian/control mtj-0.9.14+dfsg/debian/control --- mtj-0.9.14+dfsg/debian/control 2013-08-23 12:42:29.000000000 +0000 +++ mtj-0.9.14+dfsg/debian/control 2016-06-27 10:24:20.000000000 +0000 @@ -1,17 +1,17 @@ Source: mtj -Maintainer: Debian Med Packaging Team +Maintainer: Debian Java Maintainers Uploaders: Andreas Tille -Section: contrib/java +Section: java Priority: optional Build-Depends: debhelper (>= 9), javahelper, default-jdk (>= 1:1.6), ant, libnetlib-java -Standards-Version: 3.9.4 -Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/libmtj-java/trunk/ -Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/libmtj-java/trunk/ -Homepage: http://code.google.com/p/matrix-toolkits-java/ +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libmtj-java.git +Vcs-Git: https://anonscm.debian.org/git/pkg-java/libmtj-java.git +Homepage: https://github.com/fommil/matrix-toolkits-java/ Package: libmtj-java Architecture: all @@ -51,4 +51,3 @@ a production environment. . This package contains the javadoc documentation files. - diff -Nru mtj-0.9.14+dfsg/debian/copyright mtj-0.9.14+dfsg/debian/copyright --- mtj-0.9.14+dfsg/debian/copyright 2012-08-24 22:27:38.000000000 +0000 +++ mtj-0.9.14+dfsg/debian/copyright 2016-06-27 10:24:20.000000000 +0000 @@ -2,7 +2,7 @@ Upstream-Name: matrix-toolkits-java Upstream-Contact: Sam Halliday Bjørn-Ove Heimsund -Source: http://code.google.com/p/matrix-toolkits-java/downloads/list +Source: https://github.com/fommil/matrix-toolkits-java Files-Excluded: *.jar lib/junit/ @@ -19,35 +19,6 @@ Olivier Sallou License: LGPL-3+ -Files: lib/netlib-java/*.jar -Copyright: 2008-2011 Sam Halliday - Keith Seymour -License: BSD-new - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Comment: The files are provided as binary JAR files. The source is - available from - http://code.google.com/p/netlib-java/ - License: LGPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff -Nru mtj-0.9.14+dfsg/debian/get-orig-source mtj-0.9.14+dfsg/debian/get-orig-source --- mtj-0.9.14+dfsg/debian/get-orig-source 2012-06-03 11:39:27.000000000 +0000 +++ mtj-0.9.14+dfsg/debian/get-orig-source 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/sh -# get source for libmtj-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 -UARCHIVEDIR=${NAME}-${VERSION} -UPSTREAMARCHIVE=${UARCHIVEDIR}.zip - -mkdir -p ../tarballs -cd ../tarballs -mv ../${UPSTREAMARCHIVE} . -unzip -q ${UPSTREAMARCHIVE} - -# Remove all *.jar files -# rm -rf ${UARCHIVEDIR}/lib/* -find ${UARCHIVEDIR} -name "*.jar" -delete -find ${UARCHIVEDIR} -type d -empty -delete - -# Build process deletes javadoc first and rebuilds it afterwards -# So it is reasonable to save space in the upstream tarball once -# we are rebuilding it anyway -rm -rf ${UARCHIVEDIR}/javadoc - -GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"~dfsg.orig.tar.gz "${UARCHIVEDIR}" -rm -rf ${UARCHIVEDIR} diff -Nru mtj-0.9.14+dfsg/debian/patches/use_debian_jar_files.patch mtj-0.9.14+dfsg/debian/patches/use_debian_jar_files.patch --- mtj-0.9.14+dfsg/debian/patches/use_debian_jar_files.patch 2012-06-03 11:31:15.000000000 +0000 +++ mtj-0.9.14+dfsg/debian/patches/use_debian_jar_files.patch 2016-06-27 10:24:20.000000000 +0000 @@ -1,3 +1,7 @@ +Author: Andreas Tille +Last-Update: Sun, 03 Jun 2012 13:02:47 +0200 +Description: Use Debian packaged JARs + --- mtj-0.9.14.orig/build.xml +++ mtj-0.9.14/build.xml @@ -16,4 +16,6 @@ diff -Nru mtj-0.9.14+dfsg/debian/README.source mtj-0.9.14+dfsg/debian/README.source --- mtj-0.9.14+dfsg/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ mtj-0.9.14+dfsg/debian/README.source 2016-06-27 10:24:20.000000000 +0000 @@ -0,0 +1,9 @@ +The new versions of mtj are featuring a new maven based build system. +This ne build system is featuring severe problems and thus it was +recommended on Debian Java list[1] to stick to the old code base if +the reverse Dependencies are working with this. + +The discussion was about libnetlib-java but the same is true for +libmtj-java as well. + +[1] https://lists.debian.org/debian-java/2016/05/msg00035.html diff -Nru mtj-0.9.14+dfsg/debian/rules mtj-0.9.14+dfsg/debian/rules --- mtj-0.9.14+dfsg/debian/rules 2012-12-17 13:28:08.000000000 +0000 +++ mtj-0.9.14+dfsg/debian/rules 2016-06-27 10:24:20.000000000 +0000 @@ -4,9 +4,3 @@ %: dh $@ --with javahelper - -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 diff -Nru mtj-0.9.14+dfsg/debian/watch mtj-0.9.14+dfsg/debian/watch --- mtj-0.9.14+dfsg/debian/watch 2012-08-24 22:10:28.000000000 +0000 +++ mtj-0.9.14+dfsg/debian/watch 2016-06-27 10:24:20.000000000 +0000 @@ -1,5 +1,4 @@ version=3 -opts=dversionmangle=s/\+dfsg// \ - http://code.google.com/p/matrix-toolkits-java/downloads/list?can=1 \ - .*/mtj-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip) \ - debian debian/get-orig-source + +opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \ + https://github.com/fommil/matrix-toolkits-java/releases .*/archive/mtj-(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)