diff -Nru javatools-0.71ubuntu1/debian/changelog javatools-0.72.1/debian/changelog --- javatools-0.71ubuntu1/debian/changelog 2018-11-29 13:48:09.000000000 +0000 +++ javatools-0.72.1/debian/changelog 2018-11-30 14:09:30.000000000 +0000 @@ -1,10 +1,16 @@ -javatools (0.71ubuntu1) disco; urgency=medium +javatools (0.72.1) unstable; urgency=medium - * Cherry pick from the VCS: + * Fixed the installation of java-arch.sh + + -- Emmanuel Bourg Fri, 30 Nov 2018 15:09:30 +0100 + +javatools (0.72) unstable; urgency=medium + + * Remove obsolete fetch-eclipse-source script. * jh_installlibs: Correct default version mangling regex which failed to handle dfsg versions. (Closes: #914417) - -- Matthias Klose Thu, 29 Nov 2018 14:48:09 +0100 + -- Niels Thykier Fri, 30 Nov 2018 01:23:42 +0100 javatools (0.71) unstable; urgency=medium diff -Nru javatools-0.71ubuntu1/debian/copyright javatools-0.72.1/debian/copyright --- javatools-0.71ubuntu1/debian/copyright 2015-05-20 10:46:26.000000000 +0000 +++ javatools-0.72.1/debian/copyright 2018-11-30 00:23:05.000000000 +0000 @@ -19,13 +19,6 @@ with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -With the exception of fetch-eclipse-source, which is based on a Fedora -contribution. The details for this file is - -Copyright: 2009, Mat Booth - 2009, Alexander Kurtakov - 2010, Benjamin Drung - License: The file was downloaded from Fedora's CVS repository; all committers diff -Nru javatools-0.71ubuntu1/debian/javahelper.install javatools-0.72.1/debian/javahelper.install --- javatools-0.71ubuntu1/debian/javahelper.install 2017-07-02 22:14:14.000000000 +0000 +++ javatools-0.72.1/debian/javahelper.install 2018-11-30 14:09:06.000000000 +0000 @@ -1,6 +1,5 @@ # Internal helper command - not ready for /usr/bin eclipse_helper.pm /usr/share/perl5/Debian/Debhelper/Sequence -fetch-eclipse-source /usr/bin java-arch.sh /usr/share/javahelper java-vars.mk /usr/share/javahelper javahelper.mk /usr/share/cdbs/1/class diff -Nru javatools-0.71ubuntu1/debian/rules javatools-0.72.1/debian/rules --- javatools-0.71ubuntu1/debian/rules 2018-11-03 18:28:39.000000000 +0000 +++ javatools-0.72.1/debian/rules 2018-11-30 00:23:05.000000000 +0000 @@ -29,7 +29,6 @@ $(POD2MAN) jh_classpath tmp/jh_classpath.1 $(POD2MAN) jh_installjavadoc tmp/jh_installjavadoc.1 $(POD2MAN) jh_installlibs tmp/jh_installlibs.1 - $(POD2MAN) fetch-eclipse-source.pod tmp/fetch-eclipse-source.1 $(POD2MAN) -s 1 jh_clean.pod tmp/jh_clean.1 $(POD2MAN) $(MOD_PATH)/Eclipse.pm tmp/Debian::Javahelper::Eclipse.3 $(POD2MAN) $(MOD_PATH)/Java.pm tmp/Debian::Javahelper::Java.3 diff -Nru javatools-0.71ubuntu1/fetch-eclipse-source javatools-0.72.1/fetch-eclipse-source --- javatools-0.71ubuntu1/fetch-eclipse-source 2015-05-20 10:46:26.000000000 +0000 +++ javatools-0.72.1/fetch-eclipse-source 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -#!/bin/bash -set -e - -# This file has been obtained from: -# http://cvs.fedoraproject.org/viewvc/rpms/eclipse-emf/devel/ -# -# The author list below is not from the original file, but has been -# written based on the CVS commit log (in case the CVS should some day -# be unavailable). -# -# Written by: 2009, Mat Booth -# Modified by: 2009, Alexander Kurtakov -# - -# uscan will run this script like -# fetch-eclipse-source --upstream-version - -# This script requires that these package are installed: cvs, gawk, tofrodos - -VERSION=$2 -DIRECTORY_TXT=$3 - -if ! which cvs > /dev/null 2>&1; then - echo "$0: Cannot find cvs. Please install the cvs package." >&2 - exit 1 -fi -if ! which gawk > /dev/null 2>&1; then - echo "$0: Cannot find gawk. Please install the gawk package." >&2 - exit 1 -fi -if ! which fromdos > /dev/null 2>&1; then - echo "$0: Cannot find fromdos. Please install the tofrodos package." >&2 - exit 1 -fi - -if test ! -f debian/control; then - echo "$0: Could not find debian/control." >&2 - exit 1 -fi - -NAME=$(grep "Source:" debian/control | sed "s/^Source: //") - -MAPFILE=$NAME.map -TEMPMAPFILE=temp.map - -echo "Exporting from CVS..." -rm -rf ${NAME}-$VERSION -mkdir ${NAME}-$VERSION - -mv $DIRECTORY_TXT ${NAME}-$VERSION/$MAPFILE -pushd ${NAME}-$VERSION >/dev/null -fromdos $MAPFILE -grep ^[a-z] $MAPFILE > $TEMPMAPFILE - -gawk 'BEGIN { - FS="," -} -{ -if (NF < 4) { - - split($1, version, "="); - split(version[1], directory, "@"); - cvsdir=split($2, dirName, ":"); - printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous@dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash"; -} -else { - - split($1, version, "="); - total=split($4, directory, "/"); - cvsdir=split($2, dirName, ":"); - printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous@dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash"; -} - -}' $TEMPMAPFILE - -rm $TEMPMAPFILE $MAPFILE -popd >/dev/null - -echo "Remove prebuilt binaries and jars..." -find $NAME-$VERSION $ -name '*.exe' -o -name '*.dll' $ -delete -find $NAME-$VERSION $ -name '*.so' -o -name '*.so.2' $ -delete -find $NAME-$VERSION -name '*.jar' -delete -echo "Remove empty directories..." -find $NAME-$VERSION -depth -type d -empty -delete -echo "Creating tarball '../${NAME}_$VERSION$DEBV.orig.tar.bz2'..." -if test -f debian/fetch-eclipse-source.exclude; then - tar -acf ../${NAME}_$VERSION$DEBV.orig.tar.bz2 ${NAME}-$VERSION -X debian/fetch-eclipse-source.exclude -else - tar -acf ../${NAME}_$VERSION$DEBV.orig.tar.bz2 ${NAME}-$VERSION -fi -rm -rf ${NAME}-$VERSION diff -Nru javatools-0.71ubuntu1/fetch-eclipse-source.pod javatools-0.72.1/fetch-eclipse-source.pod --- javatools-0.71ubuntu1/fetch-eclipse-source.pod 2015-05-20 10:46:26.000000000 +0000 +++ javatools-0.72.1/fetch-eclipse-source.pod 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -=head1 NAME - -fetch-eclipse-source - checks out an eclipse project from CVS. - -=head1 SYNOPSIS - - fetch-eclipse-source --upstream-version - -=head1 DESCRIPTION - -Used to checkout an eclispe project from CVS via L. The -directory.txt is a file containing the parts to check out and is -usually provided by upstream. - -It can also exclude parts of the upstream projects by using the -exclude file (see FILES) - -=head1 FILES - -=over 4 - -=item debian/fetch-eclipse-source.exclude - -If present, this file will be used to exclude parts of the project -from the resulting tarball. The file is passed to L via -its I<-X> option. - -=back - -=head1 SEE ALSO - -L - -=head1 AUTHOR - -Niels Thykier wrote this manpage. - -=cut