Author: ebourg-guest Date: 2014-09-29 23:05:56 +0000 (Mon, 29 Sep 2014) New Revision: 18494
Added: tags/libjtharness-java/4.4.1-1/ tags/libjtharness-java/4.4.1-1/debian/changelog tags/libjtharness-java/4.4.1-1/debian/compat tags/libjtharness-java/4.4.1-1/debian/control tags/libjtharness-java/4.4.1-1/debian/copyright tags/libjtharness-java/4.4.1-1/debian/orig-tar.sh tags/libjtharness-java/4.4.1-1/debian/patches/02_dependencies.patch tags/libjtharness-java/4.4.1-1/debian/rules tags/libjtharness-java/4.4.1-1/debian/watch Removed: tags/libjtharness-java/4.4.1-1/debian/changelog tags/libjtharness-java/4.4.1-1/debian/compat tags/libjtharness-java/4.4.1-1/debian/control tags/libjtharness-java/4.4.1-1/debian/copyright tags/libjtharness-java/4.4.1-1/debian/orig-tar.sh tags/libjtharness-java/4.4.1-1/debian/patches/02_dependencies.patch tags/libjtharness-java/4.4.1-1/debian/rules tags/libjtharness-java/4.4.1-1/debian/watch Log: [svn-buildpackage] Tagging jtharness 4.4.1-1 Deleted: tags/libjtharness-java/4.4.1-1/debian/changelog =================================================================== --- trunk/libjtharness-java/debian/changelog 2014-09-29 18:42:10 UTC (rev 18479) +++ tags/libjtharness-java/4.4.1-1/debian/changelog 2014-09-29 23:05:56 UTC (rev 18494) @@ -1,14 +0,0 @@ -jtharness (4.4.0-MR1-Rel-b19-1) unstable; urgency=low - - * New upstream relase. - * debian/control: Add Vcs-Svn field. - * debian/patches/01_imports.patch: Update patch. - * debian/patches/02_dependencies.patch: Update patch. - - -- Guillaume Mazoyer <[email protected]> Mon, 01 Aug 2011 17:45:44 +0200 - -jtharness (4.3.0-MR1-Rel-b23-1) unstable; urgency=low - - * Initial release (Closes: #628857). - - -- Guillaume Mazoyer <[email protected]> Tue, 31 May 2011 12:56:01 -0500 Copied: tags/libjtharness-java/4.4.1-1/debian/changelog (from rev 18493, trunk/libjtharness-java/debian/changelog) =================================================================== --- tags/libjtharness-java/4.4.1-1/debian/changelog (rev 0) +++ tags/libjtharness-java/4.4.1-1/debian/changelog 2014-09-29 23:05:56 UTC (rev 18494) @@ -0,0 +1,33 @@ +jtharness (4.4.1-1) unstable; urgency=medium + + * Team upload. + * New upstream relase + - Refreshed the patches + * No longer compress the examples in the -doc package + * Replaced the jars with symlinks when possible in the -doc package + * debian/control: + - Depend on libservlet3.1-java instead of libservlet3.0-java + - Fixed the Vcs-Svn URL and added Vcs-Browser + - Standards-Version updated to 3.9.6 (no changes) + - Improved the package description + * Switch to debhelper level 9 + * Use XZ compression for the upstream tarball + * debian/copyright: Updated the Format URI + * debian/rules: Improved the clean target + + -- Emmanuel Bourg <[email protected]> Mon, 29 Sep 2014 21:50:56 +0200 + +jtharness (4.4.0-MR1-Rel-b19-1) unstable; urgency=low + + * New upstream relase. + * debian/control: Add Vcs-Svn field. + * debian/patches/01_imports.patch: Update patch. + * debian/patches/02_dependencies.patch: Update patch. + + -- Guillaume Mazoyer <[email protected]> Mon, 01 Aug 2011 17:45:44 +0200 + +jtharness (4.3.0-MR1-Rel-b23-1) unstable; urgency=low + + * Initial release (Closes: #628857). + + -- Guillaume Mazoyer <[email protected]> Tue, 31 May 2011 12:56:01 -0500 Deleted: tags/libjtharness-java/4.4.1-1/debian/compat =================================================================== --- trunk/libjtharness-java/debian/compat 2014-09-29 18:42:10 UTC (rev 18479) +++ tags/libjtharness-java/4.4.1-1/debian/compat 2014-09-29 23:05:56 UTC (rev 18494) @@ -1 +0,0 @@ -7 Copied: tags/libjtharness-java/4.4.1-1/debian/compat (from rev 18482, trunk/libjtharness-java/debian/compat) =================================================================== --- tags/libjtharness-java/4.4.1-1/debian/compat (rev 0) +++ tags/libjtharness-java/4.4.1-1/debian/compat 2014-09-29 23:05:56 UTC (rev 18494) @@ -0,0 +1 @@ +9 Deleted: tags/libjtharness-java/4.4.1-1/debian/control =================================================================== --- trunk/libjtharness-java/debian/control 2014-09-29 18:42:10 UTC (rev 18479) +++ tags/libjtharness-java/4.4.1-1/debian/control 2014-09-29 23:05:56 UTC (rev 18494) @@ -1,44 +0,0 @@ -Source: jtharness -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Guillaume Mazoyer <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), javahelper -Build-Depends-Indep: default-jdk, - default-jdk-doc, - ant, - junit4, - javahelp2, - librxtx-java, - libasm3-java, - libservlet3.0-java -Standards-Version: 3.9.2 -Homepage: http://jtharness.java.net/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjtharness/ - -Package: libjtharness-java -Architecture: all -Depends: junit4, - librxtx-java, - libasm3-java, - libservlet3.0-java, - ${java:Depends}, - ${misc:Depends} -Description: jtharness - The JT harness is a general purpose, fully-featured, flexible, and configurable - test harness very well suited for most types of unit testing. Originally - developed as a test harness to run TCK test suites, it has since evolved into a - general purpose test platform. - -Package: libjtharness-java-doc -Section: doc -Architecture: all -Depends: ${java:Depends}, ${misc:Depends} -Suggests: libjtharness-java -Description: jtharness (documentation) - This is the javadoc for the libjtharness-java package. - . - The JT harness is a general purpose, fully-featured, flexible, and configurable - test harness very well suited for most types of unit testing. Originally - developed as a test harness to run TCK test suites, it has since evolved into a - general purpose test platform. Copied: tags/libjtharness-java/4.4.1-1/debian/control (from rev 18492, trunk/libjtharness-java/debian/control) =================================================================== --- tags/libjtharness-java/4.4.1-1/debian/control (rev 0) +++ tags/libjtharness-java/4.4.1-1/debian/control 2014-09-29 23:05:56 UTC (rev 18494) @@ -0,0 +1,44 @@ +Source: jtharness +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Guillaume Mazoyer <[email protected]> +Build-Depends: debhelper (>= 9), javahelper +Build-Depends-Indep: default-jdk, + default-jdk-doc, + ant, + junit4, + javahelp2, + librxtx-java, + libasm3-java, + libservlet3.1-java +Standards-Version: 3.9.6 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjtharness-java +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjtharness-java +Homepage: http://jtharness.java.net + +Package: libjtharness-java +Architecture: all +Depends: junit4, + librxtx-java, + libasm3-java, + libservlet3.1-java, + ${java:Depends}, + ${misc:Depends} +Description: General purpose test harness for Java + The JT harness is a general purpose, fully-featured, flexible, and configurable + test harness very well suited for most types of unit testing. Originally + developed as a test harness to run TCK test suites, it has since evolved into a + general purpose test platform. + +Package: libjtharness-java-doc +Section: doc +Architecture: all +Depends: ${java:Depends}, ${misc:Depends}, libjtharness-java, javahelp2 +Description: JT harness (documentation) + This is the javadoc for the libjtharness-java package. + . + The JT harness is a general purpose, fully-featured, flexible, and configurable + test harness very well suited for most types of unit testing. Originally + developed as a test harness to run TCK test suites, it has since evolved into a + general purpose test platform. Deleted: tags/libjtharness-java/4.4.1-1/debian/copyright =================================================================== --- trunk/libjtharness-java/debian/copyright 2014-09-29 18:42:10 UTC (rev 18479) +++ tags/libjtharness-java/4.4.1-1/debian/copyright 2014-09-29 23:05:56 UTC (rev 18494) @@ -1,72 +0,0 @@ -Format: http://dep.debian.net/deps/dep5 -Upstream-Name: jtharness -Source: http://jtharness.java.net/ - -Files: * -Copyright: Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. -License: - This code is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License version 2 only, as - published by the Free Software Foundation. Oracle designates this - particular file as subject to the "Classpath" exception as provided - by Oracle in the LICENSE file that accompanied this code. - . - This code is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - version 2 for more details (a copy is included in the LICENSE file that - accompanied this code). - . - You should have received a copy of the GNU General Public License version - 2 along with this work; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - . - Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - or visit www.oracle.com if you need additional information or have any - questions. - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. - ' - "CLASSPATH" EXCEPTION TO THE GPL - . - Certain source files distributed by Oracle are subject to - the following clarification and special exception to the GPL, but only where - Oracle has expressly included in the particular source file's header the words - "Oracle designates this particular file as subject to the "Classpath" exception - as provided by Oracle in the LICENSE file that accompanied this code." - . - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - . - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. - -Files: debian/* -Copyright: 2011 Guillaume Mazoyer <[email protected]> -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/> - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". Copied: tags/libjtharness-java/4.4.1-1/debian/copyright (from rev 18484, trunk/libjtharness-java/debian/copyright) =================================================================== --- tags/libjtharness-java/4.4.1-1/debian/copyright (rev 0) +++ tags/libjtharness-java/4.4.1-1/debian/copyright 2014-09-29 23:05:56 UTC (rev 18494) @@ -0,0 +1,72 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: jtharness +Source: http://jtharness.java.net + +Files: * +Copyright: 1996, 2010, Oracle and/or its affiliates. All rights reserved. +License: GPL-2 with Classpath exception + This code is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License version 2 only, as + published by the Free Software Foundation. Oracle designates this + particular file as subject to the "Classpath" exception as provided + by Oracle in the LICENSE file that accompanied this code. + . + This code is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + version 2 for more details (a copy is included in the LICENSE file that + accompanied this code). + . + You should have received a copy of the GNU General Public License version + 2 along with this work; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + . + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + or visit www.oracle.com if you need additional information or have any + questions. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + ' + "CLASSPATH" EXCEPTION TO THE GPL + . + Certain source files distributed by Oracle are subject to + the following clarification and special exception to the GPL, but only where + Oracle has expressly included in the particular source file's header the words + "Oracle designates this particular file as subject to the "Classpath" exception + as provided by Oracle in the LICENSE file that accompanied this code." + . + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + . + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. + +Files: debian/* +Copyright: 2011 Guillaume Mazoyer <[email protected]> +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". Deleted: tags/libjtharness-java/4.4.1-1/debian/orig-tar.sh =================================================================== --- trunk/libjtharness-java/debian/orig-tar.sh 2014-09-29 18:42:10 UTC (rev 18479) +++ tags/libjtharness-java/4.4.1-1/debian/orig-tar.sh 2014-09-29 23:05:56 UTC (rev 18494) @@ -1,21 +0,0 @@ -#!/bin/sh -SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p') -VERSION=$(dpkg-parsechangelog | sed -ne 's,^Version: \(.*\)-.*,\1,p') -echo $VERSION -UNDERSCOREVERSION=$( echo $VERSION | sed 's/\./_/g') -FILE=$3 -TAR=../${SOURCE}_${VERSION}.orig.tar.bz2 -DIR=$SOURCE-$VERSION - -svn co https://svn.java.net/svn/jtharness~svn/tags/$SOURCE-$UNDERSCOREVERSION/code/ $DIR -tar -jcf $TAR --exclude '*.svn*' $DIR -rm -rf $DIR $FILE - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" -fi - -exit 0 \ No newline at end of file Copied: tags/libjtharness-java/4.4.1-1/debian/orig-tar.sh (from rev 18488, trunk/libjtharness-java/debian/orig-tar.sh) =================================================================== --- tags/libjtharness-java/4.4.1-1/debian/orig-tar.sh (rev 0) +++ tags/libjtharness-java/4.4.1-1/debian/orig-tar.sh 2014-09-29 23:05:56 UTC (rev 18494) @@ -0,0 +1,22 @@ +#!/bin/sh +SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p') +VERSION=$2 +UNDERSCOREVERSION=$( echo $VERSION | sed 's/\./_/g') +TAR=../${SOURCE}_${VERSION}.orig.tar.xz +DIR=$SOURCE-$VERSION + +TAG=$( svn list https://svn.java.net/svn/jtharness~svn/tags | grep $UNDERSCOREVERSION ) +echo "Tag: $TAG" + +svn export https://svn.java.net/svn/jtharness~svn/tags/$TAG/code/ $DIR +XZ_OPT=--best tar -Jcf $TAR $DIR +rm -rf $DIR $3 + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 Deleted: tags/libjtharness-java/4.4.1-1/debian/patches/02_dependencies.patch =================================================================== --- trunk/libjtharness-java/debian/patches/02_dependencies.patch 2014-09-29 18:42:10 UTC (rev 18479) +++ tags/libjtharness-java/4.4.1-1/debian/patches/02_dependencies.patch 2014-09-29 23:05:56 UTC (rev 18494) @@ -1,39 +0,0 @@ -## Description: Locate JAR on the system. -## Origin/Author: Guillaume Mazoyer -## Bug: bug URL -Index: jtharness-4.4.0-MR1-Rel-b19/build/local.properties -=================================================================== ---- jtharness-4.4.0-MR1-Rel-b19.orig/build/local.properties 2011-08-01 18:04:57.592727744 +0200 -+++ jtharness-4.4.0-MR1-Rel-b19/build/local.properties 2011-08-01 18:04:56.056720129 +0200 -@@ -26,24 +26,24 @@ - # - - #Please specify location of jhall.jar here - for compilation --jhalljar = jhall.jar -+jhalljar = /usr/share/java/jhall.jar - - # needed only at runtime --jhjar = jh.jar -+jhjar = /usr/share/java/jh.jar - - # location of jar with with implementation of java serial communications API --jcommjar = comm.jar -+jcommjar = /usr/share/java/RXTXcomm.jar - - # location of jar with servlet API implementation --servletjar = servlet-api.jar -+servletjar = /usr/share/java/tomcat-servlet-api-3.0.jar - - # bytecode library (BCEL or ASM) - # these are not interchangable --bytecodelib = asm-3.1.jar:asm-commons-3.1.jar -+bytecodelib = /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar - - # JUnit Library - Version 4 currently used to compile 3 and 4 support --junitlib = junit-4.4.jar -+junitlib = /usr/share/java/junit4.jar - - # Please specify location where the build distribution (output) will be created --BUILD_DIR = ../JTHarness-build -+BUILD_DIR = ./jar-build - Copied: tags/libjtharness-java/4.4.1-1/debian/patches/02_dependencies.patch (from rev 18489, trunk/libjtharness-java/debian/patches/02_dependencies.patch) =================================================================== --- tags/libjtharness-java/4.4.1-1/debian/patches/02_dependencies.patch (rev 0) +++ tags/libjtharness-java/4.4.1-1/debian/patches/02_dependencies.patch 2014-09-29 23:05:56 UTC (rev 18494) @@ -0,0 +1,37 @@ +## Description: Locate JAR on the system. +## Origin/Author: Guillaume Mazoyer +## Bug: bug URL +--- a/build/local.properties ++++ b/build/local.properties +@@ -25,24 +25,24 @@ + # questions. + + #Please specify location of jhall.jar here - for compilation +-jhalljar = jhall.jar ++jhalljar = /usr/share/java/jhall.jar + + # needed only at runtime +-jhjar = jh.jar ++jhjar = /usr/share/java/jh.jar + + # location of jar with with implementation of java serial communications API +-jcommjar = comm.jar ++jcommjar = /usr/share/java/RXTXcomm.jar + + # location of jar with servlet API implementation +-servletjar = servlet-api.jar ++servletjar = /usr/share/java/servlet-api-3.1.jar + + # bytecode library (BCEL or ASM) + # these are not interchangable +-bytecodelib = asm-3.2.jar:asm-commons-3.2.jar ++bytecodelib = /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar + + # JUnit Library - Version 4 currently used to compile 3 and 4 support +-junitlib = junit.jar ++junitlib = /usr/share/java/junit4.jar + + # Please specify location where the build distribution (output) will be created +-BUILD_DIR = ../JTHarness-build ++BUILD_DIR = ./jar-build + Deleted: tags/libjtharness-java/4.4.1-1/debian/rules =================================================================== --- trunk/libjtharness-java/debian/rules 2014-09-29 18:42:10 UTC (rev 18479) +++ tags/libjtharness-java/4.4.1-1/debian/rules 2014-09-29 23:05:56 UTC (rev 18494) @@ -1,9 +0,0 @@ -#!/usr/bin/make -f - -JAVA_HOME = /usr/lib/jvm/default-java - -override_dh_auto_build: - ant -f build/build.xml - -%: - dh $@ --with javahelper Copied: tags/libjtharness-java/4.4.1-1/debian/rules (from rev 18492, trunk/libjtharness-java/debian/rules) =================================================================== --- tags/libjtharness-java/4.4.1-1/debian/rules (rev 0) +++ tags/libjtharness-java/4.4.1-1/debian/rules 2014-09-29 23:05:56 UTC (rev 18494) @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +JAVA_HOME = /usr/lib/jvm/default-java + +%: + dh $@ --with javahelper + +override_dh_auto_build: + ant -f build/build.xml + + # Remove jh.jar and javatest.jar in the tutorial... + rm jar-build/binaries/examples/tutorial/demots/lib/jh.jar + rm jar-build/binaries/examples/tutorial/demots/lib/javatest.jar + +override_dh_auto_install: + dh_auto_install + + # ...and replace them with links + dh_link -plibjtharness-java-doc /usr/share/java/jh.jar usr/share/doc/libjtharness-java/examples/tutorial/demots/lib/jh.jar + dh_link -plibjtharness-java-doc /usr/share/java/javatest.jar usr/share/doc/libjtharness-java/examples/tutorial/demots/lib/javatest.jar + +override_dh_compress: + dh_compress -X.java + +override_dh_auto_clean: + rm -Rf jar-build + dh_auto_clean Deleted: tags/libjtharness-java/4.4.1-1/debian/watch =================================================================== --- trunk/libjtharness-java/debian/watch 2014-09-29 18:42:10 UTC (rev 18479) +++ tags/libjtharness-java/4.4.1-1/debian/watch 2014-09-29 23:05:56 UTC (rev 18494) @@ -1,4 +0,0 @@ -version=3 -opts=uversionmangle=s/_([^-]+)/.$1.0/;s/bin/Rel/ \ -http://download.java.net/jtharness/download.html .*/jtharness-(.*)-.*\.zip \ -debian debian/orig-tar.sh Copied: tags/libjtharness-java/4.4.1-1/debian/watch (from rev 18483, trunk/libjtharness-java/debian/watch) =================================================================== --- tags/libjtharness-java/4.4.1-1/debian/watch (rev 0) +++ tags/libjtharness-java/4.4.1-1/debian/watch 2014-09-29 23:05:56 UTC (rev 18494) @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/_([^-]+)/.$1.0/;s/bin/Rel/ \ +http://download.java.net/jtharness/download.html .*/jtharness/([\d\.]+)/Rel/.*\.zip debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
