CVS java-package/debian
Jeroen van Wolffelaar
jeroen@haydn.debian.org
Mon Jan 24 16:08:20 2005
Update of /cvsroot/pkg-java/java-package/debian
In directory haydn:/tmp/cvs-serv13883/debian
Modified Files:
changelog control rules
Log Message:
Patch provided by Joshua Kwan <joshk@debian.org>, doing the following of which
I'm not going to dissict back in per-fix changes:
* Unclutter Debian build system and rework package slightly so that
*debian packages are not needed anymore. The necessary files will be
included in the generated packages. (Closes: #291145, #289245, #284779)
* Add support for Blackdown 1.4.2+01 build. (Closes: #285405)
* Fix support for Sun 1.5.0 amd64 builds due to typo. (Closes: #290879)
* Mozilla browser plugin name changed in 1.4.2 versions. Detect and correct.
(Closes: #273730)
* Use DEBFULLNAME, DEBNAME and DEBEMAIL as first-priority defaults for
maintainer name and email, if available. (Closes: #279653)
* Use --block-size=1M instead of -BM. (Closes: #289005, #291161)
* Disable support for Sun JDK 1.3 due to its dependencies on libraries
that are simply not available anymore. (Closes: #272972)
* Fix up short description a little bit.
* Bump Standards-Version to 3.6.1 (no changes)
* Be a bit more conservative with the real-root test.
* Remove last j2se-package references.
* Change Suggests on fakeroot to a Depends because it is worthless both
as real root and as a normal user without fakeroot.
--- /cvsroot/pkg-java/java-package/debian/changelog 2005/01/04 02:56:25 1.15
+++ /cvsroot/pkg-java/java-package/debian/changelog 2005/01/24 23:07:41 1.16
@@ -1,3 +1,29 @@
+java-package (0.19) unstable; urgency=low
+
+ The "Joshua Kwan <joshk@debian.org> rocks!" release.
+
+ Joshua Kwan:
+ * Unclutter Debian build system and rework package slightly so that
+ *debian packages are not needed anymore. The necessary files will be
+ included in the generated packages. (Closes: #291145, #289245, #284779)
+ * Add support for Blackdown 1.4.2+01 build. (Closes: #285405)
+ * Fix support for Sun 1.5.0 amd64 builds due to typo. (Closes: #290879)
+ * Mozilla browser plugin name changed in 1.4.2 versions. Detect and correct.
+ (Closes: #273730)
+ * Use DEBFULLNAME, DEBNAME and DEBEMAIL as first-priority defaults for
+ maintainer name and email, if available. (Closes: #279653)
+ * Use --block-size=1M instead of -BM. (Closes: #289005, #291161)
+ * Disable support for Sun JDK 1.3 due to its dependencies on libraries
+ that are simply not available anymore. (Closes: #272972)
+ * Fix up short description a little bit.
+ * Bump Standards-Version to 3.6.1 (no changes)
+ * Be a bit more conservative with the real-root test.
+ * Remove last j2se-package references.
+ * Change Suggests on fakeroot to a Depends because it is worthless both
+ as real root and as a normal user without fakeroot.
+
+ -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl> Tue, 25 Jan 2005 00:05:06 +0100
+
java-package (0.18) unstable; urgency=low
* Added myself to Uploaders
--- /cvsroot/pkg-java/java-package/debian/control 2005/01/03 17:51:36 1.5
+++ /cvsroot/pkg-java/java-package/debian/control 2005/01/24 23:07:41 1.6
@@ -4,126 +4,15 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Takashi Okamoto <tora@debian.org>, Carlos Laviola <claviola@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.6.0
+Standards-Version: 3.6.1.0
Package: java-package
Architecture: all
-Depends: debhelper
-Suggests: fakeroot
-Description: A utility for building Java(TM) 2 related Debian packages
+Depends: debhelper, fakeroot
+Description: utility for building Java(TM) 2 related Debian packages
This package provides the capability to create a debian package from
a Java(TM) 2 distribution by just running make-jpkg <filename>.
.
This program works currently with the latest Java(TM) 2 REs and SDKs
(1.3, 1.4 and 1.5) Standard Edition, from Sun Microsystems(TM) and
Blackdown Java-Linux.
-
-Package: sun-j2re1.3debian
-Architecture: all
-Depends: java-common, sun-j2re1.3
-Suggests: java-package
-Provides: j2re1.3, java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 RE, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 RE is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: sun-j2sdk1.3debian
-Architecture: all
-Depends: java-common, sun-j2sdk1.3
-Suggests: java-package
-Provides: j2sdk1.3, java-virtual-machine, java-compiler, java2-compiler, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 SDK, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 SDK is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: sun-j2re1.4debian
-Architecture: all
-Depends: java-common, sun-j2re1.4
-Suggests: java-package
-Provides: j2re1.4, java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 RE, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 RE is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: sun-j2sdk1.4debian
-Architecture: all
-Depends: java-common, sun-j2sdk1.4
-Suggests: java-package
-Provides: j2sdk1.4, java-virtual-machine, java-compiler, java2-compiler, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 SDK, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 SDK is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: sun-j2re1.5debian
-Architecture: all
-Depends: java-common, sun-j2re1.5
-Suggests: java-package
-Provides: j2re1.5, java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 RE, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 RE is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: sun-j2sdk1.5debian
-Architecture: all
-Depends: java-common, sun-j2sdk1.5
-Suggests: java-package
-Provides: j2sdk1.5, java-virtual-machine, java-compiler, java2-compiler, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 SDK, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 SDK is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: blackdown-j2re1.3debian
-Architecture: all
-Depends: java-common, blackdown-j2re1.3
-Suggests: java-package
-Provides: j2re1.3, java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 RE, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 RE is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: blackdown-j2sdk1.3debian
-Architecture: all
-Depends: java-common, blackdown-j2sdk1.3
-Suggests: java-package
-Provides: j2sdk1.3, java-virtual-machine, java-compiler, java2-compiler, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 SDK, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 SDK is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: blackdown-j2re1.4debian
-Architecture: all
-Depends: java-common, blackdown-j2re1.4
-Suggests: java-package
-Provides: j2re1.4, java-virtual-machine, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 RE, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 RE is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
-
-Package: blackdown-j2sdk1.4debian
-Architecture: all
-Depends: java-common, blackdown-j2sdk1.4
-Suggests: java-package
-Provides: j2sdk1.4, java-virtual-machine, java-compiler, java2-compiler, java-runtime, java2-runtime, java-browser-plugin
-Description: Debian specific parts of Java(TM) 2 SDK, Standard Edition
- This package contains Debian specific extras that are not part of the
- upstream distribution. The upstream part of Java(TM) 2 SDK is in a
- separate package, that should be created with java-package. Read the
- java-package documentation for further information.
--- /cvsroot/pkg-java/java-package/debian/rules 2005/01/03 17:50:35 1.2
+++ /cvsroot/pkg-java/java-package/debian/rules 2005/01/24 23:07:42 1.3
@@ -1,145 +1,61 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+# debian/rules for java-package
# Extract source package version number from changelog
-VERSION := $(shell head -1 $(CURDIR)/debian/changelog | sed 's/.*(//;s/).*//')
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- ./debian/peer sun-j2re1.3 /usr/share/j2re1.3-sun
- ./debian/peer sun-j2sdk1.3 /usr/share/j2sdk1.3-sun
- ./debian/peer sun-j2re1.4 /usr/share/j2re1.4-sun
- ./debian/peer sun-j2sdk1.4 /usr/share/j2sdk1.4-sun
- ./debian/peer sun-j2re1.5 /usr/share/j2re1.5-sun
- ./debian/peer sun-j2sdk1.5 /usr/share/j2sdk1.5-sun
- ./debian/peer blackdown-j2re1.3 /usr/share/j2re1.3-blackdown
- ./debian/peer blackdown-j2sdk1.3 /usr/share/j2sdk1.3-blackdown
- ./debian/peer blackdown-j2re1.4 /usr/share/j2re1.4-blackdown
- ./debian/peer blackdown-j2sdk1.4 /usr/share/j2sdk1.4-blackdown
-
- touch configure-stamp
-
+VERSION := $(shell head -n 1 $(CURDIR)/debian/changelog | sed 's/.*(//;s/).*//')
+B := $(CURDIR)/debian/java-package
-build: build-indep
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
+build: build-stamp
+build-stamp:
# Add here commands to compile the indep part of the package.
- $(MAKE)
sed s/@VERSION@/$(VERSION)/ make-jpkg > make-jpkg.out
- touch build-indep-stamp
+ touch $@
clean:
dh_testdir
dh_testroot
- rm -f build-indep-stamp configure-stamp
- rm -f make-jpkg.out
- rm -f debian/sun-j2re1.3debian.postinst debian/sun-j2re1.3debian.prerm
- rm -f debian/sun-j2sdk1.3debian.postinst debian/sun-j2sdk1.3debian.prerm
- rm -f debian/sun-j2re1.4debian.postinst debian/sun-j2re1.4debian.prerm
- rm -f debian/sun-j2sdk1.4debian.postinst debian/sun-j2sdk1.4debian.prerm
- rm -f debian/sun-j2re1.5debian.postinst debian/sun-j2re1.5debian.prerm
- rm -f debian/sun-j2sdk1.5debian.postinst debian/sun-j2sdk1.5debian.prerm
- rm -f debian/blackdown-j2re1.3debian.postinst debian/blackdown-j2re1.3debian.prerm
- rm -f debian/blackdown-j2sdk1.3debian.postinst debian/blackdown-j2sdk1.3debian.prerm
- rm -f debian/blackdown-j2re1.4debian.postinst debian/blackdown-j2re1.4debian.prerm
- rm -f debian/blackdown-j2sdk1.4debian.postinst debian/blackdown-j2sdk1.4debian.prerm
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
-
+ rm -f build-stamp SUPPORTED make-jpkg.out
dh_clean
-install: install-indep
-install-indep:
+install: build
dh_testdir
dh_testroot
- dh_clean -k -i
- dh_installdirs -i
+ dh_clean -k
+ dh_installdirs
+
+ install -m 755 make-jpkg.out $(B)/usr/bin/make-jpkg
+ cp lib/* $(B)/usr/share/java-package/
+ for dir in $(wildcard blackdown-j2*) $(wildcard sun-j2*); do \
+ cp -a $$dir $(B)/usr/share/java-package/; \
+ done
+
+# Generate SUPPORTED
+ echo "java-package currently supports the following binary packages:" > SUPPORTED
+ echo >> SUPPORTED
+ echo "(This list is automatically generated, do not edit)" >> SUPPORTED
+ echo >> SUPPORTED
+ grep -h "SUPPORTED$$" $(wildcard $(CURDIR)/lib/*-*.sh) | sed 's/"//g;s/).*//' >> SUPPORTED
- $(MAKE) install DESTDIR=$(CURDIR)/debian/java-package
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/sun-j2re1.3debian \
- J2SE_PACKAGE=sun-j2re1.3 J2SE_BASE=/usr/share/j2re1.3-sun
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/sun-j2sdk1.3debian \
- J2SE_PACKAGE=sun-j2sdk1.3 J2SE_BASE=/usr/share/j2sdk1.3-sun
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/sun-j2re1.4debian \
- J2SE_PACKAGE=sun-j2re1.4 J2SE_BASE=/usr/share/j2re1.4-sun
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/sun-j2sdk1.4debian \
- J2SE_PACKAGE=sun-j2sdk1.4 J2SE_BASE=/usr/share/j2sdk1.4-sun
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/sun-j2re1.5debian \
- J2SE_PACKAGE=sun-j2re1.5 J2SE_BASE=/usr/share/j2re1.5-sun
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/sun-j2sdk1.5debian \
- J2SE_PACKAGE=sun-j2sdk1.5 J2SE_BASE=/usr/share/j2sdk1.5-sun
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/blackdown-j2re1.3debian \
- J2SE_PACKAGE=blackdown-j2re1.3 J2SE_BASE=/usr/share/j2re1.3-blackdown
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/blackdown-j2sdk1.3debian \
- J2SE_PACKAGE=blackdown-j2sdk1.3 J2SE_BASE=/usr/share/j2sdk1.3-blackdown
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/blackdown-j2re1.4debian \
- J2SE_PACKAGE=blackdown-j2re1.4 J2SE_BASE=/usr/share/j2re1.4-blackdown
- $(MAKE) install-peer DESTDIR=$(CURDIR)/debian/blackdown-j2sdk1.4debian \
- J2SE_PACKAGE=blackdown-j2sdk1.4 J2SE_BASE=/usr/share/j2sdk1.4-blackdown
-
- dh_install -i
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
+ dh_install
+
+binary: binary-indep
+
+binary-indep: build install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
+ dh_installman make-jpkg.1
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-binary: binary-indep
-.PHONY: build clean binary-indep binary install install-indep configure
+.PHONY: build clean binary-indep binary install