[pkg-java] r12833 - in tags/sun-java6: . 6.21-1/debian 6.21-1/debian/po

Torsten Werner twerner at alioth.debian.org
Wed Jul 28 12:57:48 UTC 2010


Author: twerner
Date: 2010-07-28 12:57:48 +0000 (Wed, 28 Jul 2010)
New Revision: 12833

Added:
   tags/sun-java6/6.21-1/
   tags/sun-java6/6.21-1/debian/JB-bin.overrides.in
   tags/sun-java6/6.21-1/debian/changelog
   tags/sun-java6/6.21-1/debian/control
   tags/sun-java6/6.21-1/debian/po/ja.po
   tags/sun-java6/6.21-1/debian/rules
Removed:
   tags/sun-java6/6.21-1/debian/JB-bin.overrides.in
   tags/sun-java6/6.21-1/debian/changelog
   tags/sun-java6/6.21-1/debian/control
   tags/sun-java6/6.21-1/debian/po/ja.po
   tags/sun-java6/6.21-1/debian/rules
Log:
[svn-buildpackage] Tagging sun-java6 6.21-1

Deleted: tags/sun-java6/6.21-1/debian/JB-bin.overrides.in
===================================================================
--- trunk/sun-java6/debian/JB-bin.overrides.in	2010-07-28 07:19:11 UTC (rev 12829)
+++ tags/sun-java6/6.21-1/debian/JB-bin.overrides.in	2010-07-28 12:57:48 UTC (rev 12833)
@@ -1,9 +0,0 @@
- at basename@-bin: unstripped-binary-or-object
- at basename@-bin: binary-or-shlib-defines-rpath
- at basename@-bin: shlib-with-non-pic-code
- at basename@-bin: shlib-without-PT_GNU_STACK-section
- at basename@-bin: copyright-should-refer-to-common-license-file-for-gpl
- at basename@-bin: image-file-in-usr-lib
- at basename@-bin: package-contains-empty-directory
- at basename@-bin: too-long-extended-description-in-templates
- at basename@-bin: embedded-zlib

Copied: tags/sun-java6/6.21-1/debian/JB-bin.overrides.in (from rev 12830, trunk/sun-java6/debian/JB-bin.overrides.in)
===================================================================
--- tags/sun-java6/6.21-1/debian/JB-bin.overrides.in	                        (rev 0)
+++ tags/sun-java6/6.21-1/debian/JB-bin.overrides.in	2010-07-28 12:57:48 UTC (rev 12833)
@@ -0,0 +1,10 @@
+ at basename@-bin: unstripped-binary-or-object
+ at basename@-bin: binary-or-shlib-defines-rpath
+ at basename@-bin: shlib-with-non-pic-code
+ at basename@-bin: shlib-without-PT_GNU_STACK-section
+ at basename@-bin: copyright-should-refer-to-common-license-file-for-gpl
+ at basename@-bin: image-file-in-usr-lib
+ at basename@-bin: package-contains-empty-directory
+ at basename@-bin: too-long-extended-description-in-templates
+ at basename@-bin: embedded-zlib
+ at basename@-bin: embedded-libjpeg

Deleted: tags/sun-java6/6.21-1/debian/changelog
===================================================================
--- trunk/sun-java6/debian/changelog	2010-07-28 07:19:11 UTC (rev 12829)
+++ tags/sun-java6/6.21-1/debian/changelog	2010-07-28 12:57:48 UTC (rev 12833)
@@ -1,874 +0,0 @@
-sun-java6 (6.20-dlj-5) unstable; urgency=low
-
-  * UNRELEASED
-  * Update danish debconf tranlation; thanks to Joe Dalton. (Closes: #586238)
-
- -- Torsten Werner <twerner at debian.org>  Sun, 20 Jun 2010 21:12:02 +0200
-
-sun-java6 (6.20-dlj-4) unstable; urgency=low
-
-  * Remove wrong space character for uming.ttc path in fontconfig.properties.
-    Thanks to Alberto Alvarez García.
-
- -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 11:30:59 +0200
-
-sun-java6 (6.20-dlj-3) unstable; urgency=low
-
-  * Change Vcs-Svn header to allow anonymous access. (Closes: #478673)
-  * Add Recommends: ia32-libs-gtk to package ia32-sun-java6-bin.
-    (Closes: #532359)
-  * Add a some information to README.Debian that explains how to enable the
-    plugin in Iceweasel. (Closes: #541154)
-  * Add myself to Uploaders.
-  * Add missing changelog entry for CVE-2010-0087 to version 6.19-0ubuntu1.
-  * Add missing changelog entry for CVE-2010-1423 to version 6.20-1.
-
- -- Torsten Werner <twerner at debian.org>  Sun, 02 May 2010 12:07:16 +0200
-
-sun-java6 (6.20-dlj-2) unstable; urgency=low
-
-  * Team upload.
-  * Update Homepage in d/control.
-  * Update italian and spanish debconf translation. (Closes: #560354, #570790)
-  * Switch to source format 3.0.
-  * Remove files for the old -doc package since we Suggests: openjdk-6-doc.
-  * Clean up README.Debian and add some information about using dpkg-divert
-    before manually installing JCE policy files. (Closes: #578578)
-
- -- Torsten Werner <twerner at debian.org>  Sat, 01 May 2010 11:29:15 +0200
-
-sun-java6 (6.20-dlj-1) unstable; urgency=low
-
-  * Team upload.
-  * Create orig tarball from files at
-    <https://jdk-distros.dev.java.net/developer.html>. (Closes: #578402)
-  * Upload for Architecture: amd64. (Closes: #578361, #576481)
-  * Re-enable the license check in d/rules. (Closes: #578378)
-
- -- Torsten Werner <twerner at debian.org>  Mon, 19 Apr 2010 22:13:23 +0200
-
-sun-java6 (6.20-1) unstable; urgency=low
-
-  * New upstream release
-  * SECURITY UPDATE: multiple upstream vulnerabilities. Upstream fixes:
-    - (CVE-2010-0886): Vulnerability in desktop Java
-    - (CVE-2010-0887): Vulnerability in desktop Java
-    - (CVE-2010-1423): Vulnerability in desktop Java
-
- -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 16 Apr 2010 16:54:12 +0200
-
-sun-java6 (6.19-1) unstable; urgency=low
-
-  * Sync from Ubuntu. Thanks to Matthias Klose.
-  * Vietnamese (vi) debconf templates translation updated (Closes: #576135)
-
- -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 06 Apr 2010 11:54:35 +0200
-
-sun-java6 (6.19-0ubuntu2) lucid; urgency=low
-
-  [ Kees Cook ]
-  * implement an execute bit checker for the Ubuntu Non-Exec Policy
-    (LP: #506702):
-    - debian/JB-java.desktop.in: update mime handler to use new launcher.
-
-  [ Michael Terry ]
-  * Recognize chromium-browser as an available browser. LP: #553468.
-
- -- Matthias Klose <doko at canonical.com>  Thu, 01 Apr 2010 22:26:43 +0200
-
-sun-java6 (6.19-0ubuntu1) lucid; urgency=low
-
-  * New upstream version.
-  * SECURITY UPDATE: multiple upstream vulnerabilities. Upstream fixes:
-    - (CVE-2010-0837): JAR "unpack200" must verify input parameters (6902299).
-    - (CVE-2010-0845): No ClassCastException for HashAttributeSet constructors
-      if run with -Xcomp (6894807).
-    - (CVE-2010-0838): CMM readMabCurveData Buffer Overflow Vulnerability
-      (6899653).
-    - (CVE-2010-0082): Loader-constraint table allows arrays instead of
-      only the base-classes (6626217).
-    - (CVE-2010-0095): Subclasses of InetAddress may incorrectly interpret
-      network addresses (6893954) [ZDI-CAN-603].
-    - (CVE-2010-0085): File TOCTOU deserialization vulnerability (6736390).
-    - (CVE-2010-0087): Unspecified vulnerability in the Java Web Start, Java
-      Plug-in component allows remote attackers to affect confidentiality,
-      integrity, and availability via unknown vectors.
-    - (CVE-2010-0091): Unsigned applet can retrieve the dragged information
-      before drop action occurs (6887703).
-    - (CVE-2010-0088): Inflater/Deflater clone issues (6745393).
-    - (CVE-2010-0084): Policy/PolicyFile leak dynamic ProtectionDomains
-      (6633872).
-    - (CVE-2010-0092): AtomicReferenceArray causes SIGSEGV -> SEGV_MAPERR
-      error (6888149).
-    - (CVE-2010-0094): Deserialization of RMIConnectionImpl objects should
-      enforce stricter checks (6893947) [ZDI-CAN-588].
-    - (CVE-2010-0093): System.arraycopy unable to reference elements
-      beyond Integer.MAX_VALUE bytes (6892265).
-    - (CVE-2010-0840): Applet Trusted Methods Chaining Privilege Escalation
-      Vulnerability (6904691).
-    - (CVE-2010-0848): AWT Library Invalid Index Vulnerability (6914823).
-    - (CVE-2010-0847): ImagingLib arbitrary code execution vulnerability
-      (6914866).
-    - (CVE-2009-3555): TLS: MITM attacks via session renegotiation.
-    - 6639665: ThreadGroup finalizer allows creation of false root
-      ThreadGroups.
-    - 6898622: ObjectIdentifer.equals is not capable of detecting incorrectly.
-      encoded CommonName OIDs.
-    - 6910590: Application can modify command array in ProcessBuilder.
-    - 6909597: JPEGImageReader stepX Integer Overflow Vulnerability.
-    - 6932480: Crash in CompilerThread/Parser. Unloaded array klass?
-    - 6898739: TLS renegotiation issue.
-
- -- Matthias Klose <doko at canonical.com>  Tue, 30 Mar 2010 23:07:56 +0000
-
-sun-java6 (6.18-4) unstable; urgency=low
-
-  * Package sun-java6-plugin now register plugins for various browser
-    (Closes: #534174)
-
- -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 24 Mar 2010 11:50:06 +0100
-
-sun-java6 (6.18-3) unstable; urgency=low
-
-  * Update of the docs filenames (Closes: #523390)
-  * Swedish debconf templates translation updated (Closes: #570023)
-  * Chinese (zh_CN) debconf templates translation updated
-  * Czech debconf templates translation updated (Closes: #570062)
-  * French debconf templates translation updated (Closes: #570060)
-  * Slovak debconf templates translation updated (Closes: #570061)
-  * Russian debconf templates translation updated (Closes: #570541)
-  * German debconf templates translation updated (Closes: #570741)
-  * Portuguese debconf templates translation updated (Closes: #571042)
-
- -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 05 Mar 2010 14:55:36 +0100
-
-sun-java6 (6.18-2) unstable; urgency=low
-
-  * Package moved under the Debian Java team
-  * Add myself as uploader (Closes: #544629)
-  * Update of the Vcs-Svn & Vcs-Browser fields
-  * Cleanup the version numbers (- in the version was messing up)
-    (Closes: #445343)
-  * Update of the license URL from http://java.sun.com/notes (404)
-    to http://download.java.net/dlj/jdk6/LICENSE (Closes: 569352)
-  * French debconf templates translation updated (Closes: #569282)
-  * Czech debconf templates translation updated (Closes: #569294)
-  * Japanese debconf templates translation updated (Closes: #569312)
-  * Italien debconf templates translation updated
-  * Slovak debconf templates translation updated (Closes: #569489)
-  * Fix Incorrect Menu Entry for Java Web Start
-    Reuse javaws.wrapper from openjdk (Closes: #489833)
-  * Konqueror also available as a browser (Closes: #514983)
-	
- -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 11 Feb 2010 09:27:04 +0100
-
-sun-java6 (6-18-1) unstable; urgency=low
-
-  * QA upload.
-  * Non-maintainer upload.
-  * New upstream version.
-    Release notes at http://java.sun.com/javase/6/webnotes/6u18.html
-  * Rephrase on the license approval (Closes: #541881)
-  * Update messages to show the actual $TMP instead of /tmp 
-    (Closes: #539556; #506890)
-  * Standards-Version updated to version 3.8.4
-  * Replace jconsole => jvisualvm in the menu (Closes: #539288)
-  * fontconfig.properties uses uming.ttc instead of uming.ttc (Closes: #566088)
-  * Integration of the Galician translation. Thanks marce. (Closes: #537543)
-  * Integration of the Slovak translation. Thanks Ivan Masár (Closes: #535184)
-  * Integration of the Simplified Chinese translation. Thanks Ji ZhengYu
-    (Closes: #535184)
-  * dh_desktop removed from debian/rules
-  * not-binnmuable-all-depends-any fixed
-	
- -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 08 Feb 2010 15:01:36 +0100
-
-sun-java6 (6-17-1) unstable; urgency=low
-
-  * QA upload.
-  * New upstream version. (Closes: #558173)
-    Release notes at http://java.sun.com/javase/6/webnotes/6u17.html
-
- -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 28 Nov 2009 19:02:56 +0100
-
-sun-java6 (6-16-1) unstable; urgency=low
-
-  * QA upload.
-  * Remove `Uploaders' attribute.
-  * New upstream version.
-    Release notes at http://java.sun.com/javase/6/webnotes/6u16.html
-  * Fix some more lintian warnings.
-  * Stop building sun-java6-doc, it's an installer package anyway.
-    Suggest openjdk-6-doc instead.
-  * Mention compatibility problems with some window managers and running with
-    AWT_TOOLKIT=MToolkit in README.Debian. See #504524.
-
- -- Matthias Klose <doko at ubuntu.com>  Fri, 28 Aug 2009 10:24:29 +0200
-
-sun-java6 (6-15-1) unstable; urgency=medium
-
-  * New upstream version.
-    Release notes at http://java.sun.com/javase/6/webnotes/6u15.html
-    Addresses CVE-2009-0217, CVE-2009-2475, CVE-2009-2476, CVE-2009-2625,
-    CVE-2009-2670, CVE-2009-2671, CVE-2009-2672, CVE-2009-2673, CVE-2009-2674,
-    CVE-2009-2675, CVE-2009-2676, CVE-2009-2690.
-  * Set section names to java.
-  * Orphan the package.
-
- -- Matthias Klose <doko at ubuntu.com>  Fri, 07 Aug 2009 13:05:35 +0200
-
-sun-java6 (6-14-1) unstable; urgency=low
-
-  * New upstream version.
-    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-  * Add xulrunner-1.9 as a browser alternative. Closes: #526227.
-
- -- Matthias Klose <doko at ubuntu.com>  Tue, 02 Jun 2009 18:49:25 +0200
-
-sun-java6 (6-13-1) unstable; urgency=low
-
-  * New upstream version. Closes: #521414. LP: #349135.
-    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-    Fixes CVE-2006-2426, CVE-2009-1093, CVE-2009-1094, CVE-2009-1095,
-    CVE-2009-1096, CVE-2009-1097, CVE-2009-1098, CVE-2009-1099, CVE-2009-1100,
-    CVE-2009-1101, CVE-2009-1102, CVE-2009-1103, CVE-2009-1104, CVE-2009-1105,
-    CVE-2009-1106, CVE-2009-1107.
-  * Fix name of the downloaded doc zip.
-
- -- Matthias Klose <doko at ubuntu.com>  Sun, 29 Mar 2009 19:12:49 +0200
-
-sun-java6 (6-12-1) unstable; urgency=medium
-
-  * Upload to unstable.
-
- -- Matthias Klose <doko at debian.org>  Fri, 06 Feb 2009 15:39:56 +0100
-
-sun-java6 (6-12-0ubuntu1) jaunty; urgency=low
-
-  * New upstream release. Closes: #508195, #507979.
-    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-  * Build the -plugin package on amd64. Closes: #508871.
-  * Install desktop files for javaws and the plugin control panel on amd64.
-  * Find the correct doc zip when installing the -doc package. LP: #85969.
-    LP: #321863.
-
- -- Matthias Klose <doko at ubuntu.com>  Fri, 06 Feb 2009 14:03:30 +0100
-
-sun-java6 (6-11-0ubuntu1) jaunty; urgency=low
-
-  * New upstream release.
-    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-  * sun-java6-plugin: Use the libnpjp2 plugin instead of libjavaplugin_oji.
-    LP: #291135.
-
- -- Matthias Klose <doko at ubuntu.com>  Wed, 03 Dec 2008 11:43:53 +0100
-
-sun-java6 (6-10-1) unstable; urgency=low
-
-  * New upstream release.
-    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-
- -- Matthias Klose <doko at ubuntu.com>  Thu, 16 Oct 2008 23:42:24 +0200
-
-sun-java6 (6-07-3ubuntu2) hardy-proposed; urgency=low
-
-  * New upstream bug fix release. LP: #254997.
-    - Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-    - Including security related changes.
-
- -- Matthias Klose <doko at ubuntu.com>  Tue, 05 Aug 2008 18:37:50 +0200
-
-sun-java6 (6-07-4) unstable; urgency=low
-
-  * Ignore errors when registering the jar binfmt. The alternative may
-    already be registered by another JVM (openjdk-6, cacao-oj6).
-  * Ignore errors when generating the java shared archive. Closes: #493085.
-    LP: #247296.
-
- -- Matthias Klose <doko at ubuntu.com>  Tue, 05 Aug 2008 17:54:06 +0200
-
-sun-java6 (6-07-3) unstable; urgency=low
-
-  * Use recent macro names in the control file for releases that support these.
-  * Bump debhelper to v5.
-
-  [ Following changes by Philipp Hahn]
-  * Don't remove alternatives on upgrade. Closes: #490249.
-  * debian/control: Add Pre-Depends: debconf for bin-package,
-    add Homepage-field.
-  * debian/copyright: Reference /usr/share/common-licenses/{LGPL-2,Apache-2.0},
-    convert to UTF-8.
-  * debian/JB-doc.postinst.in: /chown/s/./:/.
-  * debian/*.menu.in: s/Apps/Applications/.
-  * debian/rules: rm ...javadb.../*.bat.
-
- -- Matthias Klose <doko at ubuntu.com>  Fri, 11 Jul 2008 15:46:13 +0200
-
-sun-java6 (6-07-2ubuntu1) intrepid; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Regenerate the control file.
-
- -- Matthias Klose <doko at ubuntu.com>  Thu, 10 Jul 2008 14:05:05 +0000
-
-sun-java6 (6-07-2) unstable; urgency=low
-
-  * Ignore errors during activation of class data sharing.
-
- -- Matthias Klose <doko at ubuntu.com>  Thu, 10 Jul 2008 15:42:54 +0200
-
-sun-java6 (6-07-1) unstable; urgency=low
-
-  * debian/control.in: Update Xb-Npp-MimeType.
-  * Let update-java-alternatives handle the jexec alternative. Closes: #477673.
-  * Ignore errors during activation of class data sharing. Closes: #428142.
-  * Update sv translation for debconf template (Martin Bagge). Closes: #488184.
-  * Distributions are not allowed to package the released versions published
-    at http://java.sun.com/javase/downloads and have to wait for the
-    availability of the DLJ bundles. No need to file reports. Closes: #485913.
-  * Allow epiphany-gecko | epiphany-webkit as browser alternatives.
-  * Remove konqueror as browser alternative, requested in report.
-    Closes: #477204.
-
- -- Matthias Klose <doko at ubuntu.com>  Thu, 10 Jul 2008 11:49:10 +0200
-
-sun-java6 (6-07-0ubuntu1) intrepid; urgency=low
-
-  * New upstream bug fix release.
-    - Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-
- -- Matthias Klose <doko at ubuntu.com>  Wed, 09 Jul 2008 11:15:28 +0200
-
-sun-java6 (6-06-1ubuntu1) hardy-proposed; urgency=low
-
-  * Fix names for browser alternatives in jinfo file, set browser_plugin_dirs
-    unconditionally.
-
- -- Matthias Klose <doko at ubuntu.com>  Mon, 28 Apr 2008 13:54:52 +0200
-
-sun-java6 (6-06-1) unstable; urgency=low
-
-  * Upload to unstable. Closes: #474932.
-
- -- Matthias Klose <doko at ubuntu.com>  Wed, 16 Apr 2008 18:51:00 +0200
-
-sun-java6 (6-06-0ubuntu1) hardy; urgency=low
-
-  * New upstream bug fix release.
-    - Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
-    - Fixes Xlib/XCB locking problems. LP: #86103. Closes: #414535.
-    - Update timezone information. Closes: #468234.
-  * Don't open the control panel when starting a WebStart application.
-    LP: #84501.
-  * javaws.desktop: Add `%u' to the Exec key, remove -viewer option. 
-    Closes: #436645.
-  * Suggest ttf-wqy-zenhei instead of ttf-arphic-uming (only available in .ttc
-    format not supported by Sun Java) (Arne Goetje). LP: #213925.
-  * Only use the basename for icons in desktop files. LP: #207413.
-  * Add XS-Autobuild: yes attribute. Closes: #473164.
-  * ia32-sun-java6-bin: Recommend lib32nss-mdns on amd64. Closes: #430917.
-  * JB-bin.postinst.in: Call java -client -Xshare:dump with -Xmx1m, if the
-    memory is available. Closes: #425654, #428654.
-  * binfmt-support: Handle /usr/share/binfmts/jar as a slave symlink of
-    the jexec alternative, install the binfmt file in the jre libdir.
-    Use the jexec alternative in the binfmt file.
-  * Don't fail on removal, if /var/lib/binfmts/openjdk-6 is missing.
-    Closes: #441880.
-  * README.Debian: Clarify about configuring the ControlPanel. Closes: #459435.
-  * Don't include empty directories in /usr/share. Closes: #472995.
-
- -- Matthias Klose <doko at ubuntu.com>  Wed, 16 Apr 2008 01:02:07 +0200
-
-sun-java6 (6-05-1) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Matthias Klose <doko at ubuntu.com>  Wed, 26 Mar 2008 02:00:33 +0100
-
-sun-java6 (6-05-0ubuntu1) hardy; urgency=low
-
-  * New upstream bug fix release.
-    This was released today on https://jdk-distros.dev.java.net/developer.html.
-    Distributions are not allowed to package the released versions published
-    at http://java.sun.com/javase/downloads and have to wait for the
-    availability of the DLJ bundles. No need to file reports like LP: #199477.
-  * Install all desktop files in /usr/share/applications.
-  * sun-java6-jdk: Add java*-sdk provides.
-  * Adjust plugin links for xulrunner-1.9. LP: #173966, #198633.
-
- -- Matthias Klose <doko at ubuntu.com>  Tue, 25 Mar 2008 23:33:13 +0000
-
-sun-java6 (6-04-2) unstable; urgency=low
-
-  * Install icons in /usr/share/pixmaps; debhelper silently generates
-    wrong code for icons installed in /usr/share/icons. Addresses: #462727.
-
- -- Matthias Klose <doko at ubuntu.com>  Mon, 04 Feb 2008 22:16:31 +0100
-
-sun-java6 (6-04-1) unstable; urgency=low
-
-  * Provide the -headless versions of the runtime as well.
-  * Upstream doesn't link with g++-3.3 anymore; drop dependency on libstdc++5.
-    Closes: #449052.
-  * Fix removal of alternatives. Closes: #437083.
-  * README.alternatives: Fix update-java-alternatives example. Closes: #452320.
-
- -- Matthias Klose <doko at debian.org>  Fri, 25 Jan 2008 16:54:54 +0100
-
-sun-java6 (6-04-0ubuntu1) hardy; urgency=low
-
-  * New upstream bug fix release.
-  * sun-java6-jre: Provide java-runtime packages. LP: #181028.
-  * Register plugin for firefox-3.0.
-
- -- Matthias Klose <doko at ubuntu.com>  Fri, 18 Jan 2008 10:06:14 +0100
-
-sun-java6 (6-03-2) unstable; urgency=low
-
-  * Fix package removal (unregister binary format).
-
- -- Matthias Klose <doko at debian.org>  Wed, 03 Oct 2007 18:37:35 +0200
-
-sun-java6 (6-03-1) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Matthias Klose <doko at ubuntu.com>  Thu, 27 Sep 2007 23:42:40 +0200
-
-sun-java6 (6-03-0ubuntu1) gutsy; urgency=low
-
-  * New upstream bug fix release.
-  * Re-add the sun-java6-db package, now included upstream again.
-  * Fix lintian warnings for menu files.
-
- -- Matthias Klose <doko at ubuntu.com>  Thu, 27 Sep 2007 15:42:00 +0200
-
-sun-java6 (6-02-2) unstable; urgency=low
-
-  * Register jar binfmt.
-  * Merge from Ubuntu:
-    - Add Xb-Npp-xxx tags (Hilario Montoliu). See
-      https://blueprints.launchpad.net/ubuntu/+spec/firefox-distro-addon-support.
-    - Register the plugin for more browsers.
-    - Build packages for the lpia architecture.
-  * debian/control: Add XS-Vcs fields.
-  * Changed font configuration to fix CJK font support (Arne Goetje).
- 
- -- Matthias Klose <doko at ubuntu.com>  Wed, 29 Aug 2007 21:42:44 +0200
-
-sun-java6 (6-02-1ubuntu3) gutsy; urgency=low
-
-  * debian/rules: Fix typo in binfmts directory name.
-
- -- Matthias Klose <doko at ubuntu.com>  Fri, 07 Sep 2007 18:28:50 +0000
-
-sun-java6 (6-02-1ubuntu2) gutsy; urgency=low
-
-  * Register jar binfmt.
-  * debian/control: Add XS-Vcs fields.
-  * Changed font configuration to fix CJK font support (Arne Goetje).
- 
- -- Matthias Klose <doko at ubuntu.com>  Fri, 07 Sep 2007 18:13:46 +0200
-
-sun-java6 (6-02-1ubuntu1) gutsy; urgency=low
-
-  * Add Xb-Npp-xxx tags (Hilario Montoliu). See
-    https://blueprints.launchpad.net/ubuntu/+spec/firefox-distro-addon-support.
-  * Register the plugin for more browsers.
-  * Build packages for the lpia architecture.
-  * debian/control: Add XS-Vcs fields.
- 
- -- Matthias Klose <doko at ubuntu.com>  Mon, 30 Jul 2007 17:34:07 +0200
-
-sun-java6 (6-02-1) unstable; urgency=low
-
-  * New upstream bug fix release. Closes LP: #126059.
-
-  * WARNING: Remove the sun-java6-db package. Apparently the javadb
-    sources are not included in the DLJ bundles while these are still
-    included in the standard bundles. The fix will most likely have
-    to wait until the 6u3 update. Please don't use the 6-02 package
-    for any backport.
-
-  * sun-java6-bin: Make libnss-mdns a recommendation. Closes: #432661.
-  * sun-java6-plugin: Change the dependency iceape -> iceape-browser.
-    Closes: #432593.
-
- -- Matthias Klose <doko at debian.org>  Wed, 18 Jul 2007 22:55:01 +0200
-
-sun-java6 (6-01-1) unstable; urgency=low
-
-  * JDK image parsing library vulnerabilities fixed in new upstream.
-    CVE-2007-2789.
-  * sun-java6-bin: Depend on libnss-mdns. Closes: #410116.
-  * README.alternatives: Use correct syntax. Closes: #409911.
-  * Updated russian debconf templates translation. Closes: #409802.
-  * README.Debian: The plugin is only available for 32bit. Closes: #411283.
-  * Add portuguese translation for debconf messages. Closes: #413928.
-
- -- Matthias Klose <doko at debian.org>  Fri, 29 Jun 2007 00:54:31 +0200
-
-sun-java6 (6-01-0ubuntu1) gutsy; urgency=low
-
-  * New upstream bug fix release. Closes LP: #115687.
-    Closes: #418004, #422403, #424047.
-  * Update fontconfig.properties for Japanese. Closes LP: #115573.
-  * Update fontconfig.properties for Korean. Closes LP: #113494.
-
- -- Matthias Klose <doko at ubuntu.com>  Wed, 27 Jun 2007 13:07:58 +0200
-
-sun-java6 (6-00-2ubuntu3) gutsy; urgency=low
-
-  * debian/JB-plugin.postinst.in: s/mozilla-firefox/firefox/
-    install alternative to new firefox plugin directory 
-    (LP: #112994).
-  * debian/rules: don't dh_installdirs for mozilla-firefox
-    plugins directory anymore.
-
- -- Alexander Sack <asac at ubuntu.com>  Mon, 25 Jun 2007 11:05:33 +0200
-
-sun-java6 (6-00-2ubuntu2) feisty; urgency=low
-
-  * Use the unversioned jvm path for the man page alternatives.
-    Ubuntu #93619.
-
- -- Matthias Klose <doko at ubuntu.com>  Tue,  3 Apr 2007 12:30:01 +0200
-
-sun-java6 (6-00-2ubuntu1) feisty; urgency=low
-
-  [ Matthias Klose ]
-  * Add russian po-debconf translation. Closes: #409802.
-  * Add menu entry for jconsole. Ubuntu #83384.
-  * Move javadb demos to /usr/share/doc.
-
-  [ Tom Marble ]
-  * Added the optional sun-java6-javadb package
-  * Updated TODO
-
- -- Matthias Klose <doko at ubuntu.com>  Mon, 12 Feb 2007 12:27:21 +0100
-
-sun-java6 (6-00-2) unstable; urgency=low
-
-  * sun-java6-plugin: please add an alternative dependency on iceape-browser.
-    Addresses: #406954.
-  * Fix installation of sun-java6-plugin. Closes: #407134.
-  * sun-java6-bin: Depend on libstdc++5. Closes: #407197. Ubuntu #78663.
-  * Start javaws with the -viewer option. Ubuntu #78169.
-
- -- Matthias Klose <doko at ubuntu.com>  Wed, 17 Jan 2007 22:52:30 +0100
-
-sun-java6 (6-00-1) unstable; urgency=low
-
-  [ Matthias Klose ]
-  * Configure plugin for iceape and iceweasel. Addresses: #404808.
-  * Clarify short descriptions. Addresses: #404608.
-  * Add spanish po-debconf translation (Steve Lord Flaubert). Closes: #404746.
-
- -- Matthias Klose <doko at ubuntu.com>  Mon,  2 Jan 2007 18:11:50 +0100
-
-sun-java6 (6-00-0ubuntu1) feisty; urgency=low
-
-  [ Tom Marble ]
-  * Packaging based on sun-java5 (1.5.0-10-1)
-  * Initial packaging for JDK 6
-
-  [ Matthias Klose ]
-  * debian/rules: Differentiate between JDK version (6) and
-    API version (1.6.0).
-  * debian/rules: First release doesn't have a CHANGES file.
-  * Adjust jar and tarball comparision for JDK 6.
-  * debian/control.in: The demo directory is now listed as optional.
-    Let -jdk suggest -demo instead of depending on it. Closes: #367562.
-  * management/*: Mark as configuration files.
-  * psfontj2d.properties, psfont.properties.ja, fontconfig.*.*:
-    Don't mark as configuration files.
-  * Install binary demos into /usr/lib. Closes: #392415.
-
- -- Matthias Klose <doko at ubuntu.com>  Tue, 19 Dec 2006 13:37:44 +0100
-
-sun-java5 (1.5.0-10-1) unstable; urgency=medium
-
-  * New upstream release. Closes: #393153.
-    - CVE-2006-2426 is fixed. Closes: #384734.
-    - CVE-2006-5201 is fixed. Closes: #393042.
-  * ia32-sun-java5-bin: Depend on ia32-libs. Ubuntu #71933.
-  * Don't install javaplugin for obsolete mozilla-snapshot package.
-    Closes: #396590.
-  * Add german po-debconf template translation (Matthias Julius).
-    Closes: #398641.
-  * README.alternatives: Fix update-java-alternatives parameters.
-    Closes: #394994.
-  * Add iceweasel as a browser alternative. Closes #399553.
-  * sun-java5-jre: Provide java1-runtime. Closes: #387192.
-
- -- Matthias Klose <doko at debian.org>  Tue,  5 Dec 2006 23:24:48 +0100
-
-sun-java5 (1.5.0-08-1) unstable; urgency=low
-
-  * New upstream release. Closes: #382919.
-  * Update packaging to reflect changed file names and date stamps.
-  * The jre and sdk README's clarify the distribution in native
-    distribution packaging formats and repository mechanisms.
-    Closes: #370296.
-  * Update/new translations (sv, fr, da, ja, cs) for the debconf templates.
-    Closes: #375745, #377969, #379411, #382931.
-
- -- Matthias Klose <doko at ubuntu.com>  Thu, 17 Aug 2006 22:19:41 +0200
-
-sun-java5 (1.5.0-07-1) unstable; urgency=low
-
-  * New upstream release.
-  * The FAQ for the DLJ is now part of the LICENSE file.
-
-  [Jeroen van Wolffelaar]
-  * Drop duplicate uploader name, change my email address
-  * Fix typo in package description (Closes: #367493)
-
-  [Matthias Klose]
-  * Include copyright templates in the -jre and -bin packages.
-    Closes: #367504.
-  * Do not use the generated debconf template files. Closes: #367530.
-  * Add debian/sharedmimeinfo. Addresses: #367445.
-  * JB-java.desktop.in, JB-javaws.desktop.in: Add Encoding=UTF-8.
-  * JB-policytool.desktop.in, JB-controlpanel.desktop.in: Remove GNOME
-    from categories.
-  * fontconfig.properties: Use sazanami fonts instead of kochi.
-    Closes: #367573.
-  * Fix display of chinese characters. Ubuntu #47045.
-  * Provide alternatives for the corba tools. Ubuntu #44966.
-  * Give a more verbose error message when the license or the agreement
-    question cannot be presented; point to 'dpkg-reconfigure debconf' to
-    select a frontend other than noninteractive. Ubuntu #44891, #45292, #46096.
-  * Add upstream homepage URL to copyright, regenerate copyright file.
-    Closes: #368083.
-  * Add French debconf templates translation (Florentin Duneau).
-    Closes: #368766.
-  * Add the FAQ for the Operating System Distributor License for Java (DLJ).
-  * Add konqueror as an alternative dependency in the plugin package.
-    Ubuntu #49320.
-
-  [Tom Marble]
-  * updated JAVA_HOME.in to reflect the one (1) directory for 
-    for the JRE and JDK (thanks to some clever symlinking).
-  * Fixed proposed args to update-java-alternatives (UJA) 
-    in README.alternatives.in  Addresses: #376888
-  * Updated Debian installation documentation (for etch) at
-    https://jdk-distros.dev.java.net/debian.html
-  * Added Swedish debconf templates translation (Daniel Nylander) 
-    Addresses: #375745
-  
- -- Matthias Klose <doko at ubuntu.com>  Tue,  6 Jun 2006 15:05:53 +0200
-
-sun-java5 (1.5.0-06-1) unstable; urgency=low
-
-  [ Combined changelog for versions -0 up to -0.9b ]
-
-  * Initial packages, derived from the j2se1.4 packages.
-  * Update license (DJL v.1.1) and license questions in the installation
-    scripts.
-  * "Source" tarball includes both i586 and amd64 bin packages.
-  * New binary packages:
-    - New empty -plugin package, just installs the plugin alternatives.
-    - New empty -fonts package, registering the fonts in defoma.
-    - Arch independent src package, the src.zip differs on amd64
-      and i386. Check that all src.zip files are equal, besides time stamp
-      and build path differences in comments.
-    - Keep the -demo packages as a separate package; for license reasons
-      -jdk and -demo depend on each other.
-    - Split the jre in an arch and arch-indep packages; move all common
-      jar files and jar files with the same content into the -jre package.
-      Checked at build time to assert equality of the files.
-      Move common subdirectories into the -jre package.
-    - Build the -doc package (needs downloaded docs).
-    - Build ia32 runtime packages for amd64 and ia64.
-    - Rename the -src package to -source (Tom Marble).
-    - Update dependency/replacement information for the new packages.
-  * Unpack the jar files during the build, don't include the pack
-    files in the binaries; always use unpack200 from the i586 archive,
-    which works on amd64, i386 and ia64.
-  * Adjust build dependencies.
-  * Adopt fontconfig.properties.src for Debian/Ubuntu.
-  * Keep all files but the example and demo files in /usr/lib.
-  * Move the sample and demo files into /usr/share/doc/sun-java5-jdk.
-  * Use the jpackage naming conventions for the toplevel
-    directory (java-1.5.0-sun-1.5.0.06, alias java-1.5.0-sun);
-    Use the alias symlink for registering the alternatives.
-  * jre package depends on unixodbc; don't depend on unixodbc for the
-    ia32 runtime, the 32bit libraries are not packaged.
-  * ControlPanel: Fix logic to get the location of the script.
-  * Install README.html in the jdk docdir.
-  * Use /usr/lib/jvm/.sun-java5.jinfo (description file to work with
-    update-java-alternatives). Recommend the java-common package
-    including this script.
-  * Drop all version information from the dependencies on shared
-    libraries; we don't have any information about it anyway.
-  * Place the man pages for the jre tools into JAVA_HOME.
-  * Ease the generation of the copyright file to include the packaging
-    copyright, upstream copyright and third party licenses (Tom Marble).
-  * Activate class data sharing for 32bit runtimes using the client
-    VM (Juergen Kreileder).
-  * Install menu icons in xpm format, convert desktop and menu files
-    to use them.
-  * Do not provide alternatives for kinit, klist, ktab, also in packages
-    heimdal-clients, krb5-user.
-  * For the plugins, use the alternative names used by java-package:
-    netscape-javaplugin.so, mozilla-javaplugin.so, firefox-javaplugin.so.
-  * -jre: suggest the -fonts package (Tom Marble).
-  * Unpack the archives using unzip, don't run the native included
-    installer.
-
-  * Modified debconf for more user friendly license presentment:
-    elaborated dlj.templates and coordinated state machine
-    in JB-jre.preinst.in and JB-jdk.preinst.in per debconf-devel(1).
-    Thanks to Tom Marble.
-  * DLJ related code in JB-jre.config.in and JB-jdk.config.in may
-    no longer be necessary (as it is done in preinst) (Tom Marble).
-
-  * Fix charset encoding of license, making the license show in the gnome
-    frontend of debconf (Jeroen van Wolffelaar).
-  * po-debconf'ize (Jeroen van Wolffelaar).
-
- -- Matthias Klose <doko at ubuntu.com>  Sun, 14 May 2006 20:30:38 +0200
-
-j2se1.4-i586 (1.4.2.03-1) unstable; urgency=low
-
-  * New upstream version.
-    Fixes security vulnerabilities in the Java runtime environment which may
-    allow an untrusted applet to elevate its privileges.
-    http://sunsolve.sun.com/search/document.do?assetkey=1-26-102003-1
-  * Add new dependency package j2re1.4-mozilla-plugin to hold all dependencies
-    needed to run the mozilla browser plugin. Taken from Ubuntu.
-
- -- Matthias Klose <doko at debian.org>  Mon, 28 Nov 2005 09:48:28 +0000
-
-j2se1.4-i586 (1.4.2.02-2) unstable; urgency=low
-
-  * Package rebuild using the xorg packages.
-  * Build-depend on xlibs, libasound2.
-  * Reflect change of menu directory.
-
- -- Matthias Klose <doko at debian.org>  Mon, 19 Sep 2005 09:04:43 +0000
-
-j2se1.4-i586 (1.4.2.02-1) testing unstable; urgency=low
-
-  * Update to 1.4.2-02.
-
- -- Matthias Klose <doko at debian.org>  Tue, 14 Jun 2005 16:51:49 +0200
-
-j2se1.4-i586 (1.4.2.01-2) testing unstable; urgency=low
-
-  * Reset license question seen state in *.config to prevent installation
-    problems when license wasn't accepted in the first run (closes: #301064)
-  
-  * Fix AMD64 plug-in link
-
- -- Juergen Kreileder <jk at blackdown.de>  Fri, 21 Jan 2005 18:06:01 +0100
-
-j2se1.4-i586 (1.4.2.01-1) unstable; urgency=low
-
-  * Juergen Kreileder <jk at blackdown.de>
-    - 1.4.2-01 release
-    - Run update-desktop-database
-    - Add hidden .desktop for executing JAR files with java
-
-  * Matthias Klose <doko at debian.org>
-    - Fix package version.
-    - Cleanup debian/rules.
-    - Keep HtmlConverter in the sdk package.
-
- -- Juergen Kreileder <jk at blackdown.de>  Mon, 22 Nov 2004 01:17:41 +0100
-
-j2se1.4-i586 (1.4.2-1) unstable; urgency=low
-
-  * 1.4.2-fcs release
-
-  * Matthias Klose <doko at debian.org>
-    - Recommend libasound and xlibs, do not depend on it.
-    - Fix locations of gnome menu entries, drop entries for docs.
-    - j2re1.4 replaces j2se-common.
-
-  * Juergen Kreileder <jk at blackdown.de>
-    - Gnome mime support. JAR files can be started using nautilus.
-    - Java web start applications works with Gnome 2.8.
-    - Gnome icons for mimetapes.
-    - Updated JCE URL's.
-    - Don't remove needed empty directories in binary target.
-
- -- Matthias Klose <doko at debian.org>  Sat,  7 Aug 2004 09:53:29 +0200
-
-j2se1.4-i586 (1.4.1.98-1) unstable; urgency=low
-
-  * First Debian package of upstream release 1.4.2 rc1.
-
-  * Joris Patroons <jopa at kotnet.org>
-
-    - Lots of changes, all coming from blackdown. Read their docs.
-    - Fixed minor postinst bug.
-    - Original jvm.cfg is now in the i386 subdirectory (we put it in /etc)
-    - Handle licenses using debconf.
-
-  * Matthias Klose <doko at debian.org>
-
-    - Merged with the packaging of Joris Patroons <jopa at kotnet.org>
-    - Cleanup gnome desktop files.
-    - Add menu support for j2re1.4, j2sdk1.4-demo.
-    - Add doc-base support for j2re1.4, j2sdk1.4.
-    - Add support for mozilla-firefox.
-
- -- Matthias Klose <doko at debian.org>  Sat, 24 Jan 2004 09:38:09 +0100
-
-j2se1.4-i586 (1.4.2~rc1-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Matthias Klose <doko at debian.org>  Thu, 18 Dec 2003 22:45:23 +0100
-
-j2se1.4-i586 (1.4.1.01-1.1) unstable; urgency=low
-
-  * Update build dependencies.
-
- -- Matthias Klose <doko at debian.org>  Sat,  6 Dec 2003 09:09:15 +0100
-
-j2se1.4-i386 (1.4.1-6) unstable; urgency=low
-
-  * Ok, removed the sed4 dependency again, and finally fixed all the
-    .desktop files. Many thanks go to Andrew Lau.
-
- -- Joris Patroons <jopa at kotnet.org>  Sun,  1 Jun 2003 13:37:01 +0200
-
-j2se1.4-i386 (1.4.1-5) unstable; urgency=low
-
-  * Two minor bug fixes: the gnome menu items and a mozilla-cvs link.
-    Added build-depends on sed >=4 to fix the former, since I don't
-    know perl.
-
- -- Joris Patroons <jopa at kotnet.org>  Sat, 31 May 2003 18:20:29 +0200
-
-j2se1.4-i386 (1.4.1-4) unstable; urgency=low
-
-  * Fixed a minor bug in debian/rules that copied the Japanese
-    manpages over the English ones.
-
- -- Joris Patroons <jopa at kotnet.org>  Mon, 26 May 2003 00:21:57 +0200
-
-j2se1.4-i386 (1.4.1-3) unstable; urgency=low
-
-  * Fixed a small but nasty bug in the JavaPluginControlPanel script.
-
- -- Joris Patroons <jopa at kotnet.org>  Thu, 22 May 2003 18:37:01 +0200
-
-j2se1.4-i386 (1.4.1-2) unstable; urgency=low
-
-  * Installation now creates /etc/.java/.systemPrefs/ and two files in it,
-    needed by the Blackdown jre. Purge will rm -rf /etc/.java/.
-
-  * Fixed a lot of things in the debian/ dir, unimportant to end users.
-
- -- Joris Patroons <jopa at kotnet.org>  Sun, 20 Apr 2003 01:57:46 +0200
-
-j2se1.4-i386 (1.4.1-1) unstable; urgency=low
-
-  * Used Stephen's debian/ directory to package j2se 1.4.1 (final),
-    compiled with gcc-3.2 for compatibility with sid's mozilla.
-
- -- Joris Patroons <jopa at kotnet.org>  Mon,  7 Apr 2003 18:44:21 +0200

Copied: tags/sun-java6/6.21-1/debian/changelog (from rev 12832, trunk/sun-java6/debian/changelog)
===================================================================
--- tags/sun-java6/6.21-1/debian/changelog	                        (rev 0)
+++ tags/sun-java6/6.21-1/debian/changelog	2010-07-28 12:57:48 UTC (rev 12833)
@@ -0,0 +1,881 @@
+sun-java6 (6.21-1) unstable; urgency=low
+
+  * New upstream release
+    - There are no security fixes in this release.
+  * Update $(bin_pattern) and $(diff_ignore) in debian/rules.
+  * Add a lintian override for embedded-libjpeg.
+  * Update danish debconf translation; thanks to Joe Dalton. (Closes: #586238)
+  * Update japanese debconf translation; thanks to Hideki Yamane.
+    (Closes: #580157)
+  * Add midori as an alternative to $(browsers) in debian/rules.
+    (Closes: #588663)
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 28 Jul 2010 14:47:10 +0200
+
+sun-java6 (6.20-dlj-4) unstable; urgency=low
+
+  * Remove wrong space character for uming.ttc path in fontconfig.properties.
+    Thanks to Alberto Alvarez García.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 11:30:59 +0200
+
+sun-java6 (6.20-dlj-3) unstable; urgency=low
+
+  * Change Vcs-Svn header to allow anonymous access. (Closes: #478673)
+  * Add Recommends: ia32-libs-gtk to package ia32-sun-java6-bin.
+    (Closes: #532359)
+  * Add a some information to README.Debian that explains how to enable the
+    plugin in Iceweasel. (Closes: #541154)
+  * Add myself to Uploaders.
+  * Add missing changelog entry for CVE-2010-0087 to version 6.19-0ubuntu1.
+  * Add missing changelog entry for CVE-2010-1423 to version 6.20-1.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 02 May 2010 12:07:16 +0200
+
+sun-java6 (6.20-dlj-2) unstable; urgency=low
+
+  * Team upload.
+  * Update Homepage in d/control.
+  * Update italian and spanish debconf translation. (Closes: #560354, #570790)
+  * Switch to source format 3.0.
+  * Remove files for the old -doc package since we Suggests: openjdk-6-doc.
+  * Clean up README.Debian and add some information about using dpkg-divert
+    before manually installing JCE policy files. (Closes: #578578)
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 01 May 2010 11:29:15 +0200
+
+sun-java6 (6.20-dlj-1) unstable; urgency=low
+
+  * Team upload.
+  * Create orig tarball from files at
+    <https://jdk-distros.dev.java.net/developer.html>. (Closes: #578402)
+  * Upload for Architecture: amd64. (Closes: #578361, #576481)
+  * Re-enable the license check in d/rules. (Closes: #578378)
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 19 Apr 2010 22:13:23 +0200
+
+sun-java6 (6.20-1) unstable; urgency=low
+
+  * New upstream release
+  * SECURITY UPDATE: multiple upstream vulnerabilities. Upstream fixes:
+    - (CVE-2010-0886): Vulnerability in desktop Java
+    - (CVE-2010-0887): Vulnerability in desktop Java
+    - (CVE-2010-1423): Vulnerability in desktop Java
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 16 Apr 2010 16:54:12 +0200
+
+sun-java6 (6.19-1) unstable; urgency=low
+
+  * Sync from Ubuntu. Thanks to Matthias Klose.
+  * Vietnamese (vi) debconf templates translation updated (Closes: #576135)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 06 Apr 2010 11:54:35 +0200
+
+sun-java6 (6.19-0ubuntu2) lucid; urgency=low
+
+  [ Kees Cook ]
+  * implement an execute bit checker for the Ubuntu Non-Exec Policy
+    (LP: #506702):
+    - debian/JB-java.desktop.in: update mime handler to use new launcher.
+
+  [ Michael Terry ]
+  * Recognize chromium-browser as an available browser. LP: #553468.
+
+ -- Matthias Klose <doko at canonical.com>  Thu, 01 Apr 2010 22:26:43 +0200
+
+sun-java6 (6.19-0ubuntu1) lucid; urgency=low
+
+  * New upstream version.
+  * SECURITY UPDATE: multiple upstream vulnerabilities. Upstream fixes:
+    - (CVE-2010-0837): JAR "unpack200" must verify input parameters (6902299).
+    - (CVE-2010-0845): No ClassCastException for HashAttributeSet constructors
+      if run with -Xcomp (6894807).
+    - (CVE-2010-0838): CMM readMabCurveData Buffer Overflow Vulnerability
+      (6899653).
+    - (CVE-2010-0082): Loader-constraint table allows arrays instead of
+      only the base-classes (6626217).
+    - (CVE-2010-0095): Subclasses of InetAddress may incorrectly interpret
+      network addresses (6893954) [ZDI-CAN-603].
+    - (CVE-2010-0085): File TOCTOU deserialization vulnerability (6736390).
+    - (CVE-2010-0087): Unspecified vulnerability in the Java Web Start, Java
+      Plug-in component allows remote attackers to affect confidentiality,
+      integrity, and availability via unknown vectors.
+    - (CVE-2010-0091): Unsigned applet can retrieve the dragged information
+      before drop action occurs (6887703).
+    - (CVE-2010-0088): Inflater/Deflater clone issues (6745393).
+    - (CVE-2010-0084): Policy/PolicyFile leak dynamic ProtectionDomains
+      (6633872).
+    - (CVE-2010-0092): AtomicReferenceArray causes SIGSEGV -> SEGV_MAPERR
+      error (6888149).
+    - (CVE-2010-0094): Deserialization of RMIConnectionImpl objects should
+      enforce stricter checks (6893947) [ZDI-CAN-588].
+    - (CVE-2010-0093): System.arraycopy unable to reference elements
+      beyond Integer.MAX_VALUE bytes (6892265).
+    - (CVE-2010-0840): Applet Trusted Methods Chaining Privilege Escalation
+      Vulnerability (6904691).
+    - (CVE-2010-0848): AWT Library Invalid Index Vulnerability (6914823).
+    - (CVE-2010-0847): ImagingLib arbitrary code execution vulnerability
+      (6914866).
+    - (CVE-2009-3555): TLS: MITM attacks via session renegotiation.
+    - 6639665: ThreadGroup finalizer allows creation of false root
+      ThreadGroups.
+    - 6898622: ObjectIdentifer.equals is not capable of detecting incorrectly.
+      encoded CommonName OIDs.
+    - 6910590: Application can modify command array in ProcessBuilder.
+    - 6909597: JPEGImageReader stepX Integer Overflow Vulnerability.
+    - 6932480: Crash in CompilerThread/Parser. Unloaded array klass?
+    - 6898739: TLS renegotiation issue.
+
+ -- Matthias Klose <doko at canonical.com>  Tue, 30 Mar 2010 23:07:56 +0000
+
+sun-java6 (6.18-4) unstable; urgency=low
+
+  * Package sun-java6-plugin now register plugins for various browser
+    (Closes: #534174)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 24 Mar 2010 11:50:06 +0100
+
+sun-java6 (6.18-3) unstable; urgency=low
+
+  * Update of the docs filenames (Closes: #523390)
+  * Swedish debconf templates translation updated (Closes: #570023)
+  * Chinese (zh_CN) debconf templates translation updated
+  * Czech debconf templates translation updated (Closes: #570062)
+  * French debconf templates translation updated (Closes: #570060)
+  * Slovak debconf templates translation updated (Closes: #570061)
+  * Russian debconf templates translation updated (Closes: #570541)
+  * German debconf templates translation updated (Closes: #570741)
+  * Portuguese debconf templates translation updated (Closes: #571042)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 05 Mar 2010 14:55:36 +0100
+
+sun-java6 (6.18-2) unstable; urgency=low
+
+  * Package moved under the Debian Java team
+  * Add myself as uploader (Closes: #544629)
+  * Update of the Vcs-Svn & Vcs-Browser fields
+  * Cleanup the version numbers (- in the version was messing up)
+    (Closes: #445343)
+  * Update of the license URL from http://java.sun.com/notes (404)
+    to http://download.java.net/dlj/jdk6/LICENSE (Closes: 569352)
+  * French debconf templates translation updated (Closes: #569282)
+  * Czech debconf templates translation updated (Closes: #569294)
+  * Japanese debconf templates translation updated (Closes: #569312)
+  * Italien debconf templates translation updated
+  * Slovak debconf templates translation updated (Closes: #569489)
+  * Fix Incorrect Menu Entry for Java Web Start
+    Reuse javaws.wrapper from openjdk (Closes: #489833)
+  * Konqueror also available as a browser (Closes: #514983)
+	
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 11 Feb 2010 09:27:04 +0100
+
+sun-java6 (6-18-1) unstable; urgency=low
+
+  * QA upload.
+  * Non-maintainer upload.
+  * New upstream version.
+    Release notes at http://java.sun.com/javase/6/webnotes/6u18.html
+  * Rephrase on the license approval (Closes: #541881)
+  * Update messages to show the actual $TMP instead of /tmp 
+    (Closes: #539556; #506890)
+  * Standards-Version updated to version 3.8.4
+  * Replace jconsole => jvisualvm in the menu (Closes: #539288)
+  * fontconfig.properties uses uming.ttc instead of uming.ttc (Closes: #566088)
+  * Integration of the Galician translation. Thanks marce. (Closes: #537543)
+  * Integration of the Slovak translation. Thanks Ivan Masár (Closes: #535184)
+  * Integration of the Simplified Chinese translation. Thanks Ji ZhengYu
+    (Closes: #535184)
+  * dh_desktop removed from debian/rules
+  * not-binnmuable-all-depends-any fixed
+	
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 08 Feb 2010 15:01:36 +0100
+
+sun-java6 (6-17-1) unstable; urgency=low
+
+  * QA upload.
+  * New upstream version. (Closes: #558173)
+    Release notes at http://java.sun.com/javase/6/webnotes/6u17.html
+
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 28 Nov 2009 19:02:56 +0100
+
+sun-java6 (6-16-1) unstable; urgency=low
+
+  * QA upload.
+  * Remove `Uploaders' attribute.
+  * New upstream version.
+    Release notes at http://java.sun.com/javase/6/webnotes/6u16.html
+  * Fix some more lintian warnings.
+  * Stop building sun-java6-doc, it's an installer package anyway.
+    Suggest openjdk-6-doc instead.
+  * Mention compatibility problems with some window managers and running with
+    AWT_TOOLKIT=MToolkit in README.Debian. See #504524.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 28 Aug 2009 10:24:29 +0200
+
+sun-java6 (6-15-1) unstable; urgency=medium
+
+  * New upstream version.
+    Release notes at http://java.sun.com/javase/6/webnotes/6u15.html
+    Addresses CVE-2009-0217, CVE-2009-2475, CVE-2009-2476, CVE-2009-2625,
+    CVE-2009-2670, CVE-2009-2671, CVE-2009-2672, CVE-2009-2673, CVE-2009-2674,
+    CVE-2009-2675, CVE-2009-2676, CVE-2009-2690.
+  * Set section names to java.
+  * Orphan the package.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 07 Aug 2009 13:05:35 +0200
+
+sun-java6 (6-14-1) unstable; urgency=low
+
+  * New upstream version.
+    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
+  * Add xulrunner-1.9 as a browser alternative. Closes: #526227.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue, 02 Jun 2009 18:49:25 +0200
+
+sun-java6 (6-13-1) unstable; urgency=low
+
+  * New upstream version. Closes: #521414. LP: #349135.
+    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
+    Fixes CVE-2006-2426, CVE-2009-1093, CVE-2009-1094, CVE-2009-1095,
+    CVE-2009-1096, CVE-2009-1097, CVE-2009-1098, CVE-2009-1099, CVE-2009-1100,
+    CVE-2009-1101, CVE-2009-1102, CVE-2009-1103, CVE-2009-1104, CVE-2009-1105,
+    CVE-2009-1106, CVE-2009-1107.
+  * Fix name of the downloaded doc zip.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 29 Mar 2009 19:12:49 +0200
+
+sun-java6 (6-12-1) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 06 Feb 2009 15:39:56 +0100
+
+sun-java6 (6-12-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release. Closes: #508195, #507979.
+    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
+  * Build the -plugin package on amd64. Closes: #508871.
+  * Install desktop files for javaws and the plugin control panel on amd64.
+  * Find the correct doc zip when installing the -doc package. LP: #85969.
+    LP: #321863.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 06 Feb 2009 14:03:30 +0100
+
+sun-java6 (6-11-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release.
+    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
+  * sun-java6-plugin: Use the libnpjp2 plugin instead of libjavaplugin_oji.
+    LP: #291135.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 03 Dec 2008 11:43:53 +0100
+
+sun-java6 (6-10-1) unstable; urgency=low
+
+  * New upstream release.
+    Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 16 Oct 2008 23:42:24 +0200
+
+sun-java6 (6-07-3ubuntu2) hardy-proposed; urgency=low
+
+  * New upstream bug fix release. LP: #254997.
+    - Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
+    - Including security related changes.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue, 05 Aug 2008 18:37:50 +0200
+
+sun-java6 (6-07-4) unstable; urgency=low
+
+  * Ignore errors when registering the jar binfmt. The alternative may
+    already be registered by another JVM (openjdk-6, cacao-oj6).
+  * Ignore errors when generating the java shared archive. Closes: #493085.
+    LP: #247296.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue, 05 Aug 2008 17:54:06 +0200
+
+sun-java6 (6-07-3) unstable; urgency=low
+
+  * Use recent macro names in the control file for releases that support these.
+  * Bump debhelper to v5.
+
+  [ Following changes by Philipp Hahn]
+  * Don't remove alternatives on upgrade. Closes: #490249.
+  * debian/control: Add Pre-Depends: debconf for bin-package,
+    add Homepage-field.
+  * debian/copyright: Reference /usr/share/common-licenses/{LGPL-2,Apache-2.0},
+    convert to UTF-8.
+  * debian/JB-doc.postinst.in: /chown/s/./:/.
+  * debian/*.menu.in: s/Apps/Applications/.
+  * debian/rules: rm ...javadb.../*.bat.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 11 Jul 2008 15:46:13 +0200
+
+sun-java6 (6-07-2ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Regenerate the control file.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 10 Jul 2008 14:05:05 +0000
+
+sun-java6 (6-07-2) unstable; urgency=low
+
+  * Ignore errors during activation of class data sharing.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 10 Jul 2008 15:42:54 +0200
+
+sun-java6 (6-07-1) unstable; urgency=low
+
+  * debian/control.in: Update Xb-Npp-MimeType.
+  * Let update-java-alternatives handle the jexec alternative. Closes: #477673.
+  * Ignore errors during activation of class data sharing. Closes: #428142.
+  * Update sv translation for debconf template (Martin Bagge). Closes: #488184.
+  * Distributions are not allowed to package the released versions published
+    at http://java.sun.com/javase/downloads and have to wait for the
+    availability of the DLJ bundles. No need to file reports. Closes: #485913.
+  * Allow epiphany-gecko | epiphany-webkit as browser alternatives.
+  * Remove konqueror as browser alternative, requested in report.
+    Closes: #477204.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 10 Jul 2008 11:49:10 +0200
+
+sun-java6 (6-07-0ubuntu1) intrepid; urgency=low
+
+  * New upstream bug fix release.
+    - Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 09 Jul 2008 11:15:28 +0200
+
+sun-java6 (6-06-1ubuntu1) hardy-proposed; urgency=low
+
+  * Fix names for browser alternatives in jinfo file, set browser_plugin_dirs
+    unconditionally.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 28 Apr 2008 13:54:52 +0200
+
+sun-java6 (6-06-1) unstable; urgency=low
+
+  * Upload to unstable. Closes: #474932.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 16 Apr 2008 18:51:00 +0200
+
+sun-java6 (6-06-0ubuntu1) hardy; urgency=low
+
+  * New upstream bug fix release.
+    - Release notes at http://java.sun.com/javase/6/webnotes/ReleaseNotes.html.
+    - Fixes Xlib/XCB locking problems. LP: #86103. Closes: #414535.
+    - Update timezone information. Closes: #468234.
+  * Don't open the control panel when starting a WebStart application.
+    LP: #84501.
+  * javaws.desktop: Add `%u' to the Exec key, remove -viewer option. 
+    Closes: #436645.
+  * Suggest ttf-wqy-zenhei instead of ttf-arphic-uming (only available in .ttc
+    format not supported by Sun Java) (Arne Goetje). LP: #213925.
+  * Only use the basename for icons in desktop files. LP: #207413.
+  * Add XS-Autobuild: yes attribute. Closes: #473164.
+  * ia32-sun-java6-bin: Recommend lib32nss-mdns on amd64. Closes: #430917.
+  * JB-bin.postinst.in: Call java -client -Xshare:dump with -Xmx1m, if the
+    memory is available. Closes: #425654, #428654.
+  * binfmt-support: Handle /usr/share/binfmts/jar as a slave symlink of
+    the jexec alternative, install the binfmt file in the jre libdir.
+    Use the jexec alternative in the binfmt file.
+  * Don't fail on removal, if /var/lib/binfmts/openjdk-6 is missing.
+    Closes: #441880.
+  * README.Debian: Clarify about configuring the ControlPanel. Closes: #459435.
+  * Don't include empty directories in /usr/share. Closes: #472995.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 16 Apr 2008 01:02:07 +0200
+
+sun-java6 (6-05-1) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 26 Mar 2008 02:00:33 +0100
+
+sun-java6 (6-05-0ubuntu1) hardy; urgency=low
+
+  * New upstream bug fix release.
+    This was released today on https://jdk-distros.dev.java.net/developer.html.
+    Distributions are not allowed to package the released versions published
+    at http://java.sun.com/javase/downloads and have to wait for the
+    availability of the DLJ bundles. No need to file reports like LP: #199477.
+  * Install all desktop files in /usr/share/applications.
+  * sun-java6-jdk: Add java*-sdk provides.
+  * Adjust plugin links for xulrunner-1.9. LP: #173966, #198633.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue, 25 Mar 2008 23:33:13 +0000
+
+sun-java6 (6-04-2) unstable; urgency=low
+
+  * Install icons in /usr/share/pixmaps; debhelper silently generates
+    wrong code for icons installed in /usr/share/icons. Addresses: #462727.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 04 Feb 2008 22:16:31 +0100
+
+sun-java6 (6-04-1) unstable; urgency=low
+
+  * Provide the -headless versions of the runtime as well.
+  * Upstream doesn't link with g++-3.3 anymore; drop dependency on libstdc++5.
+    Closes: #449052.
+  * Fix removal of alternatives. Closes: #437083.
+  * README.alternatives: Fix update-java-alternatives example. Closes: #452320.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 25 Jan 2008 16:54:54 +0100
+
+sun-java6 (6-04-0ubuntu1) hardy; urgency=low
+
+  * New upstream bug fix release.
+  * sun-java6-jre: Provide java-runtime packages. LP: #181028.
+  * Register plugin for firefox-3.0.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 18 Jan 2008 10:06:14 +0100
+
+sun-java6 (6-03-2) unstable; urgency=low
+
+  * Fix package removal (unregister binary format).
+
+ -- Matthias Klose <doko at debian.org>  Wed, 03 Oct 2007 18:37:35 +0200
+
+sun-java6 (6-03-1) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 27 Sep 2007 23:42:40 +0200
+
+sun-java6 (6-03-0ubuntu1) gutsy; urgency=low
+
+  * New upstream bug fix release.
+  * Re-add the sun-java6-db package, now included upstream again.
+  * Fix lintian warnings for menu files.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 27 Sep 2007 15:42:00 +0200
+
+sun-java6 (6-02-2) unstable; urgency=low
+
+  * Register jar binfmt.
+  * Merge from Ubuntu:
+    - Add Xb-Npp-xxx tags (Hilario Montoliu). See
+      https://blueprints.launchpad.net/ubuntu/+spec/firefox-distro-addon-support.
+    - Register the plugin for more browsers.
+    - Build packages for the lpia architecture.
+  * debian/control: Add XS-Vcs fields.
+  * Changed font configuration to fix CJK font support (Arne Goetje).
+ 
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 29 Aug 2007 21:42:44 +0200
+
+sun-java6 (6-02-1ubuntu3) gutsy; urgency=low
+
+  * debian/rules: Fix typo in binfmts directory name.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 07 Sep 2007 18:28:50 +0000
+
+sun-java6 (6-02-1ubuntu2) gutsy; urgency=low
+
+  * Register jar binfmt.
+  * debian/control: Add XS-Vcs fields.
+  * Changed font configuration to fix CJK font support (Arne Goetje).
+ 
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 07 Sep 2007 18:13:46 +0200
+
+sun-java6 (6-02-1ubuntu1) gutsy; urgency=low
+
+  * Add Xb-Npp-xxx tags (Hilario Montoliu). See
+    https://blueprints.launchpad.net/ubuntu/+spec/firefox-distro-addon-support.
+  * Register the plugin for more browsers.
+  * Build packages for the lpia architecture.
+  * debian/control: Add XS-Vcs fields.
+ 
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 30 Jul 2007 17:34:07 +0200
+
+sun-java6 (6-02-1) unstable; urgency=low
+
+  * New upstream bug fix release. Closes LP: #126059.
+
+  * WARNING: Remove the sun-java6-db package. Apparently the javadb
+    sources are not included in the DLJ bundles while these are still
+    included in the standard bundles. The fix will most likely have
+    to wait until the 6u3 update. Please don't use the 6-02 package
+    for any backport.
+
+  * sun-java6-bin: Make libnss-mdns a recommendation. Closes: #432661.
+  * sun-java6-plugin: Change the dependency iceape -> iceape-browser.
+    Closes: #432593.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 18 Jul 2007 22:55:01 +0200
+
+sun-java6 (6-01-1) unstable; urgency=low
+
+  * JDK image parsing library vulnerabilities fixed in new upstream.
+    CVE-2007-2789.
+  * sun-java6-bin: Depend on libnss-mdns. Closes: #410116.
+  * README.alternatives: Use correct syntax. Closes: #409911.
+  * Updated russian debconf templates translation. Closes: #409802.
+  * README.Debian: The plugin is only available for 32bit. Closes: #411283.
+  * Add portuguese translation for debconf messages. Closes: #413928.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 29 Jun 2007 00:54:31 +0200
+
+sun-java6 (6-01-0ubuntu1) gutsy; urgency=low
+
+  * New upstream bug fix release. Closes LP: #115687.
+    Closes: #418004, #422403, #424047.
+  * Update fontconfig.properties for Japanese. Closes LP: #115573.
+  * Update fontconfig.properties for Korean. Closes LP: #113494.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 27 Jun 2007 13:07:58 +0200
+
+sun-java6 (6-00-2ubuntu3) gutsy; urgency=low
+
+  * debian/JB-plugin.postinst.in: s/mozilla-firefox/firefox/
+    install alternative to new firefox plugin directory 
+    (LP: #112994).
+  * debian/rules: don't dh_installdirs for mozilla-firefox
+    plugins directory anymore.
+
+ -- Alexander Sack <asac at ubuntu.com>  Mon, 25 Jun 2007 11:05:33 +0200
+
+sun-java6 (6-00-2ubuntu2) feisty; urgency=low
+
+  * Use the unversioned jvm path for the man page alternatives.
+    Ubuntu #93619.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue,  3 Apr 2007 12:30:01 +0200
+
+sun-java6 (6-00-2ubuntu1) feisty; urgency=low
+
+  [ Matthias Klose ]
+  * Add russian po-debconf translation. Closes: #409802.
+  * Add menu entry for jconsole. Ubuntu #83384.
+  * Move javadb demos to /usr/share/doc.
+
+  [ Tom Marble ]
+  * Added the optional sun-java6-javadb package
+  * Updated TODO
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 12 Feb 2007 12:27:21 +0100
+
+sun-java6 (6-00-2) unstable; urgency=low
+
+  * sun-java6-plugin: please add an alternative dependency on iceape-browser.
+    Addresses: #406954.
+  * Fix installation of sun-java6-plugin. Closes: #407134.
+  * sun-java6-bin: Depend on libstdc++5. Closes: #407197. Ubuntu #78663.
+  * Start javaws with the -viewer option. Ubuntu #78169.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 17 Jan 2007 22:52:30 +0100
+
+sun-java6 (6-00-1) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * Configure plugin for iceape and iceweasel. Addresses: #404808.
+  * Clarify short descriptions. Addresses: #404608.
+  * Add spanish po-debconf translation (Steve Lord Flaubert). Closes: #404746.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon,  2 Jan 2007 18:11:50 +0100
+
+sun-java6 (6-00-0ubuntu1) feisty; urgency=low
+
+  [ Tom Marble ]
+  * Packaging based on sun-java5 (1.5.0-10-1)
+  * Initial packaging for JDK 6
+
+  [ Matthias Klose ]
+  * debian/rules: Differentiate between JDK version (6) and
+    API version (1.6.0).
+  * debian/rules: First release doesn't have a CHANGES file.
+  * Adjust jar and tarball comparision for JDK 6.
+  * debian/control.in: The demo directory is now listed as optional.
+    Let -jdk suggest -demo instead of depending on it. Closes: #367562.
+  * management/*: Mark as configuration files.
+  * psfontj2d.properties, psfont.properties.ja, fontconfig.*.*:
+    Don't mark as configuration files.
+  * Install binary demos into /usr/lib. Closes: #392415.
+
+ -- Matthias Klose <doko at ubuntu.com>  Tue, 19 Dec 2006 13:37:44 +0100
+
+sun-java5 (1.5.0-10-1) unstable; urgency=medium
+
+  * New upstream release. Closes: #393153.
+    - CVE-2006-2426 is fixed. Closes: #384734.
+    - CVE-2006-5201 is fixed. Closes: #393042.
+  * ia32-sun-java5-bin: Depend on ia32-libs. Ubuntu #71933.
+  * Don't install javaplugin for obsolete mozilla-snapshot package.
+    Closes: #396590.
+  * Add german po-debconf template translation (Matthias Julius).
+    Closes: #398641.
+  * README.alternatives: Fix update-java-alternatives parameters.
+    Closes: #394994.
+  * Add iceweasel as a browser alternative. Closes #399553.
+  * sun-java5-jre: Provide java1-runtime. Closes: #387192.
+
+ -- Matthias Klose <doko at debian.org>  Tue,  5 Dec 2006 23:24:48 +0100
+
+sun-java5 (1.5.0-08-1) unstable; urgency=low
+
+  * New upstream release. Closes: #382919.
+  * Update packaging to reflect changed file names and date stamps.
+  * The jre and sdk README's clarify the distribution in native
+    distribution packaging formats and repository mechanisms.
+    Closes: #370296.
+  * Update/new translations (sv, fr, da, ja, cs) for the debconf templates.
+    Closes: #375745, #377969, #379411, #382931.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 17 Aug 2006 22:19:41 +0200
+
+sun-java5 (1.5.0-07-1) unstable; urgency=low
+
+  * New upstream release.
+  * The FAQ for the DLJ is now part of the LICENSE file.
+
+  [Jeroen van Wolffelaar]
+  * Drop duplicate uploader name, change my email address
+  * Fix typo in package description (Closes: #367493)
+
+  [Matthias Klose]
+  * Include copyright templates in the -jre and -bin packages.
+    Closes: #367504.
+  * Do not use the generated debconf template files. Closes: #367530.
+  * Add debian/sharedmimeinfo. Addresses: #367445.
+  * JB-java.desktop.in, JB-javaws.desktop.in: Add Encoding=UTF-8.
+  * JB-policytool.desktop.in, JB-controlpanel.desktop.in: Remove GNOME
+    from categories.
+  * fontconfig.properties: Use sazanami fonts instead of kochi.
+    Closes: #367573.
+  * Fix display of chinese characters. Ubuntu #47045.
+  * Provide alternatives for the corba tools. Ubuntu #44966.
+  * Give a more verbose error message when the license or the agreement
+    question cannot be presented; point to 'dpkg-reconfigure debconf' to
+    select a frontend other than noninteractive. Ubuntu #44891, #45292, #46096.
+  * Add upstream homepage URL to copyright, regenerate copyright file.
+    Closes: #368083.
+  * Add French debconf templates translation (Florentin Duneau).
+    Closes: #368766.
+  * Add the FAQ for the Operating System Distributor License for Java (DLJ).
+  * Add konqueror as an alternative dependency in the plugin package.
+    Ubuntu #49320.
+
+  [Tom Marble]
+  * updated JAVA_HOME.in to reflect the one (1) directory for 
+    for the JRE and JDK (thanks to some clever symlinking).
+  * Fixed proposed args to update-java-alternatives (UJA) 
+    in README.alternatives.in  Addresses: #376888
+  * Updated Debian installation documentation (for etch) at
+    https://jdk-distros.dev.java.net/debian.html
+  * Added Swedish debconf templates translation (Daniel Nylander) 
+    Addresses: #375745
+  
+ -- Matthias Klose <doko at ubuntu.com>  Tue,  6 Jun 2006 15:05:53 +0200
+
+sun-java5 (1.5.0-06-1) unstable; urgency=low
+
+  [ Combined changelog for versions -0 up to -0.9b ]
+
+  * Initial packages, derived from the j2se1.4 packages.
+  * Update license (DJL v.1.1) and license questions in the installation
+    scripts.
+  * "Source" tarball includes both i586 and amd64 bin packages.
+  * New binary packages:
+    - New empty -plugin package, just installs the plugin alternatives.
+    - New empty -fonts package, registering the fonts in defoma.
+    - Arch independent src package, the src.zip differs on amd64
+      and i386. Check that all src.zip files are equal, besides time stamp
+      and build path differences in comments.
+    - Keep the -demo packages as a separate package; for license reasons
+      -jdk and -demo depend on each other.
+    - Split the jre in an arch and arch-indep packages; move all common
+      jar files and jar files with the same content into the -jre package.
+      Checked at build time to assert equality of the files.
+      Move common subdirectories into the -jre package.
+    - Build the -doc package (needs downloaded docs).
+    - Build ia32 runtime packages for amd64 and ia64.
+    - Rename the -src package to -source (Tom Marble).
+    - Update dependency/replacement information for the new packages.
+  * Unpack the jar files during the build, don't include the pack
+    files in the binaries; always use unpack200 from the i586 archive,
+    which works on amd64, i386 and ia64.
+  * Adjust build dependencies.
+  * Adopt fontconfig.properties.src for Debian/Ubuntu.
+  * Keep all files but the example and demo files in /usr/lib.
+  * Move the sample and demo files into /usr/share/doc/sun-java5-jdk.
+  * Use the jpackage naming conventions for the toplevel
+    directory (java-1.5.0-sun-1.5.0.06, alias java-1.5.0-sun);
+    Use the alias symlink for registering the alternatives.
+  * jre package depends on unixodbc; don't depend on unixodbc for the
+    ia32 runtime, the 32bit libraries are not packaged.
+  * ControlPanel: Fix logic to get the location of the script.
+  * Install README.html in the jdk docdir.
+  * Use /usr/lib/jvm/.sun-java5.jinfo (description file to work with
+    update-java-alternatives). Recommend the java-common package
+    including this script.
+  * Drop all version information from the dependencies on shared
+    libraries; we don't have any information about it anyway.
+  * Place the man pages for the jre tools into JAVA_HOME.
+  * Ease the generation of the copyright file to include the packaging
+    copyright, upstream copyright and third party licenses (Tom Marble).
+  * Activate class data sharing for 32bit runtimes using the client
+    VM (Juergen Kreileder).
+  * Install menu icons in xpm format, convert desktop and menu files
+    to use them.
+  * Do not provide alternatives for kinit, klist, ktab, also in packages
+    heimdal-clients, krb5-user.
+  * For the plugins, use the alternative names used by java-package:
+    netscape-javaplugin.so, mozilla-javaplugin.so, firefox-javaplugin.so.
+  * -jre: suggest the -fonts package (Tom Marble).
+  * Unpack the archives using unzip, don't run the native included
+    installer.
+
+  * Modified debconf for more user friendly license presentment:
+    elaborated dlj.templates and coordinated state machine
+    in JB-jre.preinst.in and JB-jdk.preinst.in per debconf-devel(1).
+    Thanks to Tom Marble.
+  * DLJ related code in JB-jre.config.in and JB-jdk.config.in may
+    no longer be necessary (as it is done in preinst) (Tom Marble).
+
+  * Fix charset encoding of license, making the license show in the gnome
+    frontend of debconf (Jeroen van Wolffelaar).
+  * po-debconf'ize (Jeroen van Wolffelaar).
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 14 May 2006 20:30:38 +0200
+
+j2se1.4-i586 (1.4.2.03-1) unstable; urgency=low
+
+  * New upstream version.
+    Fixes security vulnerabilities in the Java runtime environment which may
+    allow an untrusted applet to elevate its privileges.
+    http://sunsolve.sun.com/search/document.do?assetkey=1-26-102003-1
+  * Add new dependency package j2re1.4-mozilla-plugin to hold all dependencies
+    needed to run the mozilla browser plugin. Taken from Ubuntu.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 28 Nov 2005 09:48:28 +0000
+
+j2se1.4-i586 (1.4.2.02-2) unstable; urgency=low
+
+  * Package rebuild using the xorg packages.
+  * Build-depend on xlibs, libasound2.
+  * Reflect change of menu directory.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 19 Sep 2005 09:04:43 +0000
+
+j2se1.4-i586 (1.4.2.02-1) testing unstable; urgency=low
+
+  * Update to 1.4.2-02.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 14 Jun 2005 16:51:49 +0200
+
+j2se1.4-i586 (1.4.2.01-2) testing unstable; urgency=low
+
+  * Reset license question seen state in *.config to prevent installation
+    problems when license wasn't accepted in the first run (closes: #301064)
+  
+  * Fix AMD64 plug-in link
+
+ -- Juergen Kreileder <jk at blackdown.de>  Fri, 21 Jan 2005 18:06:01 +0100
+
+j2se1.4-i586 (1.4.2.01-1) unstable; urgency=low
+
+  * Juergen Kreileder <jk at blackdown.de>
+    - 1.4.2-01 release
+    - Run update-desktop-database
+    - Add hidden .desktop for executing JAR files with java
+
+  * Matthias Klose <doko at debian.org>
+    - Fix package version.
+    - Cleanup debian/rules.
+    - Keep HtmlConverter in the sdk package.
+
+ -- Juergen Kreileder <jk at blackdown.de>  Mon, 22 Nov 2004 01:17:41 +0100
+
+j2se1.4-i586 (1.4.2-1) unstable; urgency=low
+
+  * 1.4.2-fcs release
+
+  * Matthias Klose <doko at debian.org>
+    - Recommend libasound and xlibs, do not depend on it.
+    - Fix locations of gnome menu entries, drop entries for docs.
+    - j2re1.4 replaces j2se-common.
+
+  * Juergen Kreileder <jk at blackdown.de>
+    - Gnome mime support. JAR files can be started using nautilus.
+    - Java web start applications works with Gnome 2.8.
+    - Gnome icons for mimetapes.
+    - Updated JCE URL's.
+    - Don't remove needed empty directories in binary target.
+
+ -- Matthias Klose <doko at debian.org>  Sat,  7 Aug 2004 09:53:29 +0200
+
+j2se1.4-i586 (1.4.1.98-1) unstable; urgency=low
+
+  * First Debian package of upstream release 1.4.2 rc1.
+
+  * Joris Patroons <jopa at kotnet.org>
+
+    - Lots of changes, all coming from blackdown. Read their docs.
+    - Fixed minor postinst bug.
+    - Original jvm.cfg is now in the i386 subdirectory (we put it in /etc)
+    - Handle licenses using debconf.
+
+  * Matthias Klose <doko at debian.org>
+
+    - Merged with the packaging of Joris Patroons <jopa at kotnet.org>
+    - Cleanup gnome desktop files.
+    - Add menu support for j2re1.4, j2sdk1.4-demo.
+    - Add doc-base support for j2re1.4, j2sdk1.4.
+    - Add support for mozilla-firefox.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 24 Jan 2004 09:38:09 +0100
+
+j2se1.4-i586 (1.4.2~rc1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 18 Dec 2003 22:45:23 +0100
+
+j2se1.4-i586 (1.4.1.01-1.1) unstable; urgency=low
+
+  * Update build dependencies.
+
+ -- Matthias Klose <doko at debian.org>  Sat,  6 Dec 2003 09:09:15 +0100
+
+j2se1.4-i386 (1.4.1-6) unstable; urgency=low
+
+  * Ok, removed the sed4 dependency again, and finally fixed all the
+    .desktop files. Many thanks go to Andrew Lau.
+
+ -- Joris Patroons <jopa at kotnet.org>  Sun,  1 Jun 2003 13:37:01 +0200
+
+j2se1.4-i386 (1.4.1-5) unstable; urgency=low
+
+  * Two minor bug fixes: the gnome menu items and a mozilla-cvs link.
+    Added build-depends on sed >=4 to fix the former, since I don't
+    know perl.
+
+ -- Joris Patroons <jopa at kotnet.org>  Sat, 31 May 2003 18:20:29 +0200
+
+j2se1.4-i386 (1.4.1-4) unstable; urgency=low
+
+  * Fixed a minor bug in debian/rules that copied the Japanese
+    manpages over the English ones.
+
+ -- Joris Patroons <jopa at kotnet.org>  Mon, 26 May 2003 00:21:57 +0200
+
+j2se1.4-i386 (1.4.1-3) unstable; urgency=low
+
+  * Fixed a small but nasty bug in the JavaPluginControlPanel script.
+
+ -- Joris Patroons <jopa at kotnet.org>  Thu, 22 May 2003 18:37:01 +0200
+
+j2se1.4-i386 (1.4.1-2) unstable; urgency=low
+
+  * Installation now creates /etc/.java/.systemPrefs/ and two files in it,
+    needed by the Blackdown jre. Purge will rm -rf /etc/.java/.
+
+  * Fixed a lot of things in the debian/ dir, unimportant to end users.
+
+ -- Joris Patroons <jopa at kotnet.org>  Sun, 20 Apr 2003 01:57:46 +0200
+
+j2se1.4-i386 (1.4.1-1) unstable; urgency=low
+
+  * Used Stephen's debian/ directory to package j2se 1.4.1 (final),
+    compiled with gcc-3.2 for compatibility with sid's mozilla.
+
+ -- Joris Patroons <jopa at kotnet.org>  Mon,  7 Apr 2003 18:44:21 +0200

Deleted: tags/sun-java6/6.21-1/debian/control
===================================================================
--- trunk/sun-java6/debian/control	2010-07-28 07:19:11 UTC (rev 12829)
+++ tags/sun-java6/6.21-1/debian/control	2010-07-28 12:57:48 UTC (rev 12833)
@@ -1,166 +0,0 @@
-Source: sun-java6
-Section: non-free/java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5.0.51~), lsb-release, po-debconf, defoma, unzip, bzip2, patch, libasound2, unixodbc, libx11-6, libxext6, libxi6, libxp6, libxt6, libxtst6, lib32asound2 [amd64], ia32-libs [amd64 ia64]
-Standards-Version: 3.8.4
-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
-Homepage: https://jdk-distros.dev.java.net
-
-Package: sun-java6-jre
-Section: non-free/java
-Architecture: all
-Provides: java-virtual-machine, java-runtime, java2-runtime, java5-runtime, java6-runtime, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless
-Pre-Depends: debconf (>= 0.5) | debconf-2.0
-Depends: java-common (>= 0.24), locales, sun-java6-bin (>= ${source:Version}) | ia32-sun-java6-bin (>= ${source:Version}), ${misc:Depends}
-Recommends: gsfonts-x11
-Suggests: sun-java6-plugin | ia32-sun-java6-plugin, sun-java6-fonts, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-kochi-gothic | ttf-sazanami-gothic, ttf-kochi-mincho | ttf-sazanami-mincho, ttf-arphic-uming,
-Replaces: sun-java6-bin, ia32-sun-java6-bin
-Conflicts: j2se-common
-Description: Sun Java(TM) Runtime Environment (JRE) 6 (architecture independent files)
- The Sun Java Platform Standard Edition Runtime Environment (JRE) 6
- contains the Java virtual machine, runtime class libraries, and 
- Java application launcher that are necessary to run programs written 
- in the Java progamming language. It is not a development environment and
- doesn't contain development tools such as compilers or debuggers.
- For development tools, see the Java Development Kit JDK(TM) 6
- (package sun-java6-jdk).
- .
- NOTE: You must accept Sun's EULA prior to successfully installing
- this package
- .
- This package contains architecture independent files.
-
-Package: sun-java6-bin
-Section: non-free/java
-Architecture: amd64 i386 lpia
-Pre-Depends: debconf (>= 0.5) | debconf-2.0
-Depends: sun-java6-jre (>= ${source:Version}), ${odbc:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${shlibs:Recommends}, ${mdns:Depends}
-Suggests: binfmt-support
-Conflicts: binfmt-support (<< 1.1.2)
-Description: Sun Java(TM) Runtime Environment (JRE) 6 (architecture dependent files)
- The Sun Java Platform Standard Edition Runtime Environment (JRE) 6
- contains the Java virtual machine, runtime class libraries, and 
- Java application launcher that are necessary to run programs written 
- in the Java progamming language. It is not a development environment and
- doesn't contain development tools such as compilers or debuggers.
- For development tools, see the Java Development Kit JDK(TM) 6
- (package sun-java6-jdk).
- .
- This package contains architecture dependent files.
-
-Package: sun-java6-plugin
-Architecture: amd64 i386 lpia
-Section: non-free/web
-Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, 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
-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
- 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).
- .
- This is a metapackage containing dependencies for running Java in 
- various browsers.
-
-Package: ia32-sun-java6-bin
-Section: non-free/java
-Architecture: amd64 ia64
-Depends: sun-java6-jre (>= ${source:Version}), ia32-libs, ${shlibs:Depends}, ${odbc:Depends}, ${misc:Depends}
-Recommends: ${shlibs:Recommends}, ${mdns:Depends}, ia32-libs-gtk
-Description: Sun Java(TM) Runtime Environment (JRE) 6 (32-bit)
- The Sun Java Platform Standard Edition Runtime Environment (JRE) 6
- contains the Java virtual machine, runtime class libraries, and 
- Java application launcher that are necessary to run programs written 
- in the Java progamming language. It is not a development environment and
- doesn't contain development tools such as compilers or debuggers.
- For development tools, see the Java Development Kit JDK(TM) 6
- (package sun-java6-jdk).
- .
- This package contains architecture dependent files for ia32.
-
-Package: ia32-sun-java6-plugin
-Architecture: amd64 ia64
-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
-Description: The 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).
- .
- This is a metapackage containing dependencies for running Java in 
- various browsers.
-
-Package: sun-java6-fonts
-Section: non-free/fonts
-Architecture: all
-Depends: sun-java6-jre (>= ${source:Version}), defoma, ${misc:Depends}
-Provides: ttf-lucida
-Conflicts: ttf-lucida
-Description: Lucida TrueType fonts (from the Sun JRE)
- The Lucida fonts are included in the sun-java6-jre package.
- This package makes the fonts available to defoma.
-
-Package: sun-java6-jdk
-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
-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, 
- applets, and components using the Java programming language.
- .
- The JDK includes tools useful for developing and testing programs 
- written in the Java programming language and running on the Java 
- Platform.
- .
- NOTE: You must accept Sun's EULA prior to successfully installing
- this package
-
-Package: sun-java6-demo
-Architecture: amd64 i386 lpia
-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
-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.
- .
- This package contains the examples and demonstration files.
-
-Package: sun-java6-source
-Architecture: all
-Depends: sun-java6-jdk (>= ${source:Version}), ${misc:Depends}
-Conflicts: sun-java6-src
-Replaces: sun-java6-src
-Description: Sun Java(TM) Development Kit (JDK) 6 source files
- The JDK(TM) is a development environment for building applications, 
- applets, and components using the Java programming language.
- .
- This package contains the Java programming language source 
- files (src.zip) for all classes that make up the Java core API.
-
-Package: sun-java6-javadb
-Architecture: all
-Section: non-free/java
-Depends: sun-java6-jdk (>= ${source:Version}), ${misc:Depends}
-Enhances: sun-java6-jdk
-Description: Java(TM) DB, Sun Microsystems' distribution of Apache Derby
- Java DB is Sun's supported distribution of the open source Apache 
- Derby 100% Java technology database. It is fully transactional, secure, 
- easy-to-use, standards-based -- SQL, JDBC API, and Java EE -- yet small, 
- only 2MB.
- .
- This package adds the optional Java DB to your JDK 6 installation.
- .
- For more information, check out the Java DB website:
- http://developers.sun.com/prodtech/javadb/

Copied: tags/sun-java6/6.21-1/debian/control (from rev 12832, trunk/sun-java6/debian/control)
===================================================================
--- tags/sun-java6/6.21-1/debian/control	                        (rev 0)
+++ tags/sun-java6/6.21-1/debian/control	2010-07-28 12:57:48 UTC (rev 12833)
@@ -0,0 +1,166 @@
+Source: sun-java6
+Section: non-free/java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 5.0.51~), lsb-release, po-debconf, defoma, unzip, bzip2, patch, libasound2, unixodbc, libx11-6, libxext6, libxi6, libxp6, libxt6, libxtst6, lib32asound2 [amd64], ia32-libs [amd64 ia64]
+Standards-Version: 3.8.4
+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
+Homepage: https://jdk-distros.dev.java.net
+
+Package: sun-java6-jre
+Section: non-free/java
+Architecture: all
+Provides: java-virtual-machine, java-runtime, java2-runtime, java5-runtime, java6-runtime, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless
+Pre-Depends: debconf (>= 0.5) | debconf-2.0
+Depends: java-common (>= 0.24), locales, sun-java6-bin (>= ${source:Version}) | ia32-sun-java6-bin (>= ${source:Version}), ${misc:Depends}
+Recommends: gsfonts-x11
+Suggests: sun-java6-plugin | ia32-sun-java6-plugin, sun-java6-fonts, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-kochi-gothic | ttf-sazanami-gothic, ttf-kochi-mincho | ttf-sazanami-mincho, ttf-arphic-uming,
+Replaces: sun-java6-bin, ia32-sun-java6-bin
+Conflicts: j2se-common
+Description: Sun Java(TM) Runtime Environment (JRE) 6 (architecture independent files)
+ The Sun Java Platform Standard Edition Runtime Environment (JRE) 6
+ contains the Java virtual machine, runtime class libraries, and 
+ Java application launcher that are necessary to run programs written 
+ in the Java progamming language. It is not a development environment and
+ doesn't contain development tools such as compilers or debuggers.
+ For development tools, see the Java Development Kit JDK(TM) 6
+ (package sun-java6-jdk).
+ .
+ NOTE: You must accept Sun's EULA prior to successfully installing
+ this package
+ .
+ This package contains architecture independent files.
+
+Package: sun-java6-bin
+Section: non-free/java
+Architecture: amd64 i386 lpia
+Pre-Depends: debconf (>= 0.5) | debconf-2.0
+Depends: sun-java6-jre (>= ${source:Version}), ${odbc:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${shlibs:Recommends}, ${mdns:Depends}
+Suggests: binfmt-support
+Conflicts: binfmt-support (<< 1.1.2)
+Description: Sun Java(TM) Runtime Environment (JRE) 6 (architecture dependent files)
+ The Sun Java Platform Standard Edition Runtime Environment (JRE) 6
+ contains the Java virtual machine, runtime class libraries, and 
+ Java application launcher that are necessary to run programs written 
+ in the Java progamming language. It is not a development environment and
+ doesn't contain development tools such as compilers or debuggers.
+ For development tools, see the Java Development Kit JDK(TM) 6
+ (package sun-java6-jdk).
+ .
+ This package contains architecture dependent files.
+
+Package: sun-java6-plugin
+Architecture: amd64 i386 lpia
+Section: non-free/web
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}, 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
+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
+ 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).
+ .
+ This is a metapackage containing dependencies for running Java in 
+ various browsers.
+
+Package: ia32-sun-java6-bin
+Section: non-free/java
+Architecture: amd64 ia64
+Depends: sun-java6-jre (>= ${source:Version}), ia32-libs, ${shlibs:Depends}, ${odbc:Depends}, ${misc:Depends}
+Recommends: ${shlibs:Recommends}, ${mdns:Depends}, ia32-libs-gtk
+Description: Sun Java(TM) Runtime Environment (JRE) 6 (32-bit)
+ The Sun Java Platform Standard Edition Runtime Environment (JRE) 6
+ contains the Java virtual machine, runtime class libraries, and 
+ Java application launcher that are necessary to run programs written 
+ in the Java progamming language. It is not a development environment and
+ doesn't contain development tools such as compilers or debuggers.
+ For development tools, see the Java Development Kit JDK(TM) 6
+ (package sun-java6-jdk).
+ .
+ This package contains architecture dependent files for ia32.
+
+Package: ia32-sun-java6-plugin
+Architecture: amd64 ia64
+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
+Description: The 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).
+ .
+ This is a metapackage containing dependencies for running Java in 
+ various browsers.
+
+Package: sun-java6-fonts
+Section: non-free/fonts
+Architecture: all
+Depends: sun-java6-jre (>= ${source:Version}), defoma, ${misc:Depends}
+Provides: ttf-lucida
+Conflicts: ttf-lucida
+Description: Lucida TrueType fonts (from the Sun JRE)
+ The Lucida fonts are included in the sun-java6-jre package.
+ This package makes the fonts available to defoma.
+
+Package: sun-java6-jdk
+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
+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, 
+ applets, and components using the Java programming language.
+ .
+ The JDK includes tools useful for developing and testing programs 
+ written in the Java programming language and running on the Java 
+ Platform.
+ .
+ NOTE: You must accept Sun's EULA prior to successfully installing
+ this package
+
+Package: sun-java6-demo
+Architecture: amd64 i386 lpia
+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
+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.
+ .
+ This package contains the examples and demonstration files.
+
+Package: sun-java6-source
+Architecture: all
+Depends: sun-java6-jdk (>= ${source:Version}), ${misc:Depends}
+Conflicts: sun-java6-src
+Replaces: sun-java6-src
+Description: Sun Java(TM) Development Kit (JDK) 6 source files
+ The JDK(TM) is a development environment for building applications, 
+ applets, and components using the Java programming language.
+ .
+ This package contains the Java programming language source 
+ files (src.zip) for all classes that make up the Java core API.
+
+Package: sun-java6-javadb
+Architecture: all
+Section: non-free/java
+Depends: sun-java6-jdk (>= ${source:Version}), ${misc:Depends}
+Enhances: sun-java6-jdk
+Description: Java(TM) DB, Sun Microsystems' distribution of Apache Derby
+ Java DB is Sun's supported distribution of the open source Apache 
+ Derby 100% Java technology database. It is fully transactional, secure, 
+ easy-to-use, standards-based -- SQL, JDBC API, and Java EE -- yet small, 
+ only 2MB.
+ .
+ This package adds the optional Java DB to your JDK 6 installation.
+ .
+ For more information, check out the Java DB website:
+ http://developers.sun.com/prodtech/javadb/

Deleted: tags/sun-java6/6.21-1/debian/po/ja.po
===================================================================
--- trunk/sun-java6/debian/po/ja.po	2010-07-28 07:19:11 UTC (rev 12829)
+++ tags/sun-java6/6.21-1/debian/po/ja.po	2010-07-28 12:57:48 UTC (rev 12833)
@@ -1,142 +0,0 @@
-# Copyright (C) 2006 Matthias Klose <doko at ubuntu.com>
-# This file is distributed under the same license as the sun-java5 package.
-# Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2006.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: sun-java5 1.5.0-07-2\n"
-"Report-Msgid-Bugs-To: sun-java6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-03-05 15:58+0100\n"
-"PO-Revision-Date: 2006-07-23 03:42+0900\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
-"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../JB-jre.templates.in:1001
-msgid "JCE Unlimited Strength Jurisdiction Policy Files"
-msgstr "JCE 無制限強度の管轄ポリシーファイル"
-
-#. Type: note
-#. Description
-#: ../JB-jre.templates.in:1001
-msgid ""
-"Due to import control restrictions of some countries, the JCE jurisdiction "
-"policy files shipped with this package allow \"strong\" but limited "
-"cryptography to be used. An \"unlimited strength\" version of these files "
-"indicating no restrictions on cryptographic strengths is available for those "
-"living in eligible countries (which is most countries). You download this "
-"version and replace the strong cryptography versions supplied with this "
-"package with the unlimited ones."
-msgstr ""
-"一部の国の輸入規制のため、このパッケージに含まれる JCE ポリシーファイルは、"
-"「強力」であっても制限付きの暗号方式が使用されています。暗号についての規制を"
-"受けない国 (ほとんどの国です) のユーザのために、「制限のない完全」版のファイ"
-"ルが用意されています。あなたは、このファイルをダウンロードし、このパッケージ"
-"で提供されている強暗号版と無制限版を置き換えられます。"
-
-#. Type: note
-#. Description
-#: ../JB-jre.templates.in:1001
-msgid ""
-"The Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction "
-"Policy Files 1.4.2 are available at http://javashoplm.sun.com/ECom/docs/"
-"Welcome.jsp?StoreId=22&PartDetailId=7503-jce-1.4.2-oth-"
-"JPR&SiteId=JSC&TransactionId=noreg"
-msgstr ""
-"The Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction "
-"Policy Files 1.4.2 は http://javashoplm.sun.com/ECom/docs/Welcome.jsp?"
-"StoreId=22&PartDetailId=7503-jce-1.4.2-oth-"
-"JPR&SiteId=JSC&TransactionId=noreg から入手可能です。"
-
-#. Type: boolean
-#. Description
-#: ../JB-jre.templates.in:2001
-msgid "Grant the \"stopThread\" RuntimePermission?"
-msgstr "\"stopThread\" RuntimePermission を許可しますか?"
-
-#. Type: boolean
-#. Description
-#: ../JB-jre.templates.in:2001
-msgid ""
-"This permission allows any thread to stop itself using the java.lang.Thread."
-"stop() method that takes no argument."
-msgstr ""
-"このアクセス権は、どのようなスレッドであっても引数無しの java.lang.Thread."
-"stop() メソッドを使ってそのスレッド自身を終了させるのを許可します。"
-
-#. Type: boolean
-#. Description
-#: ../JB-jre.templates.in:2001
-msgid ""
-"Note that this permission is granted by default only to remain backwards "
-"compatible. It is strongly recommended that you either not grant this "
-"permission at all or restrict it manually in java.policy to code sources "
-"that you specify, because Thread.stop() is potentially unsafe."
-msgstr ""
-"この標準で許可されているアクセス権は、後方互換性の維持のためだけに存在してい"
-"るのに注意してください。Thread.stop() は潜在的に危険なため、このアクセス権を"
-"全く許可しないか、特定のソースコードに対して java.policy 内で手動で制限をかけ"
-"ることを強く推奨します。"
-
-#. Type: boolean
-#. Description
-#: ../JB-jre.templates.in:2001
-#, fuzzy
-#| msgid ""
-#| "See \"http://download.java.net/dlj/jdk6/LICENSE\" for more information."
-msgid "See \"http://java.sun.com/notes\" for more information."
-msgstr ""
-"詳細については \"http://download.java.net/dlj/jdk6/LICENSE\" を参照してくださ"
-"い。"
-
-#. Type: boolean
-#. Description
-#: ../dlj.templates:2001
-#, fuzzy
-#| msgid "Do you agree with the DLJ license terms?"
-msgid "Do you accept the DLJ license terms?"
-msgstr "DLJ ライセンス条項に同意しますか?"
-
-#. Type: boolean
-#. Description
-#: ../dlj.templates:2001
-#, fuzzy
-#| msgid ""
-#| "In order to install this package, you must agree to its license terms, "
-#| "the \"Operating System Distributor License for Java\" (DLJ), v1.1. Not "
-#| "accepting will cancel the installation."
-msgid ""
-"In order to install this package, you must accept the license terms, the "
-"\"Operating System Distributor License for Java\" (DLJ), v1.1. Not accepting "
-"will cancel the installation."
-msgstr ""
-"このパッケージをインストールするためには、\"Operating System Distributor "
-"License for Java\" (DLJ) バージョン 1.1 ライセンス条項に同意する必要がありま"
-"す。同意しない場合はインストールをキャンセルします。"
-
-#. Type: error
-#. Description
-#: ../dlj.templates:3001
-msgid "Declined Operating System Distributor License for Java v1.1 (DLJ)"
-msgstr "Operating System Distributor License for Java v1.1 (DLJ) を拒否する"
-
-#. Type: error
-#. Description
-#: ../dlj.templates:3001
-msgid ""
-"If you do not agree to the DLJ license terms you cannot install this "
-"software."
-msgstr ""
-"DLJ ライセンス条項に同意しない場合、このソフトウェアをインストールできませ"
-"ん。"
-
-#. Type: error
-#. Description
-#: ../dlj.templates:3001
-msgid "The installation of this package will be canceled."
-msgstr "このパッケージのインストールをキャンセルします。"

Copied: tags/sun-java6/6.21-1/debian/po/ja.po (from rev 12831, trunk/sun-java6/debian/po/ja.po)
===================================================================
--- tags/sun-java6/6.21-1/debian/po/ja.po	                        (rev 0)
+++ tags/sun-java6/6.21-1/debian/po/ja.po	2010-07-28 12:57:48 UTC (rev 12833)
@@ -0,0 +1,132 @@
+# Copyright (C) 2006 Matthias Klose <doko at ubuntu.com>
+#           (C) 2010 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+# This file is distributed under the same license as the sun-java6 package.
+# Hideki Yamane <henrich at debian.org>, 2006, 2010.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sun-java6 6.20-dlj-1\n"
+"Report-Msgid-Bugs-To: sun-java6 at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-05 15:58+0100\n"
+"PO-Revision-Date: 2010-05-04 07:41+0900\n"
+"Last-Translator: Hideki Yamane <henrich at debian.org>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../JB-jre.templates.in:1001
+msgid "JCE Unlimited Strength Jurisdiction Policy Files"
+msgstr "JCE 無制限強度の管轄ポリシーファイル"
+
+#. Type: note
+#. Description
+#: ../JB-jre.templates.in:1001
+msgid ""
+"Due to import control restrictions of some countries, the JCE jurisdiction "
+"policy files shipped with this package allow \"strong\" but limited "
+"cryptography to be used. An \"unlimited strength\" version of these files "
+"indicating no restrictions on cryptographic strengths is available for those "
+"living in eligible countries (which is most countries). You download this "
+"version and replace the strong cryptography versions supplied with this "
+"package with the unlimited ones."
+msgstr ""
+"一部の国の輸入規制のため、このパッケージに含まれる JCE ポリシーファイルは、"
+"「強力」であっても制限付きの暗号方式が使用されています。暗号についての規制を"
+"受けない国 (ほとんどの国です) のユーザのために、「制限のない完全」版のファイ"
+"ルが用意されています。あなたは、このファイルをダウンロードし、このパッケージ"
+"で提供されている強暗号版と無制限版を置き換えられます。"
+
+#. Type: note
+#. Description
+#: ../JB-jre.templates.in:1001
+msgid ""
+"The Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction "
+"Policy Files 1.4.2 are available at http://javashoplm.sun.com/ECom/docs/"
+"Welcome.jsp?StoreId=22&PartDetailId=7503-jce-1.4.2-oth-"
+"JPR&SiteId=JSC&TransactionId=noreg"
+msgstr ""
+"The Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction "
+"Policy Files 1.4.2 は http://javashoplm.sun.com/ECom/docs/Welcome.jsp?"
+"StoreId=22&PartDetailId=7503-jce-1.4.2-oth-"
+"JPR&SiteId=JSC&TransactionId=noreg から入手可能です。"
+
+#. Type: boolean
+#. Description
+#: ../JB-jre.templates.in:2001
+msgid "Grant the \"stopThread\" RuntimePermission?"
+msgstr "\"stopThread\" RuntimePermission を許可しますか?"
+
+#. Type: boolean
+#. Description
+#: ../JB-jre.templates.in:2001
+msgid ""
+"This permission allows any thread to stop itself using the java.lang.Thread."
+"stop() method that takes no argument."
+msgstr ""
+"このアクセス権は、どのようなスレッドであっても引数無しの java.lang.Thread."
+"stop() メソッドを使ってそのスレッド自身を終了させるのを許可します。"
+
+#. Type: boolean
+#. Description
+#: ../JB-jre.templates.in:2001
+msgid ""
+"Note that this permission is granted by default only to remain backwards "
+"compatible. It is strongly recommended that you either not grant this "
+"permission at all or restrict it manually in java.policy to code sources "
+"that you specify, because Thread.stop() is potentially unsafe."
+msgstr ""
+"この標準で許可されているアクセス権は、後方互換性の維持のためだけに存在してい"
+"るのに注意してください。Thread.stop() は潜在的に危険なため、このアクセス権を"
+"全く許可しないか、特定のソースコードに対して java.policy 内で手動で制限をかけ"
+"ることを強く推奨します。"
+
+#. Type: boolean
+#. Description
+#: ../JB-jre.templates.in:2001
+msgid "See \"http://java.sun.com/notes\" for more information."
+msgstr ""
+"詳細については \"http://java.sun.com/notes\" を参照してください。"
+
+#. Type: boolean
+#. Description
+#: ../dlj.templates:2001
+msgid "Do you accept the DLJ license terms?"
+msgstr "DLJ ライセンス条項に同意しますか?"
+
+#. Type: boolean
+#. Description
+#: ../dlj.templates:2001
+msgid ""
+"In order to install this package, you must accept the license terms, the "
+"\"Operating System Distributor License for Java\" (DLJ), v1.1. Not accepting "
+"will cancel the installation."
+msgstr ""
+"このパッケージをインストールするためには、\"Operating System Distributor "
+"License for Java\" (DLJ) バージョン 1.1 ライセンス条項に同意する必要がありま"
+"す。同意しない場合はインストールをキャンセルします。"
+
+#. Type: error
+#. Description
+#: ../dlj.templates:3001
+msgid "Declined Operating System Distributor License for Java v1.1 (DLJ)"
+msgstr "Operating System Distributor License for Java v1.1 (DLJ) を拒否する"
+
+#. Type: error
+#. Description
+#: ../dlj.templates:3001
+msgid ""
+"If you do not agree to the DLJ license terms you cannot install this "
+"software."
+msgstr ""
+"DLJ ライセンス条項に同意しない場合、このソフトウェアをインストールできませ"
+"ん。"
+
+#. Type: error
+#. Description
+#: ../dlj.templates:3001
+msgid "The installation of this package will be canceled."
+msgstr "このパッケージのインストールをキャンセルします。"

Deleted: tags/sun-java6/6.21-1/debian/rules
===================================================================
--- trunk/sun-java6/debian/rules	2010-07-28 07:19:11 UTC (rev 12829)
+++ tags/sun-java6/6.21-1/debian/rules	2010-07-28 12:57:48 UTC (rev 12833)
@@ -1,1017 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules file derived from the gcc build system
-
-unexport LANG LC_ALL
-
-export DH_OPTIONS=
-
-export SHELL=/bin/bash
-
-distribution	:= $(shell lsb_release -is)
-distrelease	:= $(shell lsb_release -cs)
-
-DEB_HOST_ARCH	?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-arch_map	:= amd64=amd64 i386=i586 lpia=i586 powerpc=ppc sparc=sparc ia64=ia64
-archdir_map	:= amd64=amd64 i386=i386 lpia=i386 powerpc=ppc sparc=sparc ia64=ia64
-
-arch		:= $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
-			$(filter $(DEB_HOST_ARCH)=%, $(arch_map))))
-archdir		:= $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
-			$(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))
-
-TOP		:= usr/lib/jvm
-dirparts	:= $(shell basename $(CURDIR) | tr '-' ' ')
-VENDOR		:= $(word 1, $(dirparts))
-Vendor		:= $(shell perl -e 'print ucfirst("$(VENDOR)");')
-javaname	:= $(shell echo $(word 2, $(dirparts)) | sed 's/[0-9.]*$$//')
-RELEASE		:= $(shell echo $(word 2, $(dirparts)) | sed 's/^[a-z]*//')
-# where to get it?
-relstring	:= 6
-PRODUCT		:= $(javaname)$(RELEASE)
-srcname		= $(VENDOR)-$(PRODUCT)
-basename	= $(ia32_prefix)$(VENDOR)-$(PRODUCT)
-dirpartsv	:= $(shell echo $(word 3, $(dirparts)) | tr '.' ' ')
-version		:= $(word 1, $(dirpartsv))
-releng_ver	:= $(word 2, $(dirpartsv))
-jdkversion	:= 1.6.0
-#unpackdir	:= jdk$(version)_$(releng_ver)
-#unpackdir	:= jdk$(jdkversion)
-unpackdir	:= jdk$(jdkversion)_$(releng_ver)
-#jdirname	:= $(ia32_prefix)java-$(version)-$(VENDOR)-$(version).$(releng_ver)
-jdirname	:= $(ia32_prefix)java-$(version)-$(VENDOR)-$(jdkversion).$(releng_ver)
-jdiralias	:= $(ia32_prefix)java-$(version)-$(VENDOR)
-srcdir		:= $(arch)-jdk
-bin_pattern	= jdk-$(subst .,_,$(version))-dlj-linux-%.bin
-bin_pattern	= jdk-6u20-dlj-linux-%.bin
-all_archs	= $(filter $(subst =, , $(arch_map)), \
-			   $(subst -, , $(patsubst %.bin, %, $(wildcard *.bin))))
-priority	:= 63
-
-tag		:= $(strip $(subst .,, $(RELEASE)))
-mantag		:= $(VENDOR)$(tag)
-
-basedir		= $(TOP)/$(jdirname)
-doc		:= usr/share/doc
-j2se_lib	:= usr/lib/$(basename)
-security	:= etc/$(jdiralias)/security
-
-bd_plugin = \
-	$(if $(filter $(distribution),Debian),libxul-dev,$(if $(filter $(distrelease),hardy),xulrunner-1.9-dev,firefox-dev))
-
-browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner konqueror
-browsers = 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
-
-# FIXME: xulrunner-addons only tested on sid, jaunty, karmic
-ifeq ($(distribution),Ubuntu)
-  browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner
-  browser_plugin_dirs = xulrunner-addons mozilla
-else
-  browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner
-endif
-
-java_launcher = /$(basedir)/bin/java
-ifeq ($(distribution),Ubuntu)
-  ifeq (,$(filter $(distrel),karmic jaunty intrepid hardy gutsy feisty edgy dapper))
-    java_launcher = cautious-launcher %f /$(basedir)/bin/java
-  endif
-endif
-
-with_wgy_zenhai = $(if $(filter $(distrelease),hardy),yes)
-
-cjk_fonts = ttf-baekmuk | ttf-unfonts | ttf-unfonts-core,
-cjk_fonts += ttf-kochi-gothic | ttf-sazanami-gothic,
-cjk_fonts += ttf-kochi-mincho | ttf-sazanami-mincho,
-cjk_fonts += $(if $(with_wgy_zenhai),ttf-wqy-zenhei,ttf-arphic-uming),
-
-lintian_overrides	:= usr/share/lintian/overrides
-
-ifneq ($(DEB_HOST_ARCH),ia64)
-  packaging_files = packaging-files
-endif
-ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 ia64))
-  with_ia32 = yes
-  ia32_packaging_files = ia32-packaging-files
-
-endif
-
-info:
-	@echo Build information
-	@echo ==========================
-	@echo 'TOP        = $(TOP)'
-	@echo 'VENDOR     = $(VENDOR)'
-	@echo 'RELEASE    = $(RELEASE)'
-	@echo 'PRODUCT    = $(PRODUCT)'
-	@echo 'basename   = $(basename)'
-	@echo 'version    = $(version)'
-	@echo 'releng_ver = $(releng_ver)'
-	@echo 'unpackdir  = $(unpackdir)'
-	@echo 'srcdir     = $(srcdir)'
-	@echo 'all_archs  = $(all_archs)'
-	@echo 'arch       = $(arch)'
-	@echo 'archdir    = $(archdir)'
-	@echo $(jre_tools)
-
-d	= debian/tmp
-
-p_jre	:= $(basename)-jre
-p_jbin	:= $(basename)-bin
-p_jdk	:= $(basename)-jdk
-p_src	:= $(basename)-source
-p_fonts	:= $(basename)-fonts
-p_demo	:= $(basename)-demo
-p_plug	:= $(basename)-plugin
-p_javadb	:= $(basename)-javadb
-
-d_jre	:= debian/$(p_jre)
-d_jbin	:= debian/$(p_jbin)
-d_jdk	:= debian/$(p_jdk)
-d_src	:= debian/$(p_src)
-d_demo	:= debian/$(p_demo)
-d_fonts	:= debian/$(p_fonts)
-d_plug	:= debian/$(p_plug)
-d_javadb	:= debian/$(p_javadb)
-
-ifneq ($(DEB_HOST_ARCH),ia64)
-  binary_arch_targets	= \
-	$(patsubst %, binary-%, $(p_jbin) $(p_jdk) $(p_demo))
-endif
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
-    binary_arch_targets	+= binary-$(p_plug)
-endif
-ifeq ($(with_ia32),yes)
-    binary_arch_targets	+= ia32-binary-bin
-    #binary_arch_targets += ia32-binary-plugin
-endif
-binary_indep_targets	:= \
-	$(patsubst %, binary-%, $(p_jre) $(p_src) $(p_fonts) $(p_javadb))
-NO_PACKAGES = -Nia32-$(p_plug)
-ifneq ($(with_ia32),yes)
-  NO_PACKAGES += -Nia32-$(p_jbin)
-endif
-
-# (most) jre and jdk tools handled by the alternatives system.
-# dups in heimdal-clients, krb5-user: kinit, klist, ktab, no alternatives
-all_jre_tools	= $(notdir $(wildcard $(srcdir)/jre/bin/*))
-corba_tools	= orbd servertool tnameserv
-jre_tools	= $(filter-out $(corba_tools), $(all_jre_tools))
-jre_tools_alt	= $(filter-out kinit klist ktab, $(jre_tools)) $(corba_tools)
-
-all_jdk_tools	= $(notdir $(wildcard $(srcdir)/bin/*))
-jdk_tools	= $(filter-out $(all_jre_tools), $(all_jdk_tools))
-jdk_tools_alt	= $(filter-out jvisualvm, $(jdk_tools))
-
-jre_manpages_re:= $(shell echo $(jre_tools) $(corba_tools) | tr -s ' ' '|')
-
-#ship_packs = yes
-ifeq ($(ship_packs),yes)
-  jre_packs	= $(shell cd $(srcdir); find jre/lib -name '*.pack')
-  jdk_packs	= $(shell cd $(srcdir); find lib -name '*.pack')
-endif
-
-# TODO: unpack both tarballs, compare them to ensure we do things right
-# these are identical files / directories
-common_jre_things = \
-	jre/lib/audio \
-	jre/lib/cmm \
-	jre/lib/fonts \
-	jre/lib/images/cursors \
-	jre/lib/oblique-fonts \
-	jre/lib/zi \
-	jre/lib/jsse.jar \
-	jre/COPYRIGHT \
-	jre/LICENSE \
-	jre/THIRDPARTYLICENSEREADME.txt \
-
-common_jdk_things = \
-
-# jar files, whith the same contents; just the time stamps differ
-common_jre_jars = \
-	jre/lib/ext/sunjce_provider.jar \
-	jre/lib/ext/dnsns.jar \
-	jre/lib/ext/localedata.jar \
-	jre/lib/jce.jar \
-	jre/lib/security/US_export_policy.jar \
-	jre/lib/security/local_policy.jar \
-	jre/lib/im/indicim.jar \
-	jre/lib/im/thaiim.jar \
-	jre/lib/charsets.jar \
-
-version_tag	:= $(shell dpkg-parsechangelog | \
-			sed -ne 's/Version: *\([0-9]\+:\)*//p')
-
-tag:
-	cvs tag -c -F $(subst .,_,$(ctp_tag)_debian_version_$(version_tag))
-ifeq ($(findstring -,$(version_tag)),)
-	cvs tag -c -F $(subst .,_,$(ctp_tag)_upstream_version_$(version_tag))
-endif
-
-showtags:
-	@echo Version: $(version)
-	@echo Release: $(release)
-	@echo CTP tag: $(ctp_tag)
-
-control: control-stamp
-control-stamp: debian/control $(ia32_packaging_files) $(packaging_files)
-	touch control-stamp
-
-build: build-stamp
-build-stamp: info unpack-stamp control-stamp
-	touch build-stamp
-
-debian/control: debian/control.in debian/rules
-	@cp -p debian/control debian/control.old
-	  sed -e 's/@JRE@/$(p_jre)/g' \
-	      -e 's/@JDK@/$(p_jdk)/g' \
-	      -e 's/@vendor@/$(Vendor)/g' \
-	      -e 's/@basename@/$(basename)/g' \
-	      -e 's, at basedir@,$(basedir),g' \
-	      -e 's/@srcname@/$(srcname)/g' \
-	      -e 's/@arch@/$(DEB_HOST_ARCH)/g' \
-	      -e 's/@sarch@/$(arch)/g' \
-	      -e 's/@RELEASE@/$(relstring)/g' \
-	      -e 's/@archdir@/$(archdir)/g' \
-	      -e 's/@browsers@/$(browsers)/g' \
-	      -e 's/@cjk_fonts@/$(cjk_fonts)/g' \
-	      -e 's, at pkg_version@,$(if $(filter $(distrelease),etch dapper edgy feisty gutsy),$${Source-Version},$${source:Version}),g' \
-	    debian/control.in > debian/control
-	@if cmp -s debian/control debian/control.old; then \
-	  rm -f debian/control.old; \
-	else \
-	  echo "debian/control did change, please restart the build"; \
-          exit 1; \
-	fi
-
-ifeq (,$(ia32_prefix))
-  in_files = debian/*.in
-else
-  in_files = debian/JB-{archive,bin,control,java,policy,plugin,web}*.in
-  ia32txt= $(empty_) (32bit)
-endif
-packaging-files:
-	for f in $(in_files); do \
-	  case "$$f" in debian/control.in) continue; esac; \
-	  f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
-	  sed -e 's/@JRE@/$(p_jre)/g' \
-	      -e 's/@JDK@/$(p_jdk)/g' \
-	      -e 's/@vendor@/$(Vendor)/g' \
-	      -e 's/@RELEASE@/$(relstring)/g' \
-	      -e 's/@basename@/$(basename)/g' \
-	      -e 's, at TOP@,$(TOP),g' \
-	      -e 's, at basedir@,$(basedir),g' \
-	      -e 's, at basediralias@,$(TOP)/$(jdiralias),g' \
-	      -e 's, at jdiralias@,$(jdiralias),g' \
-	      -e 's, at jdirname@,$(jdirname),g' \
-	      -e 's/@srcname@/$(srcname)/g' \
-	      -e 's/@arch@/$(DEB_HOST_ARCH)/g' \
-	      -e 's/@sarch@/$(arch)/g' \
-	      -e 's/@archdir@/$(archdir)/g' \
-	      -e 's/@tag@/$(tag)/g' \
-	      -e 's/@ia32txt@/$(ia32txt)/g' \
-	      -e 's/@priority@/$(priority)/g' \
-	      -e 's/@mantag@/$(mantag)/g' \
-	      -e 's/@jre_tools@/$(jre_tools_alt)/g' \
-	      -e 's/@jdk_tools@/$(jdk_tools_alt)/g' \
-	      -e 's/@corba_tools@/$(corba_tools)/g' \
-	      -e 's, at jre_packs@,$(jre_packs),g' \
-	      -e 's, at jdk_packs@,$(jdk_packs),g' \
-	      -e 's, at j2se_lib@,$(j2se_lib),g' \
-	      -e 's, at browser_dirs@,$(browser_plugin_dirs),g' \
-	      -e 's, at java_launcher@,$(java_launcher),g' \
-	    $$f > $$f2; \
-	done
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
-	cat debian/$(p_jbin)-i586.menu >> $(d_jbin).menu
-	rm -f debian/$(p_jbin)-i586.menu
-endif
-ia32-packaging-files:
-	$(MAKE) -f debian/rules packaging-files \
-		ia32_prefix=ia32- \
-		packaging_files= \
-		DEB_HOST_ARCH=i386
-
-compare-jre-jars:
-	set -e; set -- $(all_archs); src1=$$1-jdk/src; shift; \
-	jars=$$(cd i586-jdk/; find jre -name '*.jar'); \
-	for j in $$jars; do \
-	  echo =======  $$j  ========; \
-	  if [ ! -f amd64-jdk/$$j ]; then \
-	    echo "file does not exist: amd64-jdk/$$j"; \
-	    continue; \
-	  fi; \
-	  d=$${j%*.jar}; \
-	  rm -rf i586-jdk/$$d amd64-jdk/$$d; \
-	  unzip -q -d i586-jdk/$$d i586-jdk/$$j; \
-	  unzip -q -d amd64-jdk/$$d amd64-jdk/$$j; \
-	  if diff -ur i586-jdk/$$d amd64-jdk/$$d; then \
-	    : ; \
-	  else \
-	    badjars="$$badjars $$j"; \
-	  fi; \
-	done; \
-	if [ -n "$$badjars" ]; then \
-	  echo "Differing jar files: $$badjars"; \
-	  exit 1; \
-	fi
-
-diff_ignore = -I 'Monday, April 12' \
-	-I 'Mon Apr 12' -I '^ *// java GenerateCharacter'
-
-with_check = yes
-
-unpack-stamp: $(foreach a, $(all_archs), unpack-$(a)-stamp)
-ifeq ($(with_check),yes)
-	: # check for identical files / trees
-	set -e; set -- $(all_archs); a1=$$1; shift; \
-	for a2; do \
-	  echo "Comparing architecture $$a1 with $$a2"; \
-	  for i in $(common_jre_things); do \
-	    echo "  Comparing $$i ..."; \
-	    if diff -ur $$a1-jdk/$$i $$a2-jdk/$$i; then \
-	      echo "    OK"; \
-	    else \
-	      echo "    differ"; \
-	      badjars="$$badthings $$i"; \
-	    fi; \
-	  done; \
-	done; \
-	if [ -n "$$badthings" ]; then \
-	  echo "Differing files/subtrees: $$badthings"; \
-	  exit 1; \
-	fi
-
-	: # check for jars with the same content
-	set -e; \
-	for j in $(common_jre_jars); do \
-	  echo "  Comparing $$j ..."; \
-	  d=$${j%*.jar}; \
-	  set -- $(all_archs); a1=$$1; shift; \
-	  mkdir -p tmp-$$a1/$$d; \
-	  unzip -q -d tmp-$$a1/$$d $$a1-jdk/$$j; \
-	  for a2; do \
-	    mkdir -p tmp-$$a2/$$d; \
-	    unzip -q -d tmp-$$a2/$$d $$a2-jdk/$$j; \
-	    if diff -ur tmp-$$a1/$$d tmp-$$a2/$$d; then \
-	      echo "    OK"; \
-	    else \
-	      echo "    differ"; \
-	      badjars="$$badjars $$j ($$a1, $$a2)"; \
-	    fi; \
-	  done; \
-	done; \
-	if [ -n "$$badjars" ]; then \
-	  echo "Differing jar files: $$badjars"; \
-	  exit 1; \
-	fi
-
-	: # check if the sources are the "same"
-	set -e; set -- $(all_archs); a1=$$1; shift; \
-	unzip -q -d tmp-$$a1/src $$a1-jdk/src.zip; \
-	for a2; do \
-	  unzip -q -d tmp-$$a2/src $$a2-jdk/src.zip; \
-	  echo "Comparing sources: tmp-$$a1/src tmp-$$a2/src ..."; \
-	  echo "    diff -ur $(diff_ignore)"; \
-	  diff -ur $(diff_ignore) tmp-$$a1/src tmp-$$a2/src; \
-	done
-
-	@echo No relevant differences
-endif
-	touch unpack-stamp
-
-unpack-amd64-stamp: unpack-i586-stamp
-
-unpack-%-stamp: $(bin_pattern)
-	rm -rf $(unpackdir)
-#	$(SHELL) tmp-$< --accept-license > /dev/null
-	binsize=$$(wc -c $< | awk '{print $$1}'); \
-	zipstart=$$(unzip -ql $< 2>&1 >/dev/null \
-			| sed -n -e 's/.* \([0-9][0-9]*\) extra bytes.*/\1/p'); \
-	tail -c $$(expr $$binsize - $$zipstart) $< > tmp-jdk.zip
-	unzip -q tmp-jdk.zip
-	mv $(unpackdir) $*-jdk
-	@echo $*
-
-	diff -u $*-jdk/LICENSE $*-jdk/jre/LICENSE
-	diff -u $*-jdk/THIRDPARTYLICENSEREADME.txt \
-	    $*-jdk/jre/THIRDPARTYLICENSEREADME.txt
-
-ifneq ($(ship_packs),yes)
-	set -e; \
-	for i in $$(find $*-jdk -name '*.pack'); do \
-	  i586-jdk/bin/unpack200 $$i \
-		$$(dirname $$i)/$$(basename $$i .pack).jar; \
-	  rm -f $$i; \
-	done
-endif
-
-	: # fix permissions
-	-find $*-jdk -name '*.properties' -o -name '*.xml' | xargs chmod 644
-
-#	for i in `find $*-jdk/man/man1` -name '*.1'; do \
-#	  mv $$i `dirname $$i`/`basename $$i .1`.$(mantag).1; \
-#	done
-	find $*-jdk/. -name "CVS" -print0 | xargs -0 rm -rf
-
-#	for i in `find $*-jdk/man/ja_JP.eucJP -name *.1.gz`; do \
-#	    mv $$i `dirname $$i`/`basename $$i 1.gz`ja.1.gz; \
-#	done
-
-	touch $@
-
-update-dlj: build-stamp
-	touch debian/dlj.templates
-
-update-copyright: build-stamp
-	jdkdir=$(srcdir) jdkdistrosdir=debian pkgdir=debian \
-	  sh debian/mkcopy.sh
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f *-stamp
-	rm -rf amd64-jdk i586-jdk tmp-* $(unpackdir)
-	rm -f debian/*.debhelper debian/more debian/control.old
-	rm -f debian/$(p_jbin).substvars.tmp
-	: # TODO: and these should be
-	: # -rm -f $(d_jre).copyright debian/copyright
-
-	for f in debian/*.in; do \
-	  f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
-	  case "$$f2" in debian/control) continue; esac; \
-	  rm -f $$f2; \
-	done
-	rm -f debian/$(basename)*.templates
-	rm -f debian/$(basename)*.links
-	rm -f debian/copyright.1*
-	rm -f debian/ia32-$(basename)*.*
-	rm -f debian/*.debhelper.log
-
-	dh_clean
-
-mrproper: clean
-	rm -rf build-stamp $(srcdir)
-
-
-binary-$(p_jbin):	DH_OPTIONS=-p$(p_jbin) $(NO_PACKAGES)
-binary-$(p_jbin):	build
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-	dh_installdirs \
-		usr/share/doc \
-		etc/$(jdiralias)/security \
-		$(basedir)/ext \
-		$(basedir)/man/man1 \
-		$(basedir)/man/ja/man1 \
-		$(basedir)/jre/man/man1 \
-		$(basedir)/jre/man/ja/man1 \
-		$(basedir)/bin/$(archdir)/native_threads \
-		usr/share/lintian/overrides \
-		usr/share/applications \
-		usr/share/application-registry \
-		usr/share/binfmts \
-		usr/share/pixmaps \
-		usr/share/mime-info \
-
-	cp -a $(srcdir)/jre $(d_jbin)/$(basedir)
-
-	echo $(basedir) $(TOP)/$(jdiralias) > $(d_jbin).links
-
-	: remove arch indep files and directories
-	rm -rf $(foreach i, $(common_jre_things) $(common_jre_jars), $(d_jbin)/$(basedir)/$(i))
-	: # icons, only in the i586 archive -> $(p_jre)
-	rm -rf $(d_jbin)/$(basedir)/jre/lib/images/icons
-
-	: # install a wrapper for javaws
-	mv $(d_jbin)/$(basedir)/jre/bin/javaws $(d_jbin)/$(basedir)/jre/bin/javaws.real
-	install -m 755 debian/javaws-wrapper.sh $(d_jbin)/$(basedir)/jre/bin/javaws
-
-
-#	: # 1.4 only
-#	rm -f $(d_jbin)/$(basedir)/jre/lib/$(archdir)/libagent.so
-#	-find $(d_jbin) -name HtmlConverter -o -name htmlconverter.jar | xargs rm -f
-
-###	: # get upstream docs out of there
-###	-rm $(d_jbin)/$(j2se_lib)/jre/{CHANGES,COPYRIGHT,INSTALL,*LICENSE*,README
-	rm -f $(d_jbin)/$(basedir)/jre/{CHANGES,INSTALL}
-
-	: # install template files as real files (all commented out)
-	for i in $(d_jbin)/$(basedir)/jre/lib/management/*.template; do \
-	  mv $$i $${i%*.template}; \
-	done
-
-	: # fix permissions
-	chmod 644 $(d_jbin)/$(basedir)/jre/lib/deploy/splash.gif
-
-	: # move config files to etc/$(jdiralias) and symlink them.
-	mkdir -p $(d_jbin)/etc/$(jdiralias)/management
-	for i in \
-	  calendars.properties \
-	  jvm.cfg \
-	  content-types.properties \
-	  logging.properties \
-	  sound.properties \
-	  flavormap.properties \
-	  net.properties \
-	  fontconfig.properties \
-	  management/jmxremote.access \
-	  management/jmxremote.password \
-	  management/management.properties \
-	  management/snmp.acl; \
-	do \
-	  mv $(d_jbin)/$(basedir)/jre/lib/$$i $(d_jbin)/etc/$(jdiralias)/$$i; \
-	done
-	cp debian/fontconfig.properties.$(if $(with_wgy_zenhai),wqy-zenhei,src) \
-		$(d_jbin)/etc/$(jdiralias)/fontconfig.properties
-
-	mv $(d_jbin)/$(basedir)/jre/lib/$(archdir)/jvm.cfg \
-		$(d_jbin)/etc/$(jdiralias)/
-	: # TODO: why do we provide a custom font.properties.ja?
-	: # cp -p debian/font.properties.ja $(d_jbin)/etc/$(jdiralias)/.
-	-mv $(d_jbin)/$(basedir)/jre/lib/security/{java.*,cacerts} \
-		$(d_jbin)/$(security)
-
-	: # create links for the conffiles
-	find $(d_jbin)/etc/$(jdiralias) -type f ! -name jvm.cfg \
-	    -printf "etc/$(jdiralias)/%P $(basedir)/jre/lib/%P\n" >> $(d_jbin).links
-	echo "etc/$(jdiralias)/jvm.cfg $(basedir)/jre/lib/$(archdir)/jvm.cfg" \
-	    >> $(d_jbin).links
-
-#	: # replace duplicate files in bin and jre/bin with links
-#	for f in `cd $(srcdir)/. && diff -s -r jre/bin bin \
-#		| sed -n 's/^Files \(.*\) and \(.*\) are identical$$/\2/p'`; \
-#	do \
-#	  [ $$f = bin/HtmlConverter ] || \
-#	  echo /$(basedir)/jre/$$f /$(basedir)/$$f; \
-#	done >> $(d_jbin).links
-
-	set -e; \
-	for i in $$(find $(srcdir)/bin ! -type d); do \
-	  n=$$(basename $$i); \
-	  case " $(jre_tools) $(corba_tools) " in *\ $$n\ *) ;; *) continue; esac; \
-	  echo $(basedir)/jre/bin/$$n $(basedir)/bin/$$n; \
-	done >> $(d_jbin).links
-
-#	  if [ -L $(d_jbin)/$(basedir)/jre/$$f ]; then \
-#	    ln -sf `readlink $(d_jbin)/$(basedir)/jre/$$f` \
-#		$(d_jbin)/$(basedir)/$$f; \
-#	  else \
-#	    ln -sf /$(basedir)/jre/$$f \
-#		$(d_jbin)/$(basedir)/$$f; \
-#	  fi; \
-#
-
-	: # give all permissions to cross-VM extension directory
-	mv $(d_jbin)/$(security)/java.policy \
-	   $(d_jbin)/$(security)/java.policy.orig
-	sed -e '/permission java\.security\.AllPermission;/,/};/c\' \
-	    -e '        permission java.security.AllPermission;\' \
-	    -e '};\' \
-	    -e '\' \
-	    -e 'grant codeBase "file:/$(basedir)/ext/*" {\' \
-	    -e '        permission java.security.AllPermission;\' \
-	    -e '};\' \
-	    -e '\' \
-	    -e '// Comment this out if you want to give all permissions to the\' \
-	    -e '// Debian Java repository too:\' \
-	    -e '//grant codeBase "file:/usr/share/java/repository/-" {\' \
-	    -e '//        permission java.security.AllPermission;\' \
-	    -e '//};\' \
-	    -e '' \
-	    $(d_jbin)/$(security)/java.policy.orig \
-	  > $(d_jbin)/$(security)/java.policy
-# 'make Emacs Makefile mode happy
-	$(RM) $(d_jbin)/$(security)/java.policy.orig
-
-	: # add lintian overrides
-	cp -p debian/$(p_jbin).overrides \
-		$(d_jbin)/$(lintian_overrides)/$(p_jbin)
-
-	: # add GNOME stuff
-	cp -p debian/$(basename)-java.desktop \
-	      $(d_jbin)/usr/share/applications/
-	cp -p debian/$(basename)-policytool.desktop \
-	      $(d_jbin)/usr/share/applications/
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
-	cp -p debian/$(basename)-{java,javaws}.desktop \
-	      $(d_jbin)/usr/share/applications/
-	cp -p debian/$(basename)-{controlpanel,policytool}.desktop \
-	      $(d_jbin)/usr/share/applications/
-endif
-
-	for i in archive web-start; do \
-	  cp debian/$(basename)-$$i.applications \
-	    $(d_jbin)/usr/share/application-registry/; \
-	  cp debian/$(basename)-$$i.keys $(d_jbin)/usr/share/mime-info/; \
-	  cp debian/$(basename)-$$i.mime $(d_jbin)/usr/share/mime-info/; \
-	done
-
-	: # XXX hack, the icon is not available in the amd64 package
-	cp -p i586-jdk/jre/plugin/desktop/sun_java.png \
-		$(d_jbin)/usr/share/pixmaps/$(basename).png
-	cp -p debian/sun_java.xpm \
-		$(d_jbin)/usr/share/pixmaps/$(basename).xpm
-
-	: # install manpages
-	set -e; \
-	for m in $$(find $(srcdir)/man/man1 -type f); do \
-	  n=$$(basename $$m .1); \
-	  case " $(jre_tools) $(corba_tools) " in *\ $$n\ *) ;; *) continue; esac; \
-	  cp -p $$m $(d_jbin)/$(basedir)/jre/man/man1/$$n.1; \
-	  ln -s ../../jre/man/man1/$$n.1 $(d_jbin)/$(basedir)/man/man1/$$n.1; \
-	  [ -f $(srcdir)/man/ja/man1/$$n.1 ] || continue; \
-	  cp -p $(srcdir)/man/ja/man1/$$n.1 \
-	    $(d_jbin)/$(basedir)/jre/man/ja/man1/$$n.1; \
-	  ln -s ../../../jre/man/ja/man1/$$n.1 \
-	    $(d_jbin)/$(basedir)/man/ja/man1/$$n.1; \
-	done
-	-find $(d_jbin)/$(basedir)/jre/man -name '*.[1-9]' | xargs gzip
-
-# make these absolute links, so we can use them for resolving the dependencies
-ifeq (,$(ia32_prefix))
-	ln -sf /usr/lib/libodbcinst.so.1 \
-		$(d_jbin)/$(basedir)/jre/lib/$(archdir)/libodbcinst.so
-	ln -sf /usr/lib/libodbc.so.1 \
-		$(d_jbin)/$(basedir)/jre/lib/$(archdir)/libodbc.so
-# currently unsupported
-#else
-#	ln -sf /usr/lib32/libodbcinst.so.1 \
-#		$(d_jbin)/$(basedir)/jre/lib/$(archdir)/libodbcinst.so
-#	ln -sf /usr/lib32/libodbc.so.1 \
-#		$(d_jbin)/$(basedir)/jre/lib/$(archdir)/libodbc.so
-endif
-
-	 : # fix permissions
-	find $(d_jbin) -name '*.xml' | xargs -r chmod 644
-
-	rm -f $(d_jbin).substvars
-	ld_path=$(d_jbin)/$(basedir)/jre/lib/$(archdir) \
-	    dh_shlibdeps \
-		-l$$ld_path:$$ld_path/client:$$ld_path/native_threads \
-		-Xlibjavaplugin_oji.so -Xlibnpjp2.so
-
-	sed -i -e 's/libc6[^,]*, *//g' -e 's/libc6[^,]*$$//g' -e 's/ *([^,]*) *//g' \
-		$(d_jbin).substvars
-	cp -p $(d_jbin).substvars $(d_plug).substvars
-	sed -e 's/Depends/Recommends/' \
-		$(d_jbin).substvars > $(d_jbin).substvars.tmp
-	rm -f debian/$(p_jbin).substvars
-	ld_path=$(d_jbin)/$(basedir)/jre/lib/$(archdir) \
-	    dh_shlibdeps -v \
-		-l$$ld_path:$$ld_path/client:$$ld_path/native_threads:$$ld_path/headless \
-		-Xjavaws -Xawt_robot -Xpolicytool \
-		-Xlibjavaplugin -Xlibawt -Xlibjawt -Xlibmawt -Xlibdcpr \
-		-Xlibfontmanager -XlibXm -Xlibjsoundalsa  -X_g.so \
-		-Xlibsplashscreen -Xlibmawt -Xlibmlib \
-		-Xlibdeploy
-	sed -i -e 's/ *([^,]*) *//g' $(d_jbin).substvars
-	cat $(d_jbin).substvars.tmp >> $(d_jbin).substvars
-ifeq (,$(ia32_prefix))
-	echo 'odbc:Depends=unixodbc' >> $(d_jbin).substvars
-	echo 'mdns:Depends=libnss-mdns' >> $(d_jbin).substvars
-else
-  ifneq ($(distribution),Ubuntu)
-    ifneq (,$(filter $(distrelease), gutsy))
-	echo 'mdns:Depends=ia32-libs (>= 1.19ubuntu1)' >> $(d_jbin).substvars
-    endif
-    ifneq (,$(filter $(distrelease), hardy))
-	echo 'mdns:Depends=lib32nss-mdns' >> $(d_jbin).substvars
-    endif
-  else
-	echo 'mdns:Depends=lib32nss-mdns' >> $(d_jbin).substvars
-  endif
-endif
-
-	( \
-	  echo 'package $(basename)'; \
-	  echo 'interpreter /$(basedir)/jre/lib/jexec'; \
-	  echo 'magic PK\x03\x04'; \
-	) > $(d_jbin)/$(basedir)/jre/lib/jar.binfmt
-
-	ln -sf $(subst $(ia32_prefix),, $(p_jre)) $(d_jbin)/usr/share/doc/$(p_jbin)
-
-	rm -f debian/$(p_jbin).substvars.tmp
-
-	( \
-	  echo 'name=$(jdirname)'; \
-	  echo 'alias=$(jdiralias)'; \
-	  echo 'priority=$(priority)'; \
-	  echo 'section=non-free'; \
-	  echo ''; \
-	  for i in $(jre_tools_alt); do \
-	    echo "jre $$i /$(TOP)/$(jdiralias)/jre/bin/$$i"; \
-	  done; \
-	  echo "jre jexec /$(TOP)/$(jdiralias)/jre/lib/jexec"; \
-	  for i in $(jdk_tools_alt); do \
-	    echo "jdk $$i /$(TOP)/$(jdiralias)/bin/$$i"; \
-	  done; \
-	  for d in $(browser_plugin_dirs); do \
-	    case "$$d" in \
-	      xulrunner-addons) b=xulrunner-1.9;; \
-	      *) b=$$d;; \
-	    esac; \
-	    echo "plugin $$b-javaplugin.so /$(TOP)/$(jdiralias)/jre/lib/$(archdir)/libnpjp2.so"; \
-	  done; \
-	) > $(d_jbin)/$(TOP)/.$(jdiralias).jinfo
-	cat debian/dlj.templates >> $(d_jbin).templates
-
-
-ia32-binary-bin: unpack-stamp
-	dh_testdir
-	dh_testroot
-	$(MAKE) -f debian/rules binary-ia32-$(p_jbin) \
-		ia32_prefix=ia32- \
-		packaging_files= \
-		DEB_HOST_ARCH=i386
-
-	for i in $(common_jre_things) $(common_jre_jars); do \
-	  echo $(basedir)/$$i $(TOP)/ia32-$(jdirname)/$$i; \
-	done >> debian/ia32-$(p_jbin).links
-
-
-binary-$(p_jre):	DH_OPTIONS=-p$(p_jre)
-binary-$(p_jre):	#binary-$(p_jbin)
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-	dh_installdirs \
-		$(basedir)/jre \
-		usr/share/doc \
-		$(lintian_overrides)
-
-	set -e; \
-	tar -c -C $(srcdir) -f - $(common_jre_things) $(common_jre_jars) \
-	  | tar -x -C $(d_jre)/$(basedir) -f -
-
-	: # these are only in the i586 archive
-	cp -a i586-jdk/jre/lib/images/icons $(d_jre)/$(basedir)/jre/lib/images/
-
-	: # add lintian overrides
-	cp -p debian/$(p_jre).overrides \
-		$(d_jre)/$(lintian_overrides)/$(p_jre)
-
-	dh_installdocs \
-		$(srcdir)/jre/README \
-		debian/README.alternatives \
-		debian/JAVA_HOME
-
-	dh_installchangelogs -k \
-#		$(srcdir)/jre/CHANGES
-
-	ln -sf /etc/.java $(d_jre)/$(basedir)/.systemPrefs
-
-	cat debian/dlj.templates >> $(d_jre).templates
-
-
-binary-$(p_plug):	DH_OPTIONS=-p$(p_plug)
-binary-$(p_plug):	#binary-$(p_jbin)
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-	dh_installdirs \
-		usr/share/doc \
-		$(lintian_overrides) \
-		$(foreach d, $(browser_plugin_dirs), usr/lib/$(d)/plugins)
-	ln -s $(p_jbin) $(d_plug)/usr/share/doc/$(p_plug)
-#	cat debian/dlj.templates >> $(d_plug).templates
-
-	: # add lintian overrides
-	cp -p debian/$(p_plug).overrides \
-		$(d_plug)/$(lintian_overrides)/$(p_plug)
-
-ia32-binary-plugin: unpack-stamp
-	dh_testdir
-	dh_testroot
-	$(MAKE) -f debian/rules binary-ia32-$(p_plug) \
-		ia32_prefix=ia32- \
-		DEB_HOST_ARCH=i386
-
-
-binary-$(p_fonts):	DH_OPTIONS=-p$(p_fonts)
-binary-$(p_fonts):	build
-	dh_testroot
-	dh_clean -d
-	dh_installdirs \
-		usr/share/doc \
-		usr/share/fonts/truetype/ttf-lucida
-
-	cd $(srcdir) && \
-	for f in jre/lib/*fonts/*.ttf; do \
-	  echo $(basedir)/$$f usr/share/fonts/truetype/ttf-lucida/$$(basename $$f); \
-	done >> $(CURDIR)/$(d_fonts).links
-
-	dh_installdefoma
-	ln -s $(p_jre) $(d_fonts)/usr/share/doc/$(p_fonts)
-#	cat debian/dlj.templates >> $(d_fonts).templates
-
-
-binary-$(p_jdk):	DH_OPTIONS=-p$(p_jdk)
-binary-$(p_jdk):	build
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-	dh_installdirs \
-		usr/share/doc/$(p_jdk) \
-		$(basedir)/jre/lib/$(archdir) \
-		$(basedir)/man/man1 \
-		$(basedir)/man/ja/man1 \
-		usr/share/applications \
-		$(lintian_overrides)
-
-	-cp -a $(srcdir)/{bin,include,lib,README.html} \
-	    $(d_jdk)/$(basedir)
-
-	for i in COPYRIGHT LICENSE THIRDPARTYLICENSEREADME.txt; do \
-	  ln -sf jre/$$i $(d_jdk)/$(basedir)/$$i; \
-	done
-
-	: # remove any runtime files from the jdk package
-	-find $(d_jbin)/$(basedir)/jre/bin \! -type d \
-		-printf "$(d_jdk)/$(basedir)/bin/%P\0" | xargs -r0 rm -f
-
-	: # fix java-rmi.cgi PATH
-	perl -pi -e 's:/usr/local/java/bin:/$(basedir)/bin:' \
-	    $(d_jdk)/$(basedir)/bin/java-rmi.cgi
-
-	: # add menu stuff
-	cp -p debian/$(basename)-jconsole.desktop \
-	      $(d_jdk)/usr/share/applications/
-
-	: # add lintian overrides
-	cp -p debian/$(p_jdk).overrides \
-		$(d_jdk)/$(lintian_overrides)/$(p_jdk)
-
-ifneq (,$(findstring demo, $(NO_PACKAGES)))
-	cp -a $(srcdir)/demo $(d_jdk)/usr/share/doc/$(p_jdk)/
-	cp -a $(srcdir)/sample $(d_jdk)/usr/share/doc/$(p_jdk)/examples
-#	chmod 755 $(d_jdk)/usr/share/doc/$(p_jdk)/examples/scripting/scriptpad/src/scripts/memory.sh
-
-	echo usr/share/doc/$(p_jdk)/demo $(basedir)/demo >> $(d_jdk).links
-	echo usr/share/doc/$(p_jdk)/examples $(basedir)/sample >> $(d_jdk).links
-
-	: # add lintian overrides
-	cat debian/$(p_demo).overrides \
-		>> $(d_jdk)/usr/share/lintian/overrides/$(p_jdk)
-endif
-
-	for m in $$(find $(srcdir)/man/man1 -type f); do \
-	  n=$$(basename $$m .1); \
-	  case " $(jre_tools) $(corba_tools) " in *\ $$n\ *) continue; esac; \
-	  cp -p $$m $(d_jdk)/$(basedir)/man/man1/$$n.1; \
-	  [ -f $(srcdir)/man/ja/man1/$$n.1 ] || continue; \
-	  cp -p $(srcdir)/man/ja/man1/$$n.1 \
-	    $(d_jdk)/$(basedir)/man/ja/man1/$$n.1; \
-	done
-	-find $(d_jdk)/$(basedir)/man -name '*.[1-9]' | xargs gzip
-
-	ld_path=$(d_jbin)/$(basedir)/jre/lib/$(archdir) \
-	    dh_shlibdeps \
-	-l$$ld_path:$$ld_path/client:$$ld_path/native_threads:$$ld_path/headless \
-		-Xlibjavaplugin_oji.so Xlibnpjp2.so -X_g.so
-
-	sed -i -e 's/ *([^,]*) *//g' $(d_jdk).substvars
-	cat debian/dlj.templates >> $(d_jdk).templates
-
-	dh_installdocs \
-		$(srcdir)/README.html debian/README.alternatives
-	dh_installchangelogs
-
-
-binary-$(p_demo):	DH_OPTIONS=-p$(p_demo)
-binary-$(p_demo):	build
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-	dh_installdirs \
-		usr/share/doc/$(p_jdk) \
-		usr/share/pixmaps \
-		$(basedir)/demo \
-		$(lintian_overrides)
-
-	cp -a $(srcdir)/demo $(d_demo)/usr/share/doc/$(p_jdk)/
-	cp -a $(srcdir)/sample $(d_demo)/usr/share/doc/$(p_jdk)/examples
-	mv $(d_demo)/usr/share/doc/$(p_jdk)/demo/jvmti \
-	  $(d_demo)/$(basedir)/demo/
-
-	: # fix permissions
-	chmod 755 $(d_demo)/usr/share/doc/$(p_jdk)/examples/scripting/scriptpad/src/scripts/memory.sh
-
-	echo usr/share/doc/$(p_jdk)/examples $(basedir)/sample > $(d_demo).links
-	for i in $(srcdir)/demo/*; do \
-	  i=$$(basename $$i); \
-	  case "$$i" in jvmti) continue; esac; \
-	  echo usr/share/doc/$(p_jdk)/demo/$$i $(basedir)/demo/$$i >> $(d_demo).links; \
-	done
-	echo $(basedir)/demo/jvmti usr/share/doc/$(p_jdk)/demo/jvmti >> $(d_demo).links
-
-	cp -p debian/sun_java_app.xpm \
-		$(d_demo)/usr/share/pixmaps/$(basename)-app.xpm
-
-	: # add lintian overrides
-	cp -p debian/$(p_demo).overrides \
-		$(d_demo)/$(lintian_overrides)/$(p_demo)
-
-#	( \
-#	  gnome=`find $(d_demo)/usr/share/gnome -type f -printf "%f %P "`; \
-#	  echo "gnome='$$gnome'"; \
-#	  echo "" \
-#	) > $(d_demo).debhelper
-
-	ld_path=$(d_jbin)/$(basedir)/jre/lib/$(archdir) \
-	    dh_shlibdeps \
-
-	echo usr/share/doc/$(p_jdk) usr/share/doc/$(p_demo) >> $(d_demo).links
-
-
-binary-$(p_src):	DH_OPTIONS=-p$(p_src)
-binary-$(p_src):	build
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-	dh_installdirs \
-		usr/share/doc \
-		$(basedir)
-
-	cp -a $(srcdir)/src.zip $(d_src)/$(basedir)/
-
-	ln -s $(p_jdk) $(d_src)/usr/share/doc/$(p_src)
-
-#	cat debian/dlj.templates >> $(d_src).templates
-
-
-binary-$(p_javadb):	DH_OPTIONS=-p$(p_javadb)
-binary-$(p_javadb):	build
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-	dh_installdirs \
-		$(basedir) \
-		$(lintian_overrides) \
-		usr/share/doc/$(p_javadb)
-	cp -a $(srcdir)/db $(d_javadb)/$(basedir)/
-
-	: # add lintian overrides
-	cp -p debian/$(p_javadb).overrides \
-		$(d_javadb)/$(lintian_overrides)/$(p_javadb)
-
-	dh_installdocs
-	dh_installchangelogs
-	mv $(d_javadb)/$(basedir)/db/demo $(d_javadb)/usr/share/doc/$(p_javadb)/
-	mv $(d_javadb)/$(basedir)/db/docs/* $(d_javadb)/usr/share/doc/$(p_javadb)/
-	mv $(d_javadb)/$(basedir)/db/javadoc $(d_javadb)/usr/share/doc/$(p_javadb)/
-	rmdir $(d_javadb)/$(basedir)/db/docs
-	echo usr/share/doc/$(p_javadb)/demo $(basedir)/db/demo >> $(d_javadb).links
-	echo usr/share/doc/$(p_javadb) $(basedir)/db/docs >> $(d_javadb).links
-	echo usr/share/doc/$(p_javadb)/javadoc $(basedir)/db/javadoc >> $(d_javadb).links
-	find $(d_javadb)/$(basedir)/db  -name '*.bat' -o -name '*.ksh' | xargs chmod 644
-
-
-binary-indep:	DH_OPTIONS=-i $(NO_PACKAGES)
-binary-indep:	$(binary_indep_targets)
-	dh_testdir
-	dh_testroot
-	dh_installdebconf
-	dh_installmime
-	dh_installmenu
-	dh_icons || dh_iconcache || true
-	dh_link
-	: # don't compress anything from the shipped demo and sample files
-	dh_compress -Xdemo -Xsample -X.html
-	dh_fixperms
-	: # remove empty directories, when all components are in place
-	for d in $$(find debian/{$(VENDOR),ia32*} -depth -type d \( ! -name plugins -o -name $(p_jdk) \) -empty 2> /dev/null); do \
-	  while rmdir $$d 2> /dev/null; do d=`dirname $$d`; done; \
-	done
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-
-binary-arch:	DH_OPTIONS=-s $(NO_PACKAGES)
-binary-arch:	$(binary_arch_targets)
-	dh_testdir
-	dh_testroot
-	dh_installdebconf
-	dh_installmime
-	dh_installmenu
-	dh_icons || dh_iconcache || true
-	: # don't strip the files, we are not allowed to modify these
-	#dh_strip -X_g.so
-	dh_link
-	: # don't compress anything from the shipped demo and sample files
-	dh_compress -Xdemo -Xexamples -Xsample -X.html -X.pdf
-	dh_fixperms
-	: # remove empty directories, when all components are in place
-	for d in $$(find debian/{$(VENDOR),ia32*} -depth -type d -name plugins -empty 2> /dev/null); do \
-	  while rmdir $$d 2> /dev/null; do d=`dirname $$d`; done; \
-	done
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-indep binary-arch install checkroot build

Copied: tags/sun-java6/6.21-1/debian/rules (from rev 12832, trunk/sun-java6/debian/rules)
===================================================================
--- tags/sun-java6/6.21-1/debian/rules	                        (rev 0)
+++ tags/sun-java6/6.21-1/debian/rules	2010-07-28 12:57:48 UTC (rev 12833)
@@ -0,0 +1,1017 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# debian/rules file derived from the gcc build system
+
+unexport LANG LC_ALL
+
+export DH_OPTIONS=
+
+export SHELL=/bin/bash
+
+distribution	:= $(shell lsb_release -is)
+distrelease	:= $(shell lsb_release -cs)
+
+DEB_HOST_ARCH	?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+arch_map	:= amd64=amd64 i386=i586 lpia=i586 powerpc=ppc sparc=sparc ia64=ia64
+archdir_map	:= amd64=amd64 i386=i386 lpia=i386 powerpc=ppc sparc=sparc ia64=ia64
+
+arch		:= $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
+			$(filter $(DEB_HOST_ARCH)=%, $(arch_map))))
+archdir		:= $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
+			$(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))
+
+TOP		:= usr/lib/jvm
+dirparts	:= $(shell basename $(CURDIR) | tr '-' ' ')
+VENDOR		:= $(word 1, $(dirparts))
+Vendor		:= $(shell perl -e 'print ucfirst("$(VENDOR)");')
+javaname	:= $(shell echo $(word 2, $(dirparts)) | sed 's/[0-9.]*$$//')
+RELEASE		:= $(shell echo $(word 2, $(dirparts)) | sed 's/^[a-z]*//')
+# where to get it?
+relstring	:= 6
+PRODUCT		:= $(javaname)$(RELEASE)
+srcname		= $(VENDOR)-$(PRODUCT)
+basename	= $(ia32_prefix)$(VENDOR)-$(PRODUCT)
+dirpartsv	:= $(shell echo $(word 3, $(dirparts)) | tr '.' ' ')
+version		:= $(word 1, $(dirpartsv))
+releng_ver	:= $(word 2, $(dirpartsv))
+jdkversion	:= 1.6.0
+#unpackdir	:= jdk$(version)_$(releng_ver)
+#unpackdir	:= jdk$(jdkversion)
+unpackdir	:= jdk$(jdkversion)_$(releng_ver)
+#jdirname	:= $(ia32_prefix)java-$(version)-$(VENDOR)-$(version).$(releng_ver)
+jdirname	:= $(ia32_prefix)java-$(version)-$(VENDOR)-$(jdkversion).$(releng_ver)
+jdiralias	:= $(ia32_prefix)java-$(version)-$(VENDOR)
+srcdir		:= $(arch)-jdk
+bin_pattern	= jdk-$(version)u$(releng_ver)-dlj-linux-%.bin
+all_archs	= $(filter $(subst =, , $(arch_map)), \
+			   $(subst -, , $(patsubst %.bin, %, $(wildcard *.bin))))
+priority	:= 63
+
+tag		:= $(strip $(subst .,, $(RELEASE)))
+mantag		:= $(VENDOR)$(tag)
+
+basedir		= $(TOP)/$(jdirname)
+doc		:= usr/share/doc
+j2se_lib	:= usr/lib/$(basename)
+security	:= etc/$(jdiralias)/security
+
+bd_plugin = \
+	$(if $(filter $(distribution),Debian),libxul-dev,$(if $(filter $(distrelease),hardy),xulrunner-1.9-dev,firefox-dev))
+
+browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner konqueror
+browsers = 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
+
+# FIXME: xulrunner-addons only tested on sid, jaunty, karmic
+ifeq ($(distribution),Ubuntu)
+  browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner
+  browser_plugin_dirs = xulrunner-addons mozilla
+else
+  browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner
+endif
+
+java_launcher = /$(basedir)/bin/java
+ifeq ($(distribution),Ubuntu)
+  ifeq (,$(filter $(distrel),karmic jaunty intrepid hardy gutsy feisty edgy dapper))
+    java_launcher = cautious-launcher %f /$(basedir)/bin/java
+  endif
+endif
+
+with_wgy_zenhai = $(if $(filter $(distrelease),hardy),yes)
+
+cjk_fonts = ttf-baekmuk | ttf-unfonts | ttf-unfonts-core,
+cjk_fonts += ttf-kochi-gothic | ttf-sazanami-gothic,
+cjk_fonts += ttf-kochi-mincho | ttf-sazanami-mincho,
+cjk_fonts += $(if $(with_wgy_zenhai),ttf-wqy-zenhei,ttf-arphic-uming),
+
+lintian_overrides	:= usr/share/lintian/overrides
+
+ifneq ($(DEB_HOST_ARCH),ia64)
+  packaging_files = packaging-files
+endif
+ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 ia64))
+  with_ia32 = yes
+  ia32_packaging_files = ia32-packaging-files
+
+endif
+
+info:
+	@echo Build information
+	@echo ==========================
+	@echo 'TOP         = $(TOP)'
+	@echo 'VENDOR      = $(VENDOR)'
+	@echo 'RELEASE     = $(RELEASE)'
+	@echo 'PRODUCT     = $(PRODUCT)'
+	@echo 'basename    = $(basename)'
+	@echo 'version     = $(version)'
+	@echo 'releng_ver  = $(releng_ver)'
+	@echo 'unpackdir   = $(unpackdir)'
+	@echo 'srcdir      = $(srcdir)'
+	@echo 'all_archs   = $(all_archs)'
+	@echo 'arch        = $(arch)'
+	@echo 'archdir     = $(archdir)'
+	@echo 'bin_pattern = $(bin_pattern)'
+	@echo $(jre_tools)
+
+d	= debian/tmp
+
+p_jre	:= $(basename)-jre
+p_jbin	:= $(basename)-bin
+p_jdk	:= $(basename)-jdk
+p_src	:= $(basename)-source
+p_fonts	:= $(basename)-fonts
+p_demo	:= $(basename)-demo
+p_plug	:= $(basename)-plugin
+p_javadb	:= $(basename)-javadb
+
+d_jre	:= debian/$(p_jre)
+d_jbin	:= debian/$(p_jbin)
+d_jdk	:= debian/$(p_jdk)
+d_src	:= debian/$(p_src)
+d_demo	:= debian/$(p_demo)
+d_fonts	:= debian/$(p_fonts)
+d_plug	:= debian/$(p_plug)
+d_javadb	:= debian/$(p_javadb)
+
+ifneq ($(DEB_HOST_ARCH),ia64)
+  binary_arch_targets	= \
+	$(patsubst %, binary-%, $(p_jbin) $(p_jdk) $(p_demo))
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
+    binary_arch_targets	+= binary-$(p_plug)
+endif
+ifeq ($(with_ia32),yes)
+    binary_arch_targets	+= ia32-binary-bin
+    #binary_arch_targets += ia32-binary-plugin
+endif
+binary_indep_targets	:= \
+	$(patsubst %, binary-%, $(p_jre) $(p_src) $(p_fonts) $(p_javadb))
+NO_PACKAGES = -Nia32-$(p_plug)
+ifneq ($(with_ia32),yes)
+  NO_PACKAGES += -Nia32-$(p_jbin)
+endif
+
+# (most) jre and jdk tools handled by the alternatives system.
+# dups in heimdal-clients, krb5-user: kinit, klist, ktab, no alternatives
+all_jre_tools	= $(notdir $(wildcard $(srcdir)/jre/bin/*))
+corba_tools	= orbd servertool tnameserv
+jre_tools	= $(filter-out $(corba_tools), $(all_jre_tools))
+jre_tools_alt	= $(filter-out kinit klist ktab, $(jre_tools)) $(corba_tools)
+
+all_jdk_tools	= $(notdir $(wildcard $(srcdir)/bin/*))
+jdk_tools	= $(filter-out $(all_jre_tools), $(all_jdk_tools))
+jdk_tools_alt	= $(filter-out jvisualvm, $(jdk_tools))
+
+jre_manpages_re:= $(shell echo $(jre_tools) $(corba_tools) | tr -s ' ' '|')
+
+#ship_packs = yes
+ifeq ($(ship_packs),yes)
+  jre_packs	= $(shell cd $(srcdir); find jre/lib -name '*.pack')
+  jdk_packs	= $(shell cd $(srcdir); find lib -name '*.pack')
+endif
+
+# TODO: unpack both tarballs, compare them to ensure we do things right
+# these are identical files / directories
+common_jre_things = \
+	jre/lib/audio \
+	jre/lib/cmm \
+	jre/lib/fonts \
+	jre/lib/images/cursors \
+	jre/lib/oblique-fonts \
+	jre/lib/zi \
+	jre/lib/jsse.jar \
+	jre/COPYRIGHT \
+	jre/LICENSE \
+	jre/THIRDPARTYLICENSEREADME.txt \
+
+common_jdk_things = \
+
+# jar files, whith the same contents; just the time stamps differ
+common_jre_jars = \
+	jre/lib/ext/sunjce_provider.jar \
+	jre/lib/ext/dnsns.jar \
+	jre/lib/ext/localedata.jar \
+	jre/lib/jce.jar \
+	jre/lib/security/US_export_policy.jar \
+	jre/lib/security/local_policy.jar \
+	jre/lib/im/indicim.jar \
+	jre/lib/im/thaiim.jar \
+	jre/lib/charsets.jar \
+
+version_tag	:= $(shell dpkg-parsechangelog | \
+			sed -ne 's/Version: *\([0-9]\+:\)*//p')
+
+tag:
+	cvs tag -c -F $(subst .,_,$(ctp_tag)_debian_version_$(version_tag))
+ifeq ($(findstring -,$(version_tag)),)
+	cvs tag -c -F $(subst .,_,$(ctp_tag)_upstream_version_$(version_tag))
+endif
+
+showtags:
+	@echo Version: $(version)
+	@echo Release: $(release)
+	@echo CTP tag: $(ctp_tag)
+
+control: control-stamp
+control-stamp: debian/control $(ia32_packaging_files) $(packaging_files)
+	touch control-stamp
+
+build: build-stamp
+build-stamp: info unpack-stamp control-stamp
+	touch build-stamp
+
+debian/control: debian/control.in debian/rules
+	@cp -p debian/control debian/control.old
+	  sed -e 's/@JRE@/$(p_jre)/g' \
+	      -e 's/@JDK@/$(p_jdk)/g' \
+	      -e 's/@vendor@/$(Vendor)/g' \
+	      -e 's/@basename@/$(basename)/g' \
+	      -e 's, at basedir@,$(basedir),g' \
+	      -e 's/@srcname@/$(srcname)/g' \
+	      -e 's/@arch@/$(DEB_HOST_ARCH)/g' \
+	      -e 's/@sarch@/$(arch)/g' \
+	      -e 's/@RELEASE@/$(relstring)/g' \
+	      -e 's/@archdir@/$(archdir)/g' \
+	      -e 's/@browsers@/$(browsers)/g' \
+	      -e 's/@cjk_fonts@/$(cjk_fonts)/g' \
+	      -e 's, at pkg_version@,$(if $(filter $(distrelease),etch dapper edgy feisty gutsy),$${Source-Version},$${source:Version}),g' \
+	    debian/control.in > debian/control
+	@if cmp -s debian/control debian/control.old; then \
+	  rm -f debian/control.old; \
+	else \
+	  echo "debian/control did change, please restart the build"; \
+          exit 1; \
+	fi
+
+ifeq (,$(ia32_prefix))
+  in_files = debian/*.in
+else
+  in_files = debian/JB-{archive,bin,control,java,policy,plugin,web}*.in
+  ia32txt= $(empty_) (32bit)
+endif
+packaging-files:
+	for f in $(in_files); do \
+	  case "$$f" in debian/control.in) continue; esac; \
+	  f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
+	  sed -e 's/@JRE@/$(p_jre)/g' \
+	      -e 's/@JDK@/$(p_jdk)/g' \
+	      -e 's/@vendor@/$(Vendor)/g' \
+	      -e 's/@RELEASE@/$(relstring)/g' \
+	      -e 's/@basename@/$(basename)/g' \
+	      -e 's, at TOP@,$(TOP),g' \
+	      -e 's, at basedir@,$(basedir),g' \
+	      -e 's, at basediralias@,$(TOP)/$(jdiralias),g' \
+	      -e 's, at jdiralias@,$(jdiralias),g' \
+	      -e 's, at jdirname@,$(jdirname),g' \
+	      -e 's/@srcname@/$(srcname)/g' \
+	      -e 's/@arch@/$(DEB_HOST_ARCH)/g' \
+	      -e 's/@sarch@/$(arch)/g' \
+	      -e 's/@archdir@/$(archdir)/g' \
+	      -e 's/@tag@/$(tag)/g' \
+	      -e 's/@ia32txt@/$(ia32txt)/g' \
+	      -e 's/@priority@/$(priority)/g' \
+	      -e 's/@mantag@/$(mantag)/g' \
+	      -e 's/@jre_tools@/$(jre_tools_alt)/g' \
+	      -e 's/@jdk_tools@/$(jdk_tools_alt)/g' \
+	      -e 's/@corba_tools@/$(corba_tools)/g' \
+	      -e 's, at jre_packs@,$(jre_packs),g' \
+	      -e 's, at jdk_packs@,$(jdk_packs),g' \
+	      -e 's, at j2se_lib@,$(j2se_lib),g' \
+	      -e 's, at browser_dirs@,$(browser_plugin_dirs),g' \
+	      -e 's, at java_launcher@,$(java_launcher),g' \
+	    $$f > $$f2; \
+	done
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
+	cat debian/$(p_jbin)-i586.menu >> $(d_jbin).menu
+	rm -f debian/$(p_jbin)-i586.menu
+endif
+ia32-packaging-files:
+	$(MAKE) -f debian/rules packaging-files \
+		ia32_prefix=ia32- \
+		packaging_files= \
+		DEB_HOST_ARCH=i386
+
+compare-jre-jars:
+	set -e; set -- $(all_archs); src1=$$1-jdk/src; shift; \
+	jars=$$(cd i586-jdk/; find jre -name '*.jar'); \
+	for j in $$jars; do \
+	  echo =======  $$j  ========; \
+	  if [ ! -f amd64-jdk/$$j ]; then \
+	    echo "file does not exist: amd64-jdk/$$j"; \
+	    continue; \
+	  fi; \
+	  d=$${j%*.jar}; \
+	  rm -rf i586-jdk/$$d amd64-jdk/$$d; \
+	  unzip -q -d i586-jdk/$$d i586-jdk/$$j; \
+	  unzip -q -d amd64-jdk/$$d amd64-jdk/$$j; \
+	  if diff -ur i586-jdk/$$d amd64-jdk/$$d; then \
+	    : ; \
+	  else \
+	    badjars="$$badjars $$j"; \
+	  fi; \
+	done; \
+	if [ -n "$$badjars" ]; then \
+	  echo "Differing jar files: $$badjars"; \
+	  exit 1; \
+	fi
+
+diff_ignore = -I 'Tuesday, June 22' \
+	-I 'Tue Jun 22' -I '^ *// java GenerateCharacter'
+
+with_check = yes
+
+unpack-stamp: $(foreach a, $(all_archs), unpack-$(a)-stamp)
+ifeq ($(with_check),yes)
+	: # check for identical files / trees
+	set -e; set -- $(all_archs); a1=$$1; shift; \
+	for a2; do \
+	  echo "Comparing architecture $$a1 with $$a2"; \
+	  for i in $(common_jre_things); do \
+	    echo "  Comparing $$i ..."; \
+	    if diff -ur $$a1-jdk/$$i $$a2-jdk/$$i; then \
+	      echo "    OK"; \
+	    else \
+	      echo "    differ"; \
+	      badjars="$$badthings $$i"; \
+	    fi; \
+	  done; \
+	done; \
+	if [ -n "$$badthings" ]; then \
+	  echo "Differing files/subtrees: $$badthings"; \
+	  exit 1; \
+	fi
+
+	: # check for jars with the same content
+	set -e; \
+	for j in $(common_jre_jars); do \
+	  echo "  Comparing $$j ..."; \
+	  d=$${j%*.jar}; \
+	  set -- $(all_archs); a1=$$1; shift; \
+	  mkdir -p tmp-$$a1/$$d; \
+	  unzip -q -d tmp-$$a1/$$d $$a1-jdk/$$j; \
+	  for a2; do \
+	    mkdir -p tmp-$$a2/$$d; \
+	    unzip -q -d tmp-$$a2/$$d $$a2-jdk/$$j; \
+	    if diff -ur tmp-$$a1/$$d tmp-$$a2/$$d; then \
+	      echo "    OK"; \
+	    else \
+	      echo "    differ"; \
+	      badjars="$$badjars $$j ($$a1, $$a2)"; \
+	    fi; \
+	  done; \
+	done; \
+	if [ -n "$$badjars" ]; then \
+	  echo "Differing jar files: $$badjars"; \
+	  exit 1; \
+	fi
+
+	: # check if the sources are the "same"
+	set -e; set -- $(all_archs); a1=$$1; shift; \
+	unzip -q -d tmp-$$a1/src $$a1-jdk/src.zip; \
+	for a2; do \
+	  unzip -q -d tmp-$$a2/src $$a2-jdk/src.zip; \
+	  echo "Comparing sources: tmp-$$a1/src tmp-$$a2/src ..."; \
+	  echo "    diff -ur $(diff_ignore)"; \
+	  diff -ur $(diff_ignore) tmp-$$a1/src tmp-$$a2/src; \
+	done
+
+	@echo No relevant differences
+endif
+	touch unpack-stamp
+
+unpack-amd64-stamp: unpack-i586-stamp
+
+unpack-%-stamp: $(bin_pattern)
+	rm -rf $(unpackdir)
+#	$(SHELL) tmp-$< --accept-license > /dev/null
+	binsize=$$(wc -c $< | awk '{print $$1}'); \
+	zipstart=$$(unzip -ql $< 2>&1 >/dev/null \
+			| sed -n -e 's/.* \([0-9][0-9]*\) extra bytes.*/\1/p'); \
+	tail -c $$(expr $$binsize - $$zipstart) $< > tmp-jdk.zip
+	unzip -q tmp-jdk.zip
+	mv $(unpackdir) $*-jdk
+	@echo $*
+
+	diff -u $*-jdk/LICENSE $*-jdk/jre/LICENSE
+	diff -u $*-jdk/THIRDPARTYLICENSEREADME.txt \
+	    $*-jdk/jre/THIRDPARTYLICENSEREADME.txt
+
+ifneq ($(ship_packs),yes)
+	set -e; \
+	for i in $$(find $*-jdk -name '*.pack'); do \
+	  i586-jdk/bin/unpack200 $$i \
+		$$(dirname $$i)/$$(basename $$i .pack).jar; \
+	  rm -f $$i; \
+	done
+endif
+
+	: # fix permissions
+	-find $*-jdk -name '*.properties' -o -name '*.xml' | xargs chmod 644
+
+#	for i in `find $*-jdk/man/man1` -name '*.1'; do \
+#	  mv $$i `dirname $$i`/`basename $$i .1`.$(mantag).1; \
+#	done
+	find $*-jdk/. -name "CVS" -print0 | xargs -0 rm -rf
+
+#	for i in `find $*-jdk/man/ja_JP.eucJP -name *.1.gz`; do \
+#	    mv $$i `dirname $$i`/`basename $$i 1.gz`ja.1.gz; \
+#	done
+
+	touch $@
+
+update-dlj: build-stamp
+	touch debian/dlj.templates
+
+update-copyright: build-stamp
+	jdkdir=$(srcdir) jdkdistrosdir=debian pkgdir=debian \
+	  sh debian/mkcopy.sh
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f *-stamp
+	rm -rf amd64-jdk i586-jdk tmp-* $(unpackdir)
+	rm -f debian/*.debhelper debian/more debian/control.old
+	rm -f debian/$(p_jbin).substvars.tmp
+	: # TODO: and these should be
+	: # -rm -f $(d_jre).copyright debian/copyright
+
+	for f in debian/*.in; do \
+	  f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
+	  case "$$f2" in debian/control) continue; esac; \
+	  rm -f $$f2; \
+	done
+	rm -f debian/$(basename)*.templates
+	rm -f debian/$(basename)*.links
+	rm -f debian/copyright.1*
+	rm -f debian/ia32-$(basename)*.*
+	rm -f debian/*.debhelper.log
+
+	dh_clean
+
+mrproper: clean
+	rm -rf build-stamp $(srcdir)
+
+
+binary-$(p_jbin):	DH_OPTIONS=-p$(p_jbin) $(NO_PACKAGES)
+binary-$(p_jbin):	build
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+	dh_installdirs \
+		usr/share/doc \
+		etc/$(jdiralias)/security \
+		$(basedir)/ext \
+		$(basedir)/man/man1 \
+		$(basedir)/man/ja/man1 \
+		$(basedir)/jre/man/man1 \
+		$(basedir)/jre/man/ja/man1 \
+		$(basedir)/bin/$(archdir)/native_threads \
+		usr/share/lintian/overrides \
+		usr/share/applications \
+		usr/share/application-registry \
+		usr/share/binfmts \
+		usr/share/pixmaps \
+		usr/share/mime-info \
+
+	cp -a $(srcdir)/jre $(d_jbin)/$(basedir)
+
+	echo $(basedir) $(TOP)/$(jdiralias) > $(d_jbin).links
+
+	: remove arch indep files and directories
+	rm -rf $(foreach i, $(common_jre_things) $(common_jre_jars), $(d_jbin)/$(basedir)/$(i))
+	: # icons, only in the i586 archive -> $(p_jre)
+	rm -rf $(d_jbin)/$(basedir)/jre/lib/images/icons
+
+	: # install a wrapper for javaws
+	mv $(d_jbin)/$(basedir)/jre/bin/javaws $(d_jbin)/$(basedir)/jre/bin/javaws.real
+	install -m 755 debian/javaws-wrapper.sh $(d_jbin)/$(basedir)/jre/bin/javaws
+
+
+#	: # 1.4 only
+#	rm -f $(d_jbin)/$(basedir)/jre/lib/$(archdir)/libagent.so
+#	-find $(d_jbin) -name HtmlConverter -o -name htmlconverter.jar | xargs rm -f
+
+###	: # get upstream docs out of there
+###	-rm $(d_jbin)/$(j2se_lib)/jre/{CHANGES,COPYRIGHT,INSTALL,*LICENSE*,README
+	rm -f $(d_jbin)/$(basedir)/jre/{CHANGES,INSTALL}
+
+	: # install template files as real files (all commented out)
+	for i in $(d_jbin)/$(basedir)/jre/lib/management/*.template; do \
+	  mv $$i $${i%*.template}; \
+	done
+
+	: # fix permissions
+	chmod 644 $(d_jbin)/$(basedir)/jre/lib/deploy/splash.gif
+
+	: # move config files to etc/$(jdiralias) and symlink them.
+	mkdir -p $(d_jbin)/etc/$(jdiralias)/management
+	for i in \
+	  calendars.properties \
+	  jvm.cfg \
+	  content-types.properties \
+	  logging.properties \
+	  sound.properties \
+	  flavormap.properties \
+	  net.properties \
+	  fontconfig.properties \
+	  management/jmxremote.access \
+	  management/jmxremote.password \
+	  management/management.properties \
+	  management/snmp.acl; \
+	do \
+	  mv $(d_jbin)/$(basedir)/jre/lib/$$i $(d_jbin)/etc/$(jdiralias)/$$i; \
+	done
+	cp debian/fontconfig.properties.$(if $(with_wgy_zenhai),wqy-zenhei,src) \
+		$(d_jbin)/etc/$(jdiralias)/fontconfig.properties
+
+	mv $(d_jbin)/$(basedir)/jre/lib/$(archdir)/jvm.cfg \
+		$(d_jbin)/etc/$(jdiralias)/
+	: # TODO: why do we provide a custom font.properties.ja?
+	: # cp -p debian/font.properties.ja $(d_jbin)/etc/$(jdiralias)/.
+	-mv $(d_jbin)/$(basedir)/jre/lib/security/{java.*,cacerts} \
+		$(d_jbin)/$(security)
+
+	: # create links for the conffiles
+	find $(d_jbin)/etc/$(jdiralias) -type f ! -name jvm.cfg \
+	    -printf "etc/$(jdiralias)/%P $(basedir)/jre/lib/%P\n" >> $(d_jbin).links
+	echo "etc/$(jdiralias)/jvm.cfg $(basedir)/jre/lib/$(archdir)/jvm.cfg" \
+	    >> $(d_jbin).links
+
+#	: # replace duplicate files in bin and jre/bin with links
+#	for f in `cd $(srcdir)/. && diff -s -r jre/bin bin \
+#		| sed -n 's/^Files \(.*\) and \(.*\) are identical$$/\2/p'`; \
+#	do \
+#	  [ $$f = bin/HtmlConverter ] || \
+#	  echo /$(basedir)/jre/$$f /$(basedir)/$$f; \
+#	done >> $(d_jbin).links
+
+	set -e; \
+	for i in $$(find $(srcdir)/bin ! -type d); do \
+	  n=$$(basename $$i); \
+	  case " $(jre_tools) $(corba_tools) " in *\ $$n\ *) ;; *) continue; esac; \
+	  echo $(basedir)/jre/bin/$$n $(basedir)/bin/$$n; \
+	done >> $(d_jbin).links
+
+#	  if [ -L $(d_jbin)/$(basedir)/jre/$$f ]; then \
+#	    ln -sf `readlink $(d_jbin)/$(basedir)/jre/$$f` \
+#		$(d_jbin)/$(basedir)/$$f; \
+#	  else \
+#	    ln -sf /$(basedir)/jre/$$f \
+#		$(d_jbin)/$(basedir)/$$f; \
+#	  fi; \
+#
+
+	: # give all permissions to cross-VM extension directory
+	mv $(d_jbin)/$(security)/java.policy \
+	   $(d_jbin)/$(security)/java.policy.orig
+	sed -e '/permission java\.security\.AllPermission;/,/};/c\' \
+	    -e '        permission java.security.AllPermission;\' \
+	    -e '};\' \
+	    -e '\' \
+	    -e 'grant codeBase "file:/$(basedir)/ext/*" {\' \
+	    -e '        permission java.security.AllPermission;\' \
+	    -e '};\' \
+	    -e '\' \
+	    -e '// Comment this out if you want to give all permissions to the\' \
+	    -e '// Debian Java repository too:\' \
+	    -e '//grant codeBase "file:/usr/share/java/repository/-" {\' \
+	    -e '//        permission java.security.AllPermission;\' \
+	    -e '//};\' \
+	    -e '' \
+	    $(d_jbin)/$(security)/java.policy.orig \
+	  > $(d_jbin)/$(security)/java.policy
+# 'make Emacs Makefile mode happy
+	$(RM) $(d_jbin)/$(security)/java.policy.orig
+
+	: # add lintian overrides
+	cp -p debian/$(p_jbin).overrides \
+		$(d_jbin)/$(lintian_overrides)/$(p_jbin)
+
+	: # add GNOME stuff
+	cp -p debian/$(basename)-java.desktop \
+	      $(d_jbin)/usr/share/applications/
+	cp -p debian/$(basename)-policytool.desktop \
+	      $(d_jbin)/usr/share/applications/
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
+	cp -p debian/$(basename)-{java,javaws}.desktop \
+	      $(d_jbin)/usr/share/applications/
+	cp -p debian/$(basename)-{controlpanel,policytool}.desktop \
+	      $(d_jbin)/usr/share/applications/
+endif
+
+	for i in archive web-start; do \
+	  cp debian/$(basename)-$$i.applications \
+	    $(d_jbin)/usr/share/application-registry/; \
+	  cp debian/$(basename)-$$i.keys $(d_jbin)/usr/share/mime-info/; \
+	  cp debian/$(basename)-$$i.mime $(d_jbin)/usr/share/mime-info/; \
+	done
+
+	: # XXX hack, the icon is not available in the amd64 package
+	cp -p i586-jdk/jre/plugin/desktop/sun_java.png \
+		$(d_jbin)/usr/share/pixmaps/$(basename).png
+	cp -p debian/sun_java.xpm \
+		$(d_jbin)/usr/share/pixmaps/$(basename).xpm
+
+	: # install manpages
+	set -e; \
+	for m in $$(find $(srcdir)/man/man1 -type f); do \
+	  n=$$(basename $$m .1); \
+	  case " $(jre_tools) $(corba_tools) " in *\ $$n\ *) ;; *) continue; esac; \
+	  cp -p $$m $(d_jbin)/$(basedir)/jre/man/man1/$$n.1; \
+	  ln -s ../../jre/man/man1/$$n.1 $(d_jbin)/$(basedir)/man/man1/$$n.1; \
+	  [ -f $(srcdir)/man/ja/man1/$$n.1 ] || continue; \
+	  cp -p $(srcdir)/man/ja/man1/$$n.1 \
+	    $(d_jbin)/$(basedir)/jre/man/ja/man1/$$n.1; \
+	  ln -s ../../../jre/man/ja/man1/$$n.1 \
+	    $(d_jbin)/$(basedir)/man/ja/man1/$$n.1; \
+	done
+	-find $(d_jbin)/$(basedir)/jre/man -name '*.[1-9]' | xargs gzip
+
+# make these absolute links, so we can use them for resolving the dependencies
+ifeq (,$(ia32_prefix))
+	ln -sf /usr/lib/libodbcinst.so.1 \
+		$(d_jbin)/$(basedir)/jre/lib/$(archdir)/libodbcinst.so
+	ln -sf /usr/lib/libodbc.so.1 \
+		$(d_jbin)/$(basedir)/jre/lib/$(archdir)/libodbc.so
+# currently unsupported
+#else
+#	ln -sf /usr/lib32/libodbcinst.so.1 \
+#		$(d_jbin)/$(basedir)/jre/lib/$(archdir)/libodbcinst.so
+#	ln -sf /usr/lib32/libodbc.so.1 \
+#		$(d_jbin)/$(basedir)/jre/lib/$(archdir)/libodbc.so
+endif
+
+	 : # fix permissions
+	find $(d_jbin) -name '*.xml' | xargs -r chmod 644
+
+	rm -f $(d_jbin).substvars
+	ld_path=$(d_jbin)/$(basedir)/jre/lib/$(archdir) \
+	    dh_shlibdeps \
+		-l$$ld_path:$$ld_path/client:$$ld_path/native_threads \
+		-Xlibjavaplugin_oji.so -Xlibnpjp2.so
+
+	sed -i -e 's/libc6[^,]*, *//g' -e 's/libc6[^,]*$$//g' -e 's/ *([^,]*) *//g' \
+		$(d_jbin).substvars
+	cp -p $(d_jbin).substvars $(d_plug).substvars
+	sed -e 's/Depends/Recommends/' \
+		$(d_jbin).substvars > $(d_jbin).substvars.tmp
+	rm -f debian/$(p_jbin).substvars
+	ld_path=$(d_jbin)/$(basedir)/jre/lib/$(archdir) \
+	    dh_shlibdeps -v \
+		-l$$ld_path:$$ld_path/client:$$ld_path/native_threads:$$ld_path/headless \
+		-Xjavaws -Xawt_robot -Xpolicytool \
+		-Xlibjavaplugin -Xlibawt -Xlibjawt -Xlibmawt -Xlibdcpr \
+		-Xlibfontmanager -XlibXm -Xlibjsoundalsa  -X_g.so \
+		-Xlibsplashscreen -Xlibmawt -Xlibmlib \
+		-Xlibdeploy
+	sed -i -e 's/ *([^,]*) *//g' $(d_jbin).substvars
+	cat $(d_jbin).substvars.tmp >> $(d_jbin).substvars
+ifeq (,$(ia32_prefix))
+	echo 'odbc:Depends=unixodbc' >> $(d_jbin).substvars
+	echo 'mdns:Depends=libnss-mdns' >> $(d_jbin).substvars
+else
+  ifneq ($(distribution),Ubuntu)
+    ifneq (,$(filter $(distrelease), gutsy))
+	echo 'mdns:Depends=ia32-libs (>= 1.19ubuntu1)' >> $(d_jbin).substvars
+    endif
+    ifneq (,$(filter $(distrelease), hardy))
+	echo 'mdns:Depends=lib32nss-mdns' >> $(d_jbin).substvars
+    endif
+  else
+	echo 'mdns:Depends=lib32nss-mdns' >> $(d_jbin).substvars
+  endif
+endif
+
+	( \
+	  echo 'package $(basename)'; \
+	  echo 'interpreter /$(basedir)/jre/lib/jexec'; \
+	  echo 'magic PK\x03\x04'; \
+	) > $(d_jbin)/$(basedir)/jre/lib/jar.binfmt
+
+	ln -sf $(subst $(ia32_prefix),, $(p_jre)) $(d_jbin)/usr/share/doc/$(p_jbin)
+
+	rm -f debian/$(p_jbin).substvars.tmp
+
+	( \
+	  echo 'name=$(jdirname)'; \
+	  echo 'alias=$(jdiralias)'; \
+	  echo 'priority=$(priority)'; \
+	  echo 'section=non-free'; \
+	  echo ''; \
+	  for i in $(jre_tools_alt); do \
+	    echo "jre $$i /$(TOP)/$(jdiralias)/jre/bin/$$i"; \
+	  done; \
+	  echo "jre jexec /$(TOP)/$(jdiralias)/jre/lib/jexec"; \
+	  for i in $(jdk_tools_alt); do \
+	    echo "jdk $$i /$(TOP)/$(jdiralias)/bin/$$i"; \
+	  done; \
+	  for d in $(browser_plugin_dirs); do \
+	    case "$$d" in \
+	      xulrunner-addons) b=xulrunner-1.9;; \
+	      *) b=$$d;; \
+	    esac; \
+	    echo "plugin $$b-javaplugin.so /$(TOP)/$(jdiralias)/jre/lib/$(archdir)/libnpjp2.so"; \
+	  done; \
+	) > $(d_jbin)/$(TOP)/.$(jdiralias).jinfo
+	cat debian/dlj.templates >> $(d_jbin).templates
+
+
+ia32-binary-bin: unpack-stamp
+	dh_testdir
+	dh_testroot
+	$(MAKE) -f debian/rules binary-ia32-$(p_jbin) \
+		ia32_prefix=ia32- \
+		packaging_files= \
+		DEB_HOST_ARCH=i386
+
+	for i in $(common_jre_things) $(common_jre_jars); do \
+	  echo $(basedir)/$$i $(TOP)/ia32-$(jdirname)/$$i; \
+	done >> debian/ia32-$(p_jbin).links
+
+
+binary-$(p_jre):	DH_OPTIONS=-p$(p_jre)
+binary-$(p_jre):	#binary-$(p_jbin)
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+	dh_installdirs \
+		$(basedir)/jre \
+		usr/share/doc \
+		$(lintian_overrides)
+
+	set -e; \
+	tar -c -C $(srcdir) -f - $(common_jre_things) $(common_jre_jars) \
+	  | tar -x -C $(d_jre)/$(basedir) -f -
+
+	: # these are only in the i586 archive
+	cp -a i586-jdk/jre/lib/images/icons $(d_jre)/$(basedir)/jre/lib/images/
+
+	: # add lintian overrides
+	cp -p debian/$(p_jre).overrides \
+		$(d_jre)/$(lintian_overrides)/$(p_jre)
+
+	dh_installdocs \
+		$(srcdir)/jre/README \
+		debian/README.alternatives \
+		debian/JAVA_HOME
+
+	dh_installchangelogs -k \
+#		$(srcdir)/jre/CHANGES
+
+	ln -sf /etc/.java $(d_jre)/$(basedir)/.systemPrefs
+
+	cat debian/dlj.templates >> $(d_jre).templates
+
+
+binary-$(p_plug):	DH_OPTIONS=-p$(p_plug)
+binary-$(p_plug):	#binary-$(p_jbin)
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+	dh_installdirs \
+		usr/share/doc \
+		$(lintian_overrides) \
+		$(foreach d, $(browser_plugin_dirs), usr/lib/$(d)/plugins)
+	ln -s $(p_jbin) $(d_plug)/usr/share/doc/$(p_plug)
+#	cat debian/dlj.templates >> $(d_plug).templates
+
+	: # add lintian overrides
+	cp -p debian/$(p_plug).overrides \
+		$(d_plug)/$(lintian_overrides)/$(p_plug)
+
+ia32-binary-plugin: unpack-stamp
+	dh_testdir
+	dh_testroot
+	$(MAKE) -f debian/rules binary-ia32-$(p_plug) \
+		ia32_prefix=ia32- \
+		DEB_HOST_ARCH=i386
+
+
+binary-$(p_fonts):	DH_OPTIONS=-p$(p_fonts)
+binary-$(p_fonts):	build
+	dh_testroot
+	dh_clean -d
+	dh_installdirs \
+		usr/share/doc \
+		usr/share/fonts/truetype/ttf-lucida
+
+	cd $(srcdir) && \
+	for f in jre/lib/*fonts/*.ttf; do \
+	  echo $(basedir)/$$f usr/share/fonts/truetype/ttf-lucida/$$(basename $$f); \
+	done >> $(CURDIR)/$(d_fonts).links
+
+	dh_installdefoma
+	ln -s $(p_jre) $(d_fonts)/usr/share/doc/$(p_fonts)
+#	cat debian/dlj.templates >> $(d_fonts).templates
+
+
+binary-$(p_jdk):	DH_OPTIONS=-p$(p_jdk)
+binary-$(p_jdk):	build
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+	dh_installdirs \
+		usr/share/doc/$(p_jdk) \
+		$(basedir)/jre/lib/$(archdir) \
+		$(basedir)/man/man1 \
+		$(basedir)/man/ja/man1 \
+		usr/share/applications \
+		$(lintian_overrides)
+
+	-cp -a $(srcdir)/{bin,include,lib,README.html} \
+	    $(d_jdk)/$(basedir)
+
+	for i in COPYRIGHT LICENSE THIRDPARTYLICENSEREADME.txt; do \
+	  ln -sf jre/$$i $(d_jdk)/$(basedir)/$$i; \
+	done
+
+	: # remove any runtime files from the jdk package
+	-find $(d_jbin)/$(basedir)/jre/bin \! -type d \
+		-printf "$(d_jdk)/$(basedir)/bin/%P\0" | xargs -r0 rm -f
+
+	: # fix java-rmi.cgi PATH
+	perl -pi -e 's:/usr/local/java/bin:/$(basedir)/bin:' \
+	    $(d_jdk)/$(basedir)/bin/java-rmi.cgi
+
+	: # add menu stuff
+	cp -p debian/$(basename)-jconsole.desktop \
+	      $(d_jdk)/usr/share/applications/
+
+	: # add lintian overrides
+	cp -p debian/$(p_jdk).overrides \
+		$(d_jdk)/$(lintian_overrides)/$(p_jdk)
+
+ifneq (,$(findstring demo, $(NO_PACKAGES)))
+	cp -a $(srcdir)/demo $(d_jdk)/usr/share/doc/$(p_jdk)/
+	cp -a $(srcdir)/sample $(d_jdk)/usr/share/doc/$(p_jdk)/examples
+#	chmod 755 $(d_jdk)/usr/share/doc/$(p_jdk)/examples/scripting/scriptpad/src/scripts/memory.sh
+
+	echo usr/share/doc/$(p_jdk)/demo $(basedir)/demo >> $(d_jdk).links
+	echo usr/share/doc/$(p_jdk)/examples $(basedir)/sample >> $(d_jdk).links
+
+	: # add lintian overrides
+	cat debian/$(p_demo).overrides \
+		>> $(d_jdk)/usr/share/lintian/overrides/$(p_jdk)
+endif
+
+	for m in $$(find $(srcdir)/man/man1 -type f); do \
+	  n=$$(basename $$m .1); \
+	  case " $(jre_tools) $(corba_tools) " in *\ $$n\ *) continue; esac; \
+	  cp -p $$m $(d_jdk)/$(basedir)/man/man1/$$n.1; \
+	  [ -f $(srcdir)/man/ja/man1/$$n.1 ] || continue; \
+	  cp -p $(srcdir)/man/ja/man1/$$n.1 \
+	    $(d_jdk)/$(basedir)/man/ja/man1/$$n.1; \
+	done
+	-find $(d_jdk)/$(basedir)/man -name '*.[1-9]' | xargs gzip
+
+	ld_path=$(d_jbin)/$(basedir)/jre/lib/$(archdir) \
+	    dh_shlibdeps \
+	-l$$ld_path:$$ld_path/client:$$ld_path/native_threads:$$ld_path/headless \
+		-Xlibjavaplugin_oji.so Xlibnpjp2.so -X_g.so
+
+	sed -i -e 's/ *([^,]*) *//g' $(d_jdk).substvars
+	cat debian/dlj.templates >> $(d_jdk).templates
+
+	dh_installdocs \
+		$(srcdir)/README.html debian/README.alternatives
+	dh_installchangelogs
+
+
+binary-$(p_demo):	DH_OPTIONS=-p$(p_demo)
+binary-$(p_demo):	build
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+	dh_installdirs \
+		usr/share/doc/$(p_jdk) \
+		usr/share/pixmaps \
+		$(basedir)/demo \
+		$(lintian_overrides)
+
+	cp -a $(srcdir)/demo $(d_demo)/usr/share/doc/$(p_jdk)/
+	cp -a $(srcdir)/sample $(d_demo)/usr/share/doc/$(p_jdk)/examples
+	mv $(d_demo)/usr/share/doc/$(p_jdk)/demo/jvmti \
+	  $(d_demo)/$(basedir)/demo/
+
+	: # fix permissions
+	chmod 755 $(d_demo)/usr/share/doc/$(p_jdk)/examples/scripting/scriptpad/src/scripts/memory.sh
+
+	echo usr/share/doc/$(p_jdk)/examples $(basedir)/sample > $(d_demo).links
+	for i in $(srcdir)/demo/*; do \
+	  i=$$(basename $$i); \
+	  case "$$i" in jvmti) continue; esac; \
+	  echo usr/share/doc/$(p_jdk)/demo/$$i $(basedir)/demo/$$i >> $(d_demo).links; \
+	done
+	echo $(basedir)/demo/jvmti usr/share/doc/$(p_jdk)/demo/jvmti >> $(d_demo).links
+
+	cp -p debian/sun_java_app.xpm \
+		$(d_demo)/usr/share/pixmaps/$(basename)-app.xpm
+
+	: # add lintian overrides
+	cp -p debian/$(p_demo).overrides \
+		$(d_demo)/$(lintian_overrides)/$(p_demo)
+
+#	( \
+#	  gnome=`find $(d_demo)/usr/share/gnome -type f -printf "%f %P "`; \
+#	  echo "gnome='$$gnome'"; \
+#	  echo "" \
+#	) > $(d_demo).debhelper
+
+	ld_path=$(d_jbin)/$(basedir)/jre/lib/$(archdir) \
+	    dh_shlibdeps \
+
+	echo usr/share/doc/$(p_jdk) usr/share/doc/$(p_demo) >> $(d_demo).links
+
+
+binary-$(p_src):	DH_OPTIONS=-p$(p_src)
+binary-$(p_src):	build
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+	dh_installdirs \
+		usr/share/doc \
+		$(basedir)
+
+	cp -a $(srcdir)/src.zip $(d_src)/$(basedir)/
+
+	ln -s $(p_jdk) $(d_src)/usr/share/doc/$(p_src)
+
+#	cat debian/dlj.templates >> $(d_src).templates
+
+
+binary-$(p_javadb):	DH_OPTIONS=-p$(p_javadb)
+binary-$(p_javadb):	build
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+	dh_installdirs \
+		$(basedir) \
+		$(lintian_overrides) \
+		usr/share/doc/$(p_javadb)
+	cp -a $(srcdir)/db $(d_javadb)/$(basedir)/
+
+	: # add lintian overrides
+	cp -p debian/$(p_javadb).overrides \
+		$(d_javadb)/$(lintian_overrides)/$(p_javadb)
+
+	dh_installdocs
+	dh_installchangelogs
+	mv $(d_javadb)/$(basedir)/db/demo $(d_javadb)/usr/share/doc/$(p_javadb)/
+	mv $(d_javadb)/$(basedir)/db/docs/* $(d_javadb)/usr/share/doc/$(p_javadb)/
+	mv $(d_javadb)/$(basedir)/db/javadoc $(d_javadb)/usr/share/doc/$(p_javadb)/
+	rmdir $(d_javadb)/$(basedir)/db/docs
+	echo usr/share/doc/$(p_javadb)/demo $(basedir)/db/demo >> $(d_javadb).links
+	echo usr/share/doc/$(p_javadb) $(basedir)/db/docs >> $(d_javadb).links
+	echo usr/share/doc/$(p_javadb)/javadoc $(basedir)/db/javadoc >> $(d_javadb).links
+	find $(d_javadb)/$(basedir)/db  -name '*.bat' -o -name '*.ksh' | xargs chmod 644
+
+
+binary-indep:	DH_OPTIONS=-i $(NO_PACKAGES)
+binary-indep:	$(binary_indep_targets)
+	dh_testdir
+	dh_testroot
+	dh_installdebconf
+	dh_installmime
+	dh_installmenu
+	dh_icons || dh_iconcache || true
+	dh_link
+	: # don't compress anything from the shipped demo and sample files
+	dh_compress -Xdemo -Xsample -X.html
+	dh_fixperms
+	: # remove empty directories, when all components are in place
+	for d in $$(find debian/{$(VENDOR),ia32*} -depth -type d \( ! -name plugins -o -name $(p_jdk) \) -empty 2> /dev/null); do \
+	  while rmdir $$d 2> /dev/null; do d=`dirname $$d`; done; \
+	done
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+
+binary-arch:	DH_OPTIONS=-s $(NO_PACKAGES)
+binary-arch:	$(binary_arch_targets)
+	dh_testdir
+	dh_testroot
+	dh_installdebconf
+	dh_installmime
+	dh_installmenu
+	dh_icons || dh_iconcache || true
+	: # don't strip the files, we are not allowed to modify these
+	#dh_strip -X_g.so
+	dh_link
+	: # don't compress anything from the shipped demo and sample files
+	dh_compress -Xdemo -Xexamples -Xsample -X.html -X.pdf
+	dh_fixperms
+	: # remove empty directories, when all components are in place
+	for d in $$(find debian/{$(VENDOR),ia32*} -depth -type d -name plugins -empty 2> /dev/null); do \
+	  while rmdir $$d 2> /dev/null; do d=`dirname $$d`; done; \
+	done
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-indep binary-arch install checkroot build




More information about the pkg-java-commits mailing list