diff -Nru java-package-0.50ubuntu1/debian/changelog java-package-0.50+nmu1ubuntu1/debian/changelog --- java-package-0.50ubuntu1/debian/changelog 2012-09-12 14:09:14.000000000 +0530 +++ java-package-0.50+nmu1ubuntu1/debian/changelog 2012-10-29 15:48:05.000000000 +0530 @@ -1,3 +1,17 @@ +java-package (0.50+nmu1ubuntu1) raring; urgency=low + + * Merge from Debian unstable (LP: #1072651). Remaining changes: + - Add support for Oracle Java 7 JDK for ARM. + + -- Vibhav Pant Mon, 29 Oct 2012 15:44:51 +0530 + +java-package (0.50+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Drop installation debconf note. Closes: #685082 + + -- David Prévot Thu, 06 Sep 2012 18:38:03 -0400 + java-package (0.50ubuntu1) quantal; urgency=low * Add support for Oracle Java 7 JDK for ARM. @@ -447,3 +461,4 @@ Local variables: mode: debian-changelog End: + diff -Nru java-package-0.50ubuntu1/debian/control java-package-0.50+nmu1ubuntu1/debian/control --- java-package-0.50ubuntu1/debian/control 2012-09-07 17:52:20.000000000 +0530 +++ java-package-0.50+nmu1ubuntu1/debian/control 2012-09-12 15:08:42.000000000 +0530 @@ -11,8 +11,7 @@ Package: java-package Architecture: all -Depends: ${misc:Depends}, debhelper, fakeroot, unzip, libx11-6, libasound2, - debconf (>= 0.5) | debconf-2.0 +Depends: ${misc:Depends}, debhelper, fakeroot, unzip, libx11-6, libasound2 Recommends: dpkg-dev, gcc Suggests: openjdk-6-jre, openjdk-7-jre Description: Utility for creating Java Debian packages diff -Nru java-package-0.50ubuntu1/debian/postinst java-package-0.50+nmu1ubuntu1/debian/postinst --- java-package-0.50ubuntu1/debian/postinst 2012-09-07 17:09:33.000000000 +0530 +++ java-package-0.50+nmu1ubuntu1/debian/postinst 1970-01-01 05:30:00.000000000 +0530 @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ] -then - . /usr/share/debconf/confmodule - db_input high java-package/postinst-note || true - db_go -fi - -#DEBHELPER# - -exit 0 diff -Nru java-package-0.50ubuntu1/debian/prerm java-package-0.50+nmu1ubuntu1/debian/prerm --- java-package-0.50ubuntu1/debian/prerm 2012-09-07 17:09:33.000000000 +0530 +++ java-package-0.50+nmu1ubuntu1/debian/prerm 1970-01-01 05:30:00.000000000 +0530 @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "purge" ] -then - . /usr/share/debconf/confmodule - db_purge -fi - -#DEBHELPER# - -exit 0 diff -Nru java-package-0.50ubuntu1/debian/rules java-package-0.50+nmu1ubuntu1/debian/rules --- java-package-0.50ubuntu1/debian/rules 2012-09-07 17:09:33.000000000 +0530 +++ java-package-0.50+nmu1ubuntu1/debian/rules 2012-09-12 15:08:42.000000000 +0530 @@ -28,7 +28,6 @@ dh_testroot dh_clean -k dh_installdirs - dh_installdebconf install -m 755 make-jpkg.out $(B)/usr/bin/make-jpkg cp lib/*.sh $(B)/usr/share/java-package/ find $(B) -type d -name .svn | xargs -r rm -r diff -Nru java-package-0.50ubuntu1/debian/templates java-package-0.50+nmu1ubuntu1/debian/templates --- java-package-0.50ubuntu1/debian/templates 2012-09-07 17:09:33.000000000 +0530 +++ java-package-0.50+nmu1ubuntu1/debian/templates 1970-01-01 05:30:00.000000000 +0530 @@ -1,13 +0,0 @@ -Template: java-package/postinst-note -Type: note -Description: Java-package is now installed - You can invoke make-jpkg to build Java Debian packages - To use it: - 1) download one of the java binary archive listed below - 2) invoke make-jpkg to build a Debian package from the downloaded archive- - 3) install the generated package using dpkg - . - Supported Java binary distributions currently include: - * Oracle : - - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - - The J2SE API Javadoc, version 6 (update >= 10), 7