Author: sylvestre Date: 2011-05-03 15:55:05 +0000 (Tue, 03 May 2011) New Revision: 13629
Modified: trunk/sun-java6/debian/JB-bin.overrides.in trunk/sun-java6/debian/changelog trunk/sun-java6/debian/control trunk/sun-java6/debian/control.in trunk/sun-java6/debian/rules Log: sun-java6 (6.25-1) unstable; urgency=low * New upstream release * Standards-Version updated to version 3.9.2 * Suggests default-jdk-doc instead of openjdk-6-doc * Update of the lintian overrides about embedded-library Modified: trunk/sun-java6/debian/JB-bin.overrides.in =================================================================== --- trunk/sun-java6/debian/JB-bin.overrides.in 2011-05-03 14:29:09 UTC (rev 13628) +++ trunk/sun-java6/debian/JB-bin.overrides.in 2011-05-03 15:55:05 UTC (rev 13629) @@ -6,5 +6,9 @@ @basename@-bin: image-file-in-usr-lib @basename@-bin: package-contains-empty-directory @basename@-bin: too-long-extended-description-in-templates -@basename@-bin: embedded-zlib -@basename@-bin: embedded-libjpeg +@basename@-bin: embedded-library @basedir@/jre/bin/unpack200: zlib +@basename@-bin: embedded-library @basedir@/jre/lib/@arch@/jli/libjli.so: zlib +@basename@-bin: embedded-library @basedir@/jre/lib/@arch@/libjpeg.so: libjpeg +@basename@-bin: embedded-library @basedir@/jre/lib/@arch@/libsplashscreen.so: zlib +@basename@-bin: embedded-library @basedir@/jre/lib/@arch@/libsplashscreen.so: libjpeg +@basename@-bin: embedded-library @basedir@/jre/lib/@arch@/libzip.so: zlib Modified: trunk/sun-java6/debian/changelog =================================================================== --- trunk/sun-java6/debian/changelog 2011-05-03 14:29:09 UTC (rev 13628) +++ trunk/sun-java6/debian/changelog 2011-05-03 15:55:05 UTC (rev 13629) @@ -1,3 +1,12 @@ +sun-java6 (6.25-1) unstable; urgency=low + + * New upstream release + * Standards-Version updated to version 3.9.2 + * Suggests default-jdk-doc instead of openjdk-6-doc + * Update of the lintian overrides about embedded-library + + -- Sylvestre Ledru <[email protected]> Tue, 03 May 2011 15:54:53 +0200 + sun-java6 (6.24-2) unstable; urgency=low * Remove Build-Depends: libxp6. (Closes: #623657) Modified: trunk/sun-java6/debian/control =================================================================== --- trunk/sun-java6/debian/control 2011-05-03 14:29:09 UTC (rev 13628) +++ trunk/sun-java6/debian/control 2011-05-03 15:55:05 UTC (rev 13629) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Sylvestre Ledru <[email protected]>, Torsten Werner <[email protected]> Build-Depends: debhelper (>= 5.0.51~), lsb-release, po-debconf, defoma, unzip, bzip2, patch, libasound2, unixodbc, libx11-6, libxext6, libxi6, libxt6, libxtst6, lib32asound2 [amd64], ia32-libs [amd64 ia64] -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/sun-java6 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/sun-java6 XS-Autobuild: yes @@ -61,7 +61,7 @@ Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a Xb-Npp-Name: The Java(TM) Plug-in, Java SE 6 Xb-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;version=1.5, application/x-java-applet;version=1.6, application/x-java-applet;jpi-version=1.6.0_07, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;version=1.5, application/x-java-bean;version=1.6, application/x-java-bean;jpi-version=1.6.0_07 -Description: The Java(TM) Plug-in, Java SE 6 +Description: Java(TM) Plug-in, Java SE 6 Java Plug-in enables applets written to the Java Platform 6 specification to be run in Mozilla and other web browsers. Java Plug-in comes with the Java Runtime Environment (JRE). @@ -90,7 +90,7 @@ Section: non-free/web Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, ia32-sun-java6-bin (>= ${source:Version}), firefox | firefox-2 | iceweasel | mozilla-firefox | iceape-browser | mozilla-browser | epiphany-gecko | epiphany-webkit | epiphany-browser | galeon | midbrowser | moblin-web-browser | xulrunner | xulrunner-1.9 | konqueror | chromium-browser | midori | google-chrome -Description: The Java(TM) Plug-in, Java SE 6 (32-bit) +Description: Java(TM) Plug-in, Java SE 6 (32-bit) Java Plug-in enables applets written to the Java Platform 6 specification to be run in Mozilla and other web browsers. Java Plug-in comes with the Java Runtime Environment (JRE). @@ -112,7 +112,7 @@ Architecture: amd64 i386 lpia Pre-Depends: debconf (>= 0.5) | debconf-2.0 Depends: sun-java6-bin (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: sun-java6-demo, openjdk-6-doc, sun-java6-source +Suggests: sun-java6-demo, default-jdk-doc, sun-java6-source Provides: java-compiler, java2-compiler, java-sdk, java2-sdk, java5-sdk, java6-sdk Description: Sun Java(TM) Development Kit (JDK) 6 The JDK(TM) is a development environment for building applications, @@ -130,7 +130,7 @@ Depends: sun-java6-jre (>= ${source:Version}), sun-java6-jdk (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Replaces: sun-java6-jdk Enhances: sun-java6-jdk -Suggests: openjdk-6-doc +Suggests: default-jdk-doc Description: Sun Java(TM) Development Kit (JDK) 6 demos and examples The JDK(TM) is a development environment for building applications, applets, and components using the Java programming language. Modified: trunk/sun-java6/debian/control.in =================================================================== --- trunk/sun-java6/debian/control.in 2011-05-03 14:29:09 UTC (rev 13628) +++ trunk/sun-java6/debian/control.in 2011-05-03 15:55:05 UTC (rev 13629) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Sylvestre Ledru <[email protected]>, Torsten Werner <[email protected]> Build-Depends: debhelper (>= 5.0.51~), lsb-release, po-debconf, defoma, unzip, bzip2, patch, libasound2, unixodbc, libx11-6, libxext6, libxi6, libxt6, libxtst6, lib32asound2 [amd64], ia32-libs [amd64 ia64] -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/sun-java6 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/sun-java6 XS-Autobuild: yes @@ -61,7 +61,7 @@ Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a Xb-Npp-Name: The Java(TM) Plug-in, Java SE @RELEASE@ Xb-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;version=1.5, application/x-java-applet;version=1.6, application/x-java-applet;jpi-version=1.6.0_07, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;version=1.5, application/x-java-bean;version=1.6, application/x-java-bean;jpi-version=1.6.0_07 -Description: The Java(TM) Plug-in, Java SE @RELEASE@ +Description: Java(TM) Plug-in, Java SE @RELEASE@ Java Plug-in enables applets written to the Java Platform @RELEASE@ specification to be run in Mozilla and other web browsers. Java Plug-in comes with the Java Runtime Environment (JRE). @@ -90,7 +90,7 @@ Section: non-free/web Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends}, ia32-@basename@-bin (>= @pkg_version@), @browsers@ -Description: The Java(TM) Plug-in, Java SE @RELEASE@ (32-bit) +Description: Java(TM) Plug-in, Java SE @RELEASE@ (32-bit) Java Plug-in enables applets written to the Java Platform @RELEASE@ specification to be run in Mozilla and other web browsers. Java Plug-in comes with the Java Runtime Environment (JRE). @@ -112,7 +112,7 @@ Architecture: amd64 i386 lpia Pre-Depends: debconf (>= 0.5) | debconf-2.0 Depends: @basename@-bin (>= @pkg_version@), ${shlibs:Depends}, ${misc:Depends} -Suggests: @basename@-demo, openjdk-6-doc, @basename@-source +Suggests: @basename@-demo, default-jdk-doc, @basename@-source Provides: java-compiler, java2-compiler, java-sdk, java2-sdk, java5-sdk, java6-sdk Description: @vendor@ Java(TM) Development Kit (JDK) @RELEASE@ The JDK(TM) is a development environment for building applications, @@ -130,7 +130,7 @@ Depends: @basename@-jre (>= @pkg_version@), @basename@-jdk (>= @pkg_version@), ${shlibs:Depends}, ${misc:Depends} Replaces: @basename@-jdk Enhances: @basename@-jdk -Suggests: openjdk-6-doc +Suggests: default-jdk-doc Description: @vendor@ Java(TM) Development Kit (JDK) @RELEASE@ demos and examples The JDK(TM) is a development environment for building applications, applets, and components using the Java programming language. Modified: trunk/sun-java6/debian/rules =================================================================== --- trunk/sun-java6/debian/rules 2011-05-03 14:29:09 UTC (rev 13628) +++ trunk/sun-java6/debian/rules 2011-05-03 15:55:05 UTC (rev 13629) @@ -315,8 +315,8 @@ exit 1; \ fi -diff_ignore = -I 'Wednesday, February 2' \ - -I 'Wed Feb 02' -I '^ *// java GenerateCharacter' +diff_ignore = -I 'Thursday, April 1' \ + -I 'Thu Apr 1' -I '^ *// java GenerateCharacter' with_check = yes _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
