diff -Nru jlibeps-0.1+2/debian/build.xml jlibeps-0.1.ds3/debian/build.xml
--- jlibeps-0.1+2/debian/build.xml 2009-05-01 00:03:55.000000000 +0000
+++ jlibeps-0.1.ds3/debian/build.xml 2016-08-08 14:14:06.000000000 +0000
@@ -21,7 +21,7 @@
-
+
diff -Nru jlibeps-0.1+2/debian/changelog jlibeps-0.1.ds3/debian/changelog
--- jlibeps-0.1+2/debian/changelog 2011-11-06 12:53:56.000000000 +0000
+++ jlibeps-0.1.ds3/debian/changelog 2016-08-08 14:14:06.000000000 +0000
@@ -1,3 +1,14 @@
+jlibeps (0.1.ds3-1) unstable; urgency=medium
+
+ * Update maintainer details.
+ * Update packaging for debhelper compat level 9.
+ * Update d/copyright Files-Excluded stanzas.
+ * Update Standards-Version to 3.9.8 (no changes required).
+ * Switch to default-jdk for build system.
+ * Set locale to make javadoc output reproducible.
+
+ -- Stuart Prescott Tue, 09 Aug 2016 00:14:06 +1000
+
jlibeps (0.1+2-2) unstable; urgency=low
* Bump standards version to 3.9.2 (no changes required).
diff -Nru jlibeps-0.1+2/debian/compat jlibeps-0.1.ds3/debian/compat
--- jlibeps-0.1+2/debian/compat 2011-11-06 11:02:48.000000000 +0000
+++ jlibeps-0.1.ds3/debian/compat 2016-08-08 14:14:06.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru jlibeps-0.1+2/debian/control jlibeps-0.1.ds3/debian/control
--- jlibeps-0.1+2/debian/control 2011-11-06 13:21:38.000000000 +0000
+++ jlibeps-0.1.ds3/debian/control 2016-08-08 14:14:06.000000000 +0000
@@ -1,16 +1,19 @@
Source: jlibeps
Section: java
Priority: optional
-Maintainer: Stuart Prescott
-Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: java-gcj-compat-dev, ant
-Standards-Version: 3.9.2
+Maintainer: Stuart Prescott
+Build-Depends:
+ debhelper (>= 9)
+Build-Depends-Indep:
+ ant,
+ default-jdk
+Standards-Version: 3.9.8
Homepage: http://jlibeps.sourceforge.net/
-DM-Upload-Allowed: yes
Package: libjlibeps-java
Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
Description: Java library to create EPS images
The jlibeps classes are a set of Java classes for creating EPS images.
.
@@ -24,12 +27,14 @@
Package: libjlibeps-java-doc
Architecture: all
Section: doc
-Depends: default-jdk-doc, ${misc:Depends}
-Suggests: libjlibeps-java
+Depends:
+ default-jdk-doc,
+ ${misc:Depends}
+Suggests:
+ libjlibeps-java
Description: API documentation for jlibeps Java library to create EPS images
The jlibeps classes are a set of Java classes for creating EPS images.
.
This package contains the API documentation for the library.
.
See the package libjlibeps-java for further information.
-
diff -Nru jlibeps-0.1+2/debian/copyright jlibeps-0.1.ds3/debian/copyright
--- jlibeps-0.1+2/debian/copyright 2011-11-06 11:45:38.000000000 +0000
+++ jlibeps-0.1.ds3/debian/copyright 2016-08-08 14:14:06.000000000 +0000
@@ -1,10 +1,13 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: jlibeps
Upstream-Contact: Arnaud BLOUIN
Source: http://jlibeps.sourceforge.net/
- The compiled java (*.class) and archives (*.jar) were stripped
- from the downloaded file to create the 'orig' source package.
- See the file README.Debian-source for full details.
+Files-Excluded:
+ *.class
+ *.jar
+ doc/*
+ bin/*
+Comment: The compiled java (*.class) and archives (*.jar) were removed.
Files: *
Copyright: © 2001-2006, Paul James Mutton
@@ -12,7 +15,7 @@
License: GPL-2+
Files: debian/*
-Copyright: © 2007-2011, Stuart Prescott
+Copyright: © 2007-2016, Stuart Prescott
License: GPL-2+
License: GPL-2+
diff -Nru jlibeps-0.1+2/debian/gbp.conf jlibeps-0.1.ds3/debian/gbp.conf
--- jlibeps-0.1+2/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000
+++ jlibeps-0.1.ds3/debian/gbp.conf 2016-08-08 14:14:06.000000000 +0000
@@ -0,0 +1,4 @@
+[DEFAULT]
+pristine-tar = True
+sign-tags = True
+
diff -Nru jlibeps-0.1+2/debian/libjlibeps-java-doc.docs jlibeps-0.1.ds3/debian/libjlibeps-java-doc.docs
--- jlibeps-0.1+2/debian/libjlibeps-java-doc.docs 2008-06-30 00:45:13.000000000 +0000
+++ jlibeps-0.1.ds3/debian/libjlibeps-java-doc.docs 2016-08-08 14:14:06.000000000 +0000
@@ -1,2 +1 @@
-debian/README.Debian-source
-api
\ No newline at end of file
+api
diff -Nru jlibeps-0.1+2/debian/libjlibeps-java.docs jlibeps-0.1.ds3/debian/libjlibeps-java.docs
--- jlibeps-0.1+2/debian/libjlibeps-java.docs 2008-07-21 23:22:16.000000000 +0000
+++ jlibeps-0.1.ds3/debian/libjlibeps-java.docs 2016-08-08 14:14:06.000000000 +0000
@@ -1,2 +1 @@
-debian/README.Debian-source
debian/HISTORY
diff -Nru jlibeps-0.1+2/debian/README.Debian-source jlibeps-0.1.ds3/debian/README.Debian-source
--- jlibeps-0.1+2/debian/README.Debian-source 2009-04-19 22:33:43.000000000 +0000
+++ jlibeps-0.1.ds3/debian/README.Debian-source 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-
-Repackaging of original source for jlibeps
----------------------------------------------------------------------
-
-jlibeps version 0.1+2.
-
-Downloaded file: jlibeps-0.1-src.zip
-From: sourceforge.net
-Path: http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/j/jl/jlibeps/jlibeps-0.1-src.zip
-
-$ md5sum --binary jlibeps-0.1-src.zip
-96e114cf8b5dabcce4922a1175641344 *jlibeps-0.1-src.zip
-
-The following commands were used to repackage the original source (the
-'touch' commands ensure that the md5sum of the archives stays the same):
-
-$ mkdir jlibeps-0.1+2.orig
-
-$ unzip -qq -d jlibeps-0.1+2.orig jlibeps-0.1-src.zip
-
-$ touch -t 199001010000.00 jlibeps-0.1+2.orig
-
-$ tar cf jlibeps_0.1+2.orig.tar --owner 0 --group 0 --numeric-owner --exclude=*.class --exclude=*.jar --exclude=bin --exclude=doc jlibeps-0.1+2.orig
-
-$ touch -t 199001010000.00 jlibeps_0.1+2.orig.tar
-
-$ gzip -9 jlibeps_0.1+2.orig.tar
-
-$ md5sum --binary jlibeps_0.1+2.orig.tar.gz
-9e35205bc42aff672d012bd51953307b *jlibeps_0.1+2.orig.tar.gz
-
- -- Stuart Prescott Sun, 19 Apr 2009 23:33:42 +0100
----------------------------------------------------------------------
-
diff -Nru jlibeps-0.1+2/debian/repackage jlibeps-0.1.ds3/debian/repackage
--- jlibeps-0.1+2/debian/repackage 2009-04-20 23:25:33.000000000 +0000
+++ jlibeps-0.1.ds3/debian/repackage 1970-01-01 00:00:00.000000000 +0000
@@ -1,336 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-# set -x
-
-if [ -f ~/.devscripts ]
-then
- . ~/.devscripts
-fi
-
-PACKAGE=frobinator
-UPSTREAM=sourceforge.net
-
-UNARCHIVE=do_unzip
-WRAPDIR=true
-
-LOG=README.Debian-source
-
-VERBOSE=${VERBOSE:-1}
-CLEANUP=${CLEANUP:-0}
-
-SCRIPTDIR=$(dirname $(readlink -f $0))
-
-NAME=$(basename $0)
-RCFILE=$SCRIPTDIR/repackagerc
-
-EXCLUDE_LIST=""
-# Originally '197001010000.00' but tar complains about an
-# "implausibly old time stamp"
-TOUCHTIME=199001010000.00
-
-# Set a consistent umask for repackaging so that the tarball is reproducible
-# (overridable in the rc file)
-umask 002
-
-usage() {
- cat <&2
-Usage: $NAME --upstream-version x.y.z filename.zip
- [src_package_revision] [target_dir]
-
-Where the the version x.y.z is the version number of the new version and
-filename.zip (or .tar.gz or whatever) is the new source filename for the
-package $PACKAGE.
-
-If filename.zip starts with http:// or ftp:// then wget is used to download
-the archive first.
-
-The file $RCFILE must exist and set the following environment variables
-(and these are their current versions):
-
- PACKAGE=$PACKAGE
- UPSTREAM=$UPSTREAM
-
- UNARCHIVE=$UNARCHIVE
- EXCLUDE_LIST=$EXCLUDE_LIST
-
-(EXCLUDE_LIST is a list of exclusions for tar, one per line. Note that
-spaces in path names are problematic)
-
-It is expected that this utility is run by uscan or and is run in the
-base directory of the source package.
-
-The optional argument 'src_package_revision' can be specified to
-indicate additional cycles of source package revision that may have
-been undertaken in addition to the regular packaging activities.
-If not specified, the debian/changelog is parsed to try to work out what
-the source revision should be.
-
-The optional argument 'target_dir' may be used to specify where the repackaged
-source should be left.
-
-EOT
-}
-
-progress() {
- if [ "$VERBOSE" != 0 -a -n $VERBOSE ]
- then
- echo "$@"
- fi
-}
-
-logmsg() {
- echo "$@" >> $LOGFILE
-}
-
-logcmd() {
- logcmdpieces "$@"
- "$@" >> $LOGFILE
-}
-
-# This is a truly appalling hack, but the only sensible way to
-# maintain proper quoting in the log, it seems, unless each command is
-# double quoted to begin with... which is also an ugly, bug-attracting
-# hack.
-logcmdpieces() {
- printf "\n$ " >> $LOGFILE
- echo "$@" >> $LOGFILE
-}
-
-carp() {
- echo "E: ($NAME) $*"
- exit 1
-}
-
-do_unzip() {
- logcmd unzip -qq -d "$1" "$2"
-}
-
-do_untargz() {
- logcmd tar -C "$1" -zxf "$2"
-}
-
-do_untarbz2() {
- logcmd tar -C "$1" -jxf "$2"
-}
-
-testarchive() {
- case "$1" in
- do_unzip)
- ALLDIRS=$(zipinfo -1 "$2" | cut -f1 -d/ | sort -u)
- if [ $(echo "$ALLDIRS" | wc -l) -gt 1 ]
- then
- testarchiveerror
- fi
- echo "$ALLDIRS"
- ;;
- do_untargz)
- ALLDIRS=$(tar ztf "$2" | cut -f1 -d/ | sort -u)
- if [ $(echo "$ALLDIRS" | wc -l) -gt 1 ]
- then
- testarchiveerror
- fi
- echo "$ALLDIRS"
- ;;
- do_untarbz2)
- ALLDIRS=$(tar jtf "$2" | cut -f1 -d/ | sort -u)
- if [ $(echo "$ALLDIRS" | wc -l) -gt 1 ]
- then
- testarchiveerror
- fi
- echo "$ALLDIRS"
- ;;
- esac
-}
-
-testarchiveerror() {
- echo "E: More than one directory was found in the unwrapped archive."
- echo "E: Set WRAPDIR to wrap the contents of the tarball in a directory."
- exit 1
-}
-
-make_exclude_list() {
- echo "$EXCLUDE_LIST" | grep -v -e ^$ | sed 's/^\(.*\)/--exclude=\1/'
-}
-
-next_source_version() {
- LAST_SRC=$(dpkg-parsechangelog | \
- sed -n 's/Version: \(.*\)+[0-9\-]*/\1/p')
- #echo "LS=$LAST_SRC"
- if [ $LAST_SRC = $VERSION ]
- then
- SRCVERSION=$(dpkg-parsechangelog | \
- sed -n 's/Version: [^+]*+\(.*\)-.*/\1/p')
- SRCVERSION=$(($SRCVERSION+1))
- else
- SRCVERSION=1
- fi
- echo $SRCVERSION
-}
-
-###########################################################################
-
-if [ ! -f $RCFILE ]
-then
- cat <&2
-$0 Error: No configuration parameters found in file $RCFILE.
-Exiting.
-EOT
- usage
- exit 1
-fi
-
-# Read in the user/package settings
-. $RCFILE
-
-if [ $# -lt 3 -o $# -gt 5 ]
-then
- usage
- exit 1
-fi
-
-###########################################################################
-
-DATE=$(date -R)
-
-VERSION=$2
-SRCPATH=$3
-
-SRCVERSION=""
-TARGETDIR=$(pwd)
-if [ $# -eq 5 ]
-then
- SRCVERSION="$4"
- TARGETDIR="$5"
-elif [ $# -eq 4 ]
-then
- if [ -d $4 ]
- then
- TARGETDIR="$4"
- SRCVERSION=$(next_source_version)
- else
- SRCVERSION="$4"
- fi
-else
- SRCVERSION=$(next_source_version)
-fi
-VERSION="$VERSION+$SRCVERSION"
-
-if [ ! -d "$TARGETDIR" ]
-then
- carp "Target directory '$TARGETDIR' doesn't exist!"
-fi
-
-progress "I: Making orig tarball for $VERSION"
-
-###########################################################################
-
-LOGFILE=$TARGETDIR/$LOG
-
-if [ -f "$LOGFILE" ]
-then
- progress "W: Deleting existing log file"
- rm "$LOGFILE"
-fi
-
-###########################################################################
-
-DIR=${PACKAGE}-$VERSION.orig
-
-ARCHIVEFILE=${PACKAGE}_${VERSION}.orig.tar
-ARCHIVELOCATION="$TARGETDIR"
-
-TEMPDIR=$(mktemp -t -d $NAME.XXXXXXXXXX) || carp "Couldn't make temp dir"
-
-###########################################################################
-
-progress "I: Locating source $SRCPATH"
-
-SRCARCHIVE=$(basename "$SRCPATH")
-if [ $(expr substr "$SRCPATH" 1 7) = "http://" -o \
- $(expr substr "$SRCPATH" 1 6) = "ftp://" ]
-then
- UPSTREAMURL="$SRCPATH"
- wget "$UPSTREAMURL" -O "$TEMPDIR/$SRCARCHIVE"
-else
- cp "$SRCPATH" "$TEMPDIR"
-fi
-
-cd $TEMPDIR || carp "Couldn't cd to temp dir $TEMPDIR"
-
-###########################################################################
-MD5="md5sum --binary"
-
-logmsg "
-Repackaging of original source for $PACKAGE
----------------------------------------------------------------------
-
-$PACKAGE version $VERSION.
-
-Downloaded file: $SRCARCHIVE
-From: $UPSTREAM
-Path: $SRCPATH"
-
-logcmd $MD5 $SRCARCHIVE
-
-progress "I: Directory: $DIR
-I: Package name: $PACKAGE
-I: Version: $VERSION"
-
-logmsg "
-The following commands were used to repackage the original source (the
-'touch' commands ensure that the md5sum of the archives stays the same):"
-
-# get the source
-progress "I: Uncompressing source"
-if $WRAPDIR
-then
- logcmd mkdir $DIR
- $UNARCHIVE $DIR $SRCARCHIVE
-else
- INNERDIR=$(testarchive $UNARCHIVE $SRCARCHIVE)
- $UNARCHIVE . $SRCARCHIVE
- logcmd mv $INNERDIR $DIR
-fi
-# set a consistent time for the top directory
-logcmd touch -t $TOUCHTIME $DIR
-# repackage the archive
-progress "I: Creating 'orig' tar archive"
-
-#echo "$(make_exclude_list)"
-
-logcmd tar cf $ARCHIVEFILE --owner 0 --group 0 --numeric-owner \
- $(make_exclude_list) \
- $DIR
-
-# Also set a consistent time on the tar archive
-logcmd touch -t $TOUCHTIME $ARCHIVEFILE
-#logcmd md5sum $ARCHIVEFILE
-progress "I: Compressing archive"
-logcmd gzip -9 $ARCHIVEFILE
-logcmd md5sum --binary $ARCHIVEFILE.gz
-
-logmsg "
- -- $DEBFULLNAME <$DEBEMAIL> $DATE
----------------------------------------------------------------------
-"
-
-###########################################################################
-
-progress "I: Moving archive $ARCHIVEFILE.gz"
-#mv $ARCHIVEFILE $ARCHIVELOCATION
-touch $ARCHIVEFILE.gz
-mv $ARCHIVEFILE.gz $ARCHIVELOCATION
-
-###########################################################################
-
-if [ $CLEANUP != 0 ]
-then
- progress "I: Cleaning up $TEMPDIR"
- rm -rf $TEMPDIR
-else
- progress "I: Files left in $TEMPDIR for your inspection"
-fi
-
-###########################################################################
diff -Nru jlibeps-0.1+2/debian/repackagerc jlibeps-0.1.ds3/debian/repackagerc
--- jlibeps-0.1+2/debian/repackagerc 2009-04-19 22:01:39.000000000 +0000
+++ jlibeps-0.1.ds3/debian/repackagerc 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-# Settings for repackaging the upstream source code
-# of the jlibeps package
-
-PACKAGE=jlibeps
-UPSTREAM=sourceforge.net
-
-UNARCHIVE=do_unzip
-#RM_LIST="bin,doc"
-#FIND_LIST="*.jar,*.class"
-EXCLUDE_LIST="
-*.class
-*.jar
-bin
-doc
-"
diff -Nru jlibeps-0.1+2/debian/rules jlibeps-0.1.ds3/debian/rules
--- jlibeps-0.1+2/debian/rules 2011-11-06 11:27:10.000000000 +0000
+++ jlibeps-0.1.ds3/debian/rules 2016-08-08 14:14:06.000000000 +0000
@@ -4,15 +4,14 @@
# export DH_VERBOSE=1
# Create versioned jar file; strip off the debian source revision and package revision
-VERSION=$(shell dpkg-parsechangelog | sed -n 's/Version: \([0-9.]*\).*/\1/p')
-
-# If the user has not explicitly set JAVA_HOME, export sensible value
-# to make sure that the correct compiler is used by ant.
-JAVA_HOME ?= /usr/lib/jvm/java-gcj
-export JAVA_HOME
+VERSION=$(shell dpkg-parsechangelog | sed -n 's/Version: \([0-9]*\.[0-9]*\).*/\1/p')
PREFIX=debian/libjlibeps-java
+# Set the locale to make API documentation reproducible
+LC_ALL = C.UTF-8
+export LC_ALL
+
%:
dh $@
@@ -31,14 +30,3 @@
override_dh_link:
dh_link usr/share/java/net.sourceforge.jlibeps-$(VERSION).jar usr/share/java/net.sourceforge.jlibeps.jar
-
-# Be explicit given that there is plenty of confusion about what this target means
-get-orig-source: get-latest-source
-
-get-latest-source:
- cd $(dir $_).. && \
- uscan=$$(uscan --report --dehs --upstream-version 0) && \
- uver=$$(echo "$$uscan" | sed -n 's,\(.*\),\1,p') && \
- uurl=$$(echo "$$uscan" | sed -n 's,\(.*\),\1,p') && \
- echo debian/repackage --upstream-version "$${uver}" "$${uurl}" $(CURDIR) &&\
- sh debian/repackage --upstream-version "$${uver}" "$${uurl}" $(CURDIR)
diff -Nru jlibeps-0.1+2/debian/watch jlibeps-0.1.ds3/debian/watch
--- jlibeps-0.1+2/debian/watch 2011-11-06 11:03:08.000000000 +0000
+++ jlibeps-0.1.ds3/debian/watch 2016-08-08 14:14:06.000000000 +0000
@@ -1,6 +1,4 @@
version=3
-opts="dversionmangle=s/\+\d+$//" \
-http://sf.net/jlibeps/jlibeps-(.*)-src\.zip \
- debian \
- debian/repackage
+opts="dversionmangle=s/[.+](\d+|ds[0-9])$//,repacksuffix=.ds3" \
+http://sf.net/jlibeps/jlibeps-(.*)-src\.zip