* Build packages default-jre, default-jre-headless, default-jdk

    and default-jdk-builddep.
    Provides an abstraction for the preferred jre/jdk for a specific
    architecture.  Build-depending on default-jdk-builddep ensures
    a dependency on java-gcj-compat-dev even if the default jdk is
    another than java-gcj-compat-dev. Discussion thread starting at
    http://lists.debian.org/debian-java/2008/03/msg00007.html.

3 files changed, 109 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index e4da9f9..8f92c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 java-common (0.28) UNRELEASED; urgency=low
 
-  * 
-
- -- Matthias Klose <doko@debian.org>  Mon, 03 Mar 2008 12:40:19 +0100
+  * Build packages default-jre, default-jre-headless, default-jdk
+    and default-jdk-builddep.
+    Provides an abstraction for the preferred jre/jdk for a specific
+    architecture.  Build-depending on default-jdk-builddep ensures
+    a dependency on java-gcj-compat-dev even if the default jdk is
+    another than java-gcj-compat-dev. Discussion thread starting at
+    http://lists.debian.org/debian-java/2008/03/msg00007.html.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 05 Mar 2008 18:28:56 +0100
 
 java-common (0.27) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4a42bb0..4033f1f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,3 +21,46 @@ Description: Base of all Java packages
     programs and libraries as well as on legal issues.
   * Information on how to create dummy packages to fulfill java2
     requirements.
+
+Package: default-jre
+Section: interpreters
+Architecture: any
+Depends: default-jre-headless (= ${binary:Version}), ${jre}${jre:version}
+Suggests: default-jre
+Provides: ${jre:provides}
+Description: Standard Java or Java compatible Runtime
+ This package points to the Java runtime, or Java compatible
+ runtime recommended for the ${jre:arch} architecture,
+ which is ${jdk} for ${jdk:arch}.
+
+Package: default-jre-headless
+Section: interpreters
+Architecture: any
+Depends: ${jhl}${jre:version}, java-common
+Suggests: default-jre
+Provides: ${jhl:provides}
+Description: Standard Java or Java compatible Runtime (headless)
+ This package points to the Java runtime, or Java compatible
+ runtime recommended for this architecture, which is
+ ${jhl} for ${jre:arch}.
+ .
+ The package is used as dependency for packages not needing a
+ graphical display during runtime.
+
+Package: default-jdk
+Section: devel
+Architecture: any
+Depends: default-jre (= ${binary:Version}), ${jdk}${jdk:version}
+Provides: ${jdk:provides}
+Description: Standard Java or Java compatible Development Kit
+ This package points to the Java runtime, or Java compatible
+ development kit recommended for this architecture, which is
+ ${jdk} for ${jre:arch}.
+
+Package: default-jdk-builddep
+Section: devel
+Architecture: any
+Depends: default-jdk (= ${binary:Version}), ${jdk:builddep}
+Description: Standard Java or Java compatible build dependencies
+ This package points to the build dependencies used to build
+ packages requiring a Java or Java compatible Development Kit.
diff --git a/debian/rules b/debian/rules
index f4b07d7..eabcd73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,40 @@
 #!/usr/bin/make -f
-# MAde with the aid of dh_make, by Craig Small
+# Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Cristoph Lameter.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+, = ,
+S = $(EMPTY) $(EMPTY)
+mk_cslist = $(subst $(S),$(,)$(S),$(foreach v,$(1),$(v)-$(2)))
+vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
+jrel = $(subst java-common-0.,,$(notdir $(CURDIR)))
+
+DPKG_VARS := $(shell dpkg-architecture)
+DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
+
+p_jre		= java-gcj-compat
+p_jhl		= java-gcj-compat-headless
+p_jdk		= java-gcj-compat-dev
+jdk_build_dep	=
+v_jre		= $(S)(>= 1.0.77-4)
+v_jdk		= $(v_jre)
+provides	= java java2 java5
+dversion	= 1.5-$(jrel)
+jvmdir		= java-gcj
+
+#ifneq (,$(filter $(DEB_HOST_ARCH), alpha hppa))
+#  p_jre		=
+#  p_headless	=
+#  p_jdk		=
+#endif
+
+jre_provides	= $(call mk_cslist,$(provides),runtime)
+jhl_provides	= $(call mk_cslist,$(provides),runtime-headless)
+jdk_provides	= $(call mk_cslist,$(provides),sdk)
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -17,8 +46,6 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp install-stamp
-
-	# Add here commands to clean up after the build process.
 	$(MAKE) clean
 
 	dh_clean
@@ -30,10 +57,7 @@ install-stamp: build-stamp
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp.
-	# Create the doc directory.
 	dh_installdocs -i
-	# Install docs into the doc directory.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/java-common
 
 	dpsch-backupclean
@@ -41,9 +65,34 @@ install-stamp: build-stamp
 	touch install-stamp
 
 binary-arch:
+ifneq (,$(p_jre))
+	dh_testdir -s
+	dh_testroot -s
+###	dh_installdocs -s
+	dh_installchangelogs -s
+	dh_link -pdefault-jre-headless \
+		usr/lib/jvm/$(jvmdir) usr/lib/jvm/default-java
+	dh_compress -s
+	dh_fixperms -s
+	dh_installdeb -s
+	dh_gencontrol -s -- \
+		-v$(dversion) \
+		'-Vjre=$(p_jre)' \
+		'-Vjhl=$(p_jhl)' \
+		'-Vjdk=$(p_jdk)' \
+		'-Vjdk:builddep=$(jdk_builddep)' \
+		'-Vjre:arch=$(DEB_HOST_ARCH)' \
+		'-Vjre:version=$(v_jre)' \
+		'-Vjdk:version=$(v_jdk)' \
+		'-Vjre:provides=$(jre_provides)' \
+		'-Vjhl:provides=$(jhl_provides)' \
+		'-Vjdk:provides=$(jdk_provides)' \
+
+	dh_md5sums -s
+	dh_builddeb -s
+endif
 
 # Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
@@ -52,26 +101,15 @@ binary-indep: build install
 	dh_installexamples -i
 	dpsch-cvsclean
 	dh_installmenu -i
-#	dh_installlogrotate -i
-#	dh_installemacsen -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installinit -i
-#	dh_installcron -i
 	dh_installman -i
-#	dh_installinfo -i
-#	dh_undocumented -i
-	dh_installchangelogs  -i
+	dh_installchangelogs -i
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-#	dh_perl -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
 
-	dh_builddeb
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure