Imported Debian version 0.47+deb7u1debian/0.47+deb7u1

4 files changed, 30 insertions, 16 deletions

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..46596d6
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,15 @@
+java-common (0.47+deb7u1) wheezy-security; urgency=high
+
+  The default-java implementation will be switched to OpenJDK 7 on 26 June 2016
+  to ensure full security support until Wheezy LTS reaches end-of-life on 31
+  May 2018.
+
+  We recommend that you test your web and desktop applications with
+  OpenJDK 7 and remove OpenJDK 6 at your earliest convenience.
+  More information about possible compatibility issues can be found at
+  http://www.oracle.com/technetwork/java/javase/compatibility-417013.html.
+
+  Further information about the switch to OpenJDK 7 are available at
+  https://wiki.debian.org/LTS/Wheezy.
+
+ -- Markus Koschany <apo@debian.org>  Tue, 03 May 2016 16:47:20 +0200
diff --git a/debian/changelog b/debian/changelog
index 2bf0494..6257910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-java-common (0.47) experimental; urgency=low
+java-common (0.47+deb7u1) wheezy-security; urgency=high
 
-  * Upload to experimental.
-  * Replace java6 with java7 on architectures supporting
-    openjdk-7.
+  * Non-maintainer upload by the LTS team.
+  * Make users aware of the upcoming default-java change.
 
- -- Niels Thykier <niels@thykier.net>  Mon, 18 Jun 2012 14:29:24 +0200
+ -- Markus Koschany <apo@debian.org>  Wed, 04 May 2016 14:53:46 +0200
 
 java-common (0.47) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 54f8f60..48d2a49 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: java-common
 Section: java
 Priority: optional
 Maintainer: Debian Java Mailing List <debian-java@lists.debian.org>
-Uploaders: Matthias Klose <doko@debian.org>, Torsten Werner <twerner@debian.org>,
+Uploaders: Michael Koch <konqueror@gmx.de>, Matthias Klose <doko@debian.org>, Torsten Werner <twerner@debian.org>,
  Niels Thykier <niels@thykier.net>
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, lynx
 Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/java-common
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/java-common/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-common
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-common/
 
 Package: java-common
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 81efa64..bfbc6e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,18 +27,18 @@ dversion	= 1:1.5-$(jrel)
 jvmdir		= java-gcj
 
 ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel armhf i386 ia64 lpia mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc sh4))
-  p_jre		= openjdk-7-jre
-  p_jhl		= openjdk-7-jre-headless
-  p_jdk		= openjdk-7-jdk
+  p_jre		= openjdk-6-jre
+  p_jhl		= openjdk-6-jre-headless
+  p_jdk		= openjdk-6-jdk
   jdk_build_dep	= gcj-jdk
-  v_jre		= $(S)(>= 7~u3-2.1.1)
+  v_jre		= $(S)(>= 6b23~pre8-2~)
   v_jdk		= $(v_jre)
-  provides	= java java2 java5 java6 java7
-  dversion	= 1:1.7-$(jrel)
-  jvmdir	= java-1.7.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
+  provides	= java java2 java5 java6
+  dversion	= 1:1.6-$(jrel)
+  jvmdir	= java-1.6.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
 endif
 
-p_doc		= openjdk-7-doc
+p_doc		= openjdk-6-doc
 
 jre_provides	= $(call mk_cslist,$(provides),runtime)
 jhl_provides	= $(call mk_cslist,$(provides),runtime-headless)