From edb00d27b912c4864f573451c3eb36921e327c77 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 19 Feb 2012 19:27:11 +0100 Subject: [PATCH 1/1] * Long description removed * debian-rules-missing-recommended-target removed * maintainer-script-lacks-debhelper-token removed * Declare the debian/compat to 7 to avoid warnings --- debian/changelog | 15 +++++++++------ debian/control | 7 ++++--- debian/postinst | 2 ++ debian/prerm | 2 ++ debian/rules | 4 +++- lib/j2re.sh | 1 + lib/j2sdk-doc.sh | 1 + lib/j2sdk.sh | 1 + lib/j2se.sh | 2 +- 9 files changed, 24 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0662e4f..f366187 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -java-package (0.50) UNRELEASED; urgency=low +java-package (0.50) unstable; urgency=low * Java-package reset for reintroduction in debian (removal of all previously supported jvm, global refactoring). @@ -8,14 +8,17 @@ java-package (0.50) UNRELEASED; urgency=low * Use jdk included jre binaries (jdk/jre/bin/*) * Print usage information on install - -- Cédric Pineau Thu, 22 Dec 2011 11:42:13 +0100 - -java-package (0.43) UNRELEASED; urgency=low - + [ Sylvestre Ledru ] + * Long description removed + * debian-rules-missing-recommended-target removed + * maintainer-script-lacks-debhelper-token removed + * Declare the debian/compat to 7 to avoid warnings + + [ Michael Kock ] * Remove Java plugins for all browsers (Closes: #367887). * Add support for Sun Java 6 Update XX (Closes: #514364). - -- Michael Koch Thu, 17 Sep 2009 13:15:55 +0200 + -- Cédric Pineau Thu, 22 Dec 2011 11:42:13 +0100 java-package (0.42) unstable; urgency=low diff --git a/debian/control b/debian/control index 5fc19f2..f47c98e 100644 --- a/debian/control +++ b/debian/control @@ -10,10 +10,11 @@ Standards-Version: 3.9.2 Package: java-package Architecture: all -Depends: ${misc:Depends}, debhelper, fakeroot, unzip, libx11-6, libasound2, debconf (>= 0.5) | debconf-2.0 +Depends: ${misc:Depends}, debhelper, fakeroot, unzip, libx11-6, libasound2, + debconf (>= 0.5) | debconf-2.0 Recommends: dpkg-dev, gcc Suggests: openjdk-6-jre, openjdk-7-jre -Description: utility for building Java related Debian packages +Description: Utility for creating Java Debian packages This package provides the capability to build a Debian package from a Java binary distribution by running make-jpkg . (with archive files downloaded from providers listed below) @@ -23,7 +24,7 @@ Description: utility for building Java related Debian packages - The J2SE Development Kit (JDK), version 6 (update >= 10), 7 - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7 - The J2SE API Javadoc, version 6 (update >= 10), 7 - (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) + (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!) . Please note that Debian recommends the use of openjdk-6-jdk/openjdk-6-jre or openjdk-7-jdk/openjdk-7-jre. java-package will install non-free packages. diff --git a/debian/postinst b/debian/postinst index 9c24044..cd46e5b 100644 --- a/debian/postinst +++ b/debian/postinst @@ -9,4 +9,6 @@ then db_go fi +#DEBHELPER# + exit 0 diff --git a/debian/prerm b/debian/prerm index 600b078..501069b 100644 --- a/debian/prerm +++ b/debian/prerm @@ -8,4 +8,6 @@ then db_purge fi +#DEBHELPER# + exit 0 diff --git a/debian/rules b/debian/rules index ca5eea3..5611e1b 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,9 @@ VERSION := $(shell head -n 1 $(CURDIR)/debian/changelog | sed 's/.*(//;s/).*//') B := $(CURDIR)/debian/java-package -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: dh_testdir diff --git a/lib/j2re.sh b/lib/j2re.sh index 94ce4a7..2a8c05a 100644 --- a/lib/j2re.sh +++ b/lib/j2re.sh @@ -32,6 +32,7 @@ j2re_run() { install -d -m 755 "$( dirname "$target" )" extract_bin "$archive_path" "$j2se_expected_min_size" "$target" rm -rf "$target/.systemPrefs" + echo "7" > "$debian_dir/compat" j2se_readme > "$debian_dir/README.Debian" j2se_changelog > "$debian_dir/changelog" j2re_control > "$debian_dir/control" diff --git a/lib/j2sdk-doc.sh b/lib/j2sdk-doc.sh index 8130ed7..2a56db9 100644 --- a/lib/j2sdk-doc.sh +++ b/lib/j2sdk-doc.sh @@ -45,6 +45,7 @@ j2sdk_doc_run() { install -d -m 755 "$( dirname "$target" )" extract_bin "$archive_path" "$j2se_expected_min_size" "$target" rm -rf "$target/.systemPrefs" + echo "7" > "$debian_dir/compat" j2se_readme > "$debian_dir/README.Debian" j2se_changelog > "$debian_dir/changelog" j2sdk_doc_control > "$debian_dir/control" diff --git a/lib/j2sdk.sh b/lib/j2sdk.sh index 0a91839..988cd6e 100644 --- a/lib/j2sdk.sh +++ b/lib/j2sdk.sh @@ -34,6 +34,7 @@ j2sdk_run() { install -d -m 755 "$( dirname "$target" )" extract_bin "$archive_path" "$j2se_expected_min_size" "$target" rm -rf "$target/.systemPrefs" + echo "7" > "$debian_dir/compat" j2se_readme > "$debian_dir/README.Debian" j2se_changelog > "$debian_dir/changelog" j2sdk_control > "$debian_dir/control" diff --git a/lib/j2se.sh b/lib/j2se.sh index b57c234..926060a 100644 --- a/lib/j2se.sh +++ b/lib/j2se.sh @@ -182,7 +182,7 @@ j2se_build() { echo "Create debian package:" #export DH_VERBOSE=1 - export DH_COMPAT=4 + export DH_COMPAT=7 export DH_OPTIONS=--tmpdir="$install_dir" echo " dh_testdir" -- 2.39.2