Andreas Tille pushed to branch master at Debian Java Maintainers / jas-plotter
Commits: be24842f by Andreas Tille at 2025-01-28T16:54:09+01:00 Fix watch file - - - - - 194b1ff0 by Andreas Tille at 2025-01-28T16:55:35+01:00 Files-Excluded + drop now redundant README.source - - - - - 5c2e331f by Andreas Tille at 2025-01-28T16:58:11+01:00 Philipp Huebner remove himself from uploaders - - - - - 5 changed files: - − debian/README.source - debian/changelog - debian/copyright - debian/orig-tar.sh - debian/watch Changes: ===================================== debian/README.source deleted ===================================== @@ -1,17 +0,0 @@ -Information about jas-plotter ------------------------------- - -REPACKAGING - -The original tarball for this package has been modified, because it -included some code with problematic copyright status. The following -files and directories were deleted: - * src/main/java/tablelayout (not DFSG compliant); - * src/main/java/jas/util/layout/PnutsLayout.java (SPL license, not - GPL compatible and hardly DFSG compliant); - * src/main/java/jas/util/xml/XMLCharacterProperties.java (Apache 1.1 - license, not GPL compatible). - -The removed code wasn't needed, or it was simply replaceable. See -quilt patches for replacing code. - ===================================== debian/changelog ===================================== @@ -1,3 +1,16 @@ +jas-plotter (2.2.6+dfsg1-5) UNRELEASED; urgency=medium + + * Team upload. + + [ Philipp Huebner ] + * Remove myself from uploaders + + [ Andreas Tille ] + * Fix watch file + * d/copyright: Files-Excluded + drop now redundant README.source + + -- Andreas Tille <[email protected]> Tue, 28 Jan 2025 15:28:36 +0100 + jas-plotter (2.2.6+dfsg1-4) unstable; urgency=medium [ tony mancill ] ===================================== debian/copyright ===================================== @@ -2,6 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: JAS(2) Plotter Upstream-Contact: The FreeHEP team <[email protected]> Source: http://java.freehep.org/jas-plotter +Files-Removed: src/main/java/tablelayout + src/main/java/jas/util/layout/PnutsLayout.java + src/main/java/jas/util/xml/XMLCharacterProperties.java Files: * Copyright: 2000-2007, CERN, Geneva, Switzerland ===================================== debian/orig-tar.sh ===================================== @@ -1,9 +1,11 @@ #!/bin/sh -e +set -x + VERSION=$2 DOWNLOADED_FILE=$3 PACKAGE=$(dpkg-parsechangelog | sed -n 's/^Source: //p') -TAR=../${PACKAGE}_${VERSION}+dfsg1.orig.tar.gz +TAR=../${PACKAGE}_${VERSION}+dfsg.orig.tar.gz DIR=${PACKAGE}-${VERSION} svn export svn://svn.freehep.org/svn/freehep/tags/$PACKAGE-$VERSION $DIR ===================================== debian/watch ===================================== @@ -1,4 +1,5 @@ -version=3 -opts="uversionmangle=s/^.*-SNAPSHOT/~$1/,dversionmangle=s/\+dfsg[0-9]*//" \ +version=4 + +opts="uversionmangle=s/^.*-SNAPSHOT/~$1/,repacksuffix=+dfsg,dversionmangle=auto" \ http://java.freehep.org/maven2/org/freehep/jas-plotter/ \ - (\d.*)/ debian debian/orig-tar.sh + ([1-9][\d.]+)/ debian debian/orig-tar.sh View it on GitLab: https://salsa.debian.org/java-team/jas-plotter/-/compare/15522b06cf0f4be223058f32241f374ef0d15e8e...5c2e331ffd51e81fc8f2ef4eb006714bccfca50e -- View it on GitLab: https://salsa.debian.org/java-team/jas-plotter/-/compare/15522b06cf0f4be223058f32241f374ef0d15e8e...5c2e331ffd51e81fc8f2ef4eb006714bccfca50e You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
