diff -Nru testng-5.11+dfsg/debian/changelog testng-5.11+dfsg/debian/changelog --- testng-5.11+dfsg/debian/changelog 2011-09-20 11:50:43.000000000 +0000 +++ testng-5.11+dfsg/debian/changelog 2011-12-19 23:41:14.000000000 +0000 @@ -1,3 +1,13 @@ +testng (5.11+dfsg-3) unstable; urgency=low + + * Sync from Ubuntu (Closes: #605369, #639046) + * Standards-Version updated to version 3.9.2 + * Package moved under the pkg-java team (thanks Marcus) + * Add myself as maintainer + * Fix a bad detection of the JVM path (LP: #888128) + + -- Sylvestre Ledru Tue, 20 Dec 2011 00:39:49 +0100 + testng (5.11+dfsg-2ubuntu2) oneiric; urgency=low * Fix FTBFS (LP: #829508): diff -Nru testng-5.11+dfsg/debian/control testng-5.11+dfsg/debian/control --- testng-5.11+dfsg/debian/control 2011-09-20 11:50:43.000000000 +0000 +++ testng-5.11+dfsg/debian/control 2011-12-19 23:41:14.000000000 +0000 @@ -1,20 +1,20 @@ Source: testng Section: java Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Marcus Better +Maintainer: Debian Java Maintainers +Uploaders: Marcus Better , Sylvestre Ledru Build-Depends: debhelper (>= 7.3.5), ant Build-Depends-Indep: default-jdk, ant-optional, junit, bsh, libqdox-java (>= 1.9), libbackport-util-concurrent-java, maven-repo-helper -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Homepage: http://testng.org -Vcs-Git: git://git.debian.org/git/collab-maint/testng.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/testng.git +Vcs-Git: git://git.debian.org/git/pkg-java/testng.git +Vcs-Browser: http://git.debian.org/?p=pkg-java/testng.git Package: testng Architecture: all Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, bsh, libqdox-java (>= 1.9) Recommends: libbackport-util-concurrent-java -Suggests: java-virtual-machine, ant, ant-optional, testng-doc +Suggests: ant, ant-optional, testng-doc Description: testing framework for Java TestNG is a testing framework inspired by JUnit and NUnit but introducing some new functionalities that make it more powerful and diff -Nru testng-5.11+dfsg/debian/patches/series testng-5.11+dfsg/debian/patches/series --- testng-5.11+dfsg/debian/patches/series 2011-09-20 11:50:43.000000000 +0000 +++ testng-5.11+dfsg/debian/patches/series 2011-12-19 23:41:14.000000000 +0000 @@ -2,8 +2,8 @@ debian/disable-broken-threading-tests.diff -p1 debian/exclude-3rdparty-jars.diff -p1 debian/stop-on-test-failure.diff -p1 +debian/junitconvertor-test-fix.diff -p1 features/build-without-dtddoc.diff -p1 features/qdox-1.9.diff -p1 features/scope-qdox-bsh.diff -p1 features/threadsafe-collections-in-tests.diff -p1 -debian/junitconvertor-test-fix.diff diff -Nru testng-5.11+dfsg/debian/rules testng-5.11+dfsg/debian/rules --- testng-5.11+dfsg/debian/rules 2010-11-12 09:04:36.000000000 +0000 +++ testng-5.11+dfsg/debian/rules 2011-12-19 23:41:14.000000000 +0000 @@ -5,11 +5,8 @@ DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -ifeq ($(DEB_BUILD_ARCH),s390) - JAVA_HOME := /usr/lib/jvm/java-6-cacao -else - JAVA_HOME := /usr/lib/jvm/java-6-openjdk -endif +JAVA_HOME := /usr/lib/jvm/default-java/ + DEB_JARS := ant ant-launcher ant-junit ant-trax ant-nodeps com-sun-javadoc