From cb16d5e1a223053be95ff586cfe976d1c10ef50a Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg Date: Thu, 29 Aug 2013 13:30:45 +0200 Subject: [PATCH] Removed 'Replaces: ${j2se_package}debian' from the generated control file --- debian/changelog | 1 + lib/jdk-doc.sh | 1 - lib/jdk.sh | 1 - lib/jre.sh | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 128c4db..399d810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ java-package (0.53) UNRELEASED; urgency=low * Updated the package description: - no longer recommend openjdk-6 - mention the compatibility with Java 8 + * Removed 'Replaces: ${j2se_package}debian' from the generated control file -- Emmanuel Bourg Wed, 28 Aug 2013 19:34:41 +0200 diff --git a/lib/jdk-doc.sh b/lib/jdk-doc.sh index be98bfd..baca98e 100644 --- a/lib/jdk-doc.sh +++ b/lib/jdk-doc.sh @@ -6,7 +6,6 @@ Architecture: any Depends: Recommends: Provides: -Replaces: Description: $j2se_title The Java(TM) SE JDK is a development environment for building applications, applets, and components that can be deployed on the diff --git a/lib/jdk.sh b/lib/jdk.sh index 85b6971..c4a985f 100644 --- a/lib/jdk.sh +++ b/lib/jdk.sh @@ -18,7 +18,6 @@ Architecture: any Depends: $depends Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5 Provides: java-virtual-machine, java-runtime, java2-runtime, java${j2se_release}-runtime, java$((${j2se_release}-1))-runtime, java$((${j2se_release}-2))-runtime, $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java${j2se_release}-runtime-headless, java$((${j2se_release}-1))-runtime-headless, java$((${j2se_release}-2))-runtime-headless, java-sdk, java2-sdk, java$((${j2se_release}-2))-sdk, java$((${j2se_release}-1))-sdk, java${j2se_release}-sdk -Replaces: ${j2se_package}debian Description: $j2se_title The Java(TM) SE JDK is a development environment for building applications, applets, and components that can be deployed on the diff --git a/lib/jre.sh b/lib/jre.sh index 9c30340..7c82080 100644 --- a/lib/jre.sh +++ b/lib/jre.sh @@ -7,7 +7,6 @@ Architecture: any Depends: \${shlibs:Depends} Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2 Provides: java-virtual-machine, java-runtime, java2-runtime, java${j2se_release}-runtime, java$((${j2se_release}-1))-runtime, java$((${j2se_release}-2))-runtime, java-runtime-headless, java2-runtime-headless, java${j2se_release}-runtime-headless, java$((${j2se_release}-1))-runtime-headless, java$((${j2se_release}-2))-runtime-headless, java-browser-plugin -Replaces: ${j2se_package}debian Description: $j2se_title The Java(TM) SE Runtime Environment contains the Java virtual machine, runtime class libraries, and Java application launcher that are -- 2.39.5