This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository java-policy.
commit 8090e8a84320163b7416629df9009864da93c941 Author: Ola Nordmann <[email protected]> Date: Mon Oct 1 12:45:30 2001 +0000 Merged and fixed lintian errors. --- Makefile | 2 +- debian/changelog | 15 ++++++++++++++- debian/control | 17 ++++++++++++++++- debian/copyright | 6 +++++- debian/java-common.examples | 1 + ...-compiler-dummy.man => java-compiler-dummy.manpages} | 0 debian/java-compiler-dummy.postinst.debhelper | 14 ++++++++++++++ debian/java-compiler-dummy.prerm.debhelper | 10 ++++++++++ ....debian => java-virtual-machine-dummy.README.debian} | 0 ...e.conffiles => java-virtual-machine-dummy.conffiles} | 0 ...ual-machine.dirs => java-virtual-machine-dummy.dirs} | 0 ...ine.examples => java-virtual-machine-dummy.examples} | 0 ...-machine.man => java-virtual-machine-dummy.manpages} | 0 ...ine.postinst => java-virtual-machine-dummy.postinst} | 0 debian/java-virtual-machine-dummy.postinst.debhelper | 14 ++++++++++++++ ...l-machine.prerm => java-virtual-machine-dummy.prerm} | 0 debian/java-virtual-machine-dummy.prerm.debhelper | 10 ++++++++++ debian/rules | 12 +++++++++++- dummy/compiler/java-c.1 | 1 + dummy/virtual-machine/java-vm.1 | 1 + policy.sgml | 2 +- policy.xml | 2 +- 22 files changed, 100 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 058ea2e..8f4505c 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ clean: # For the debian-java-FAQ # by Javier Fern�ndez-Sanguino Pe�a <[email protected]> -debian-java-faq: debian-java-faq.html debian-java-faq.ps debian-java-faq.txt +debian-java-faq: #debian-java-faq.html debian-java-faq.ps debian-java-faq.txt OUTPUTS += debian-java-faq.ps debian-java-faq.txt diff --git a/debian/changelog b/debian/changelog index 35d593c..8a1f597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +java-common (0.8) unstable; urgency=low + + * Moved java-compiler-dummy to java-common. + * Moved java-virtual-machine-dummy to java-common. + * Moved dummy config files, closes: #55527, #55747. + * Fixed manpage, closes: #55525. + * Fixed the copyright file, closes: #55524. + * No I will not add a jar hook. It does not require any special + classpaths and the jar program should exist in the package that + provides the binary, closes: #81647. + * The updated java policy will be updated soon. + + -- Ola Lundqvist <[email protected]> Mon, 01 Oct 2001 13:43:56 +0200 + java-common (0.7) unstable; urgency=low * New maintainer Ola Lundqvist, closes: #92816. @@ -53,5 +67,4 @@ java-common (0.0-1) unstable; urgency=low Local variables: mode: debian-changelog -add-log-mailing-address: "[email protected]" End: diff --git a/debian/control b/debian/control index 03c125f..f4ee1c0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: java-common Section: misc Priority: optional Maintainer: Ola Lundqvist <[email protected]> -Build-Depends: debhelper (>> 3.0.0), jade, jadetex, tetex-bin, debiandoc-sgml, sp, lynx +Build-Depends: debhelper (>> 3.0.0), jade, jadetex, tetex-bin, debiandoc-sgml, sp, lynx, docbook-xml-simple Standards-Version: 3.5.2 Package: java-common @@ -12,3 +12,18 @@ Description: Base of all Java packages This package is mandatory for any Java package. It includes the Java policy. +Package: java-virtual-machine-dummy +Architecture: all +Depends: java-common +Provides: java-virtual-machine +Description: Dummy Java virtual machine + This package is only to respect the dependencies rules. + Install it only if you have a real Java virtual machine. + +Package: java-compiler-dummy +Architecture: all +Depends: java-common +Provides: java-compiler +Description: Dummy Java compiler + This package is only to respect the dependencies rules. + Install it only if you have a real Java compiler. diff --git a/debian/copyright b/debian/copyright index a9f27e2..ab36687 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,10 @@ It is a Debian original work. -Upstream Author(s): Stephane Bortzmeyer <[email protected]> +Current maintainer: + Ola Lundqvist <[email protected]> + +Previsous maintainers: + Stephane Bortzmeyer <[email protected]> Copyright: diff --git a/debian/java-common.examples b/debian/java-common.examples new file mode 100644 index 0000000..e39721e --- /dev/null +++ b/debian/java-common.examples @@ -0,0 +1 @@ +examples/* diff --git a/debian/java-compiler-dummy.man b/debian/java-compiler-dummy.manpages similarity index 100% rename from debian/java-compiler-dummy.man rename to debian/java-compiler-dummy.manpages diff --git a/debian/java-compiler-dummy.postinst.debhelper b/debian/java-compiler-dummy.postinst.debhelper new file mode 100644 index 0000000..7ae4911 --- /dev/null +++ b/debian/java-compiler-dummy.postinst.debhelper @@ -0,0 +1,14 @@ +# Automatically added by dh_installdocs +if [ "$1" = "configure" ]; then + if [ -d /usr/doc -a ! -e /usr/doc/java-compiler-dummy -a -d /usr/share/doc/java-compiler-dummy ]; then + ln -sf ../share/doc/java-compiler-dummy /usr/doc/java-compiler-dummy + fi +fi +# End automatically added section +# Automatically added by dh_installdocs +if [ "$1" = "configure" ]; then + if [ -d /usr/doc -a ! -e /usr/doc/java-compiler-dummy -a -d /usr/share/doc/java-compiler-dummy ]; then + ln -sf ../share/doc/java-compiler-dummy /usr/doc/java-compiler-dummy + fi +fi +# End automatically added section diff --git a/debian/java-compiler-dummy.prerm.debhelper b/debian/java-compiler-dummy.prerm.debhelper new file mode 100644 index 0000000..d0e11ef --- /dev/null +++ b/debian/java-compiler-dummy.prerm.debhelper @@ -0,0 +1,10 @@ +# Automatically added by dh_installdocs +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/java-compiler-dummy ]; then + rm -f /usr/doc/java-compiler-dummy +fi +# End automatically added section +# Automatically added by dh_installdocs +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/java-compiler-dummy ]; then + rm -f /usr/doc/java-compiler-dummy +fi +# End automatically added section diff --git a/debian/java-virtual-machine.RADME.debian b/debian/java-virtual-machine-dummy.README.debian similarity index 100% rename from debian/java-virtual-machine.RADME.debian rename to debian/java-virtual-machine-dummy.README.debian diff --git a/debian/java-virtual-machine.conffiles b/debian/java-virtual-machine-dummy.conffiles similarity index 100% rename from debian/java-virtual-machine.conffiles rename to debian/java-virtual-machine-dummy.conffiles diff --git a/debian/java-virtual-machine.dirs b/debian/java-virtual-machine-dummy.dirs similarity index 100% rename from debian/java-virtual-machine.dirs rename to debian/java-virtual-machine-dummy.dirs diff --git a/debian/java-virtual-machine.examples b/debian/java-virtual-machine-dummy.examples similarity index 100% rename from debian/java-virtual-machine.examples rename to debian/java-virtual-machine-dummy.examples diff --git a/debian/java-virtual-machine.man b/debian/java-virtual-machine-dummy.manpages similarity index 100% rename from debian/java-virtual-machine.man rename to debian/java-virtual-machine-dummy.manpages diff --git a/debian/java-virtual-machine.postinst b/debian/java-virtual-machine-dummy.postinst similarity index 100% rename from debian/java-virtual-machine.postinst rename to debian/java-virtual-machine-dummy.postinst diff --git a/debian/java-virtual-machine-dummy.postinst.debhelper b/debian/java-virtual-machine-dummy.postinst.debhelper new file mode 100644 index 0000000..4516d13 --- /dev/null +++ b/debian/java-virtual-machine-dummy.postinst.debhelper @@ -0,0 +1,14 @@ +# Automatically added by dh_installdocs +if [ "$1" = "configure" ]; then + if [ -d /usr/doc -a ! -e /usr/doc/java-virtual-machine-dummy -a -d /usr/share/doc/java-virtual-machine-dummy ]; then + ln -sf ../share/doc/java-virtual-machine-dummy /usr/doc/java-virtual-machine-dummy + fi +fi +# End automatically added section +# Automatically added by dh_installdocs +if [ "$1" = "configure" ]; then + if [ -d /usr/doc -a ! -e /usr/doc/java-virtual-machine-dummy -a -d /usr/share/doc/java-virtual-machine-dummy ]; then + ln -sf ../share/doc/java-virtual-machine-dummy /usr/doc/java-virtual-machine-dummy + fi +fi +# End automatically added section diff --git a/debian/java-virtual-machine.prerm b/debian/java-virtual-machine-dummy.prerm similarity index 100% rename from debian/java-virtual-machine.prerm rename to debian/java-virtual-machine-dummy.prerm diff --git a/debian/java-virtual-machine-dummy.prerm.debhelper b/debian/java-virtual-machine-dummy.prerm.debhelper new file mode 100644 index 0000000..88265c5 --- /dev/null +++ b/debian/java-virtual-machine-dummy.prerm.debhelper @@ -0,0 +1,10 @@ +# Automatically added by dh_installdocs +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/java-virtual-machine-dummy ]; then + rm -f /usr/doc/java-virtual-machine-dummy +fi +# End automatically added section +# Automatically added by dh_installdocs +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/java-virtual-machine-dummy ]; then + rm -f /usr/doc/java-virtual-machine-dummy +fi +# End automatically added section diff --git a/debian/rules b/debian/rules index 8304c7d..2028acc 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,9 @@ export DH_COMPAT=3 +DEFCOMPILER=jikes +DEFVM=kaffe + build: build-stamp build-stamp: dh_testdir @@ -37,6 +40,13 @@ install-stamp: build-stamp dh_installdocs $(MAKE) install DESTDIR=$(CURDIR)/debian/java-common + # java-compiler-dummy + install -m 0755 dummy/compiler/java-c debian/java-compiler-dummy/usr/bin + install -m 0644 dummy/compiler/java-c.conf-${DEFCOMPILER} debian/java-compiler-dummy/etc/java/java-c.conf + # java-virtual-machine-dummy. + install -m 0755 dummy/virtual-machine/java-vm debian/java-virtual-machine-dummy/usr/bin + install -m 0644 dummy/virtual-machine/java-vm.conf-${DEFVM} debian/java-virtual-machine-dummy/etc/java/java-vm.conf + touch install-stamp # Build architecture-independent files here. @@ -54,7 +64,7 @@ binary-indep: build install # dh_installmime -i # dh_installinit -i # dh_installcron -i -# dh_installman -i + dh_installman -i # dh_installinfo -i # dh_undocumented -i dh_installchangelogs -i diff --git a/dummy/compiler/java-c.1 b/dummy/compiler/java-c.1 index 6320462..6627181 100644 --- a/dummy/compiler/java-c.1 +++ b/dummy/compiler/java-c.1 @@ -27,4 +27,5 @@ They are passed uninterpreted to the compiler. and specially the "examples" directory. .SH AUTHOR This manual page was written by Stephane Bortzmeyer <[email protected]>, +and updated by Ola Lundqvist <[email protected]>, for the Debian GNU/Linux system (but may be used by others). diff --git a/dummy/virtual-machine/java-vm.1 b/dummy/virtual-machine/java-vm.1 index c91ab8e..0b057e0 100644 --- a/dummy/virtual-machine/java-vm.1 +++ b/dummy/virtual-machine/java-vm.1 @@ -29,4 +29,5 @@ java-vm configuration file. and specially the "examples" directory. .SH AUTHOR This manual page was written by Stephane Bortzmeyer <[email protected]>, +and updated by Ola Lundqvist <[email protected]>, for the Debian GNU/Linux system (but may be used by others). diff --git a/policy.sgml b/policy.sgml index 07ef03b..17edfe0 100644 --- a/policy.sgml +++ b/policy.sgml @@ -1,6 +1,6 @@ <?xml version='1.0'?> <!DOCTYPE article PUBLIC "-//Norman Walsh//DTD Simplified DocBk XML V3.1.3.6//EN" - "/usr/lib/sgml/dtd/docbook-xml/sdocbook.dtd"[ + "/usr/share/sgml/docbook/custom/simple/3.1.7.1/sdocbook.dtd"[ <!ENTITY must "<emphasis>must</emphasis>"> <!ENTITY may "<emphasis>may</emphasis>"> <!ENTITY should "<emphasis>should</emphasis>"> diff --git a/policy.xml b/policy.xml index 07ef03b..17edfe0 100644 --- a/policy.xml +++ b/policy.xml @@ -1,6 +1,6 @@ <?xml version='1.0'?> <!DOCTYPE article PUBLIC "-//Norman Walsh//DTD Simplified DocBk XML V3.1.3.6//EN" - "/usr/lib/sgml/dtd/docbook-xml/sdocbook.dtd"[ + "/usr/share/sgml/docbook/custom/simple/3.1.7.1/sdocbook.dtd"[ <!ENTITY must "<emphasis>must</emphasis>"> <!ENTITY may "<emphasis>may</emphasis>"> <!ENTITY should "<emphasis>should</emphasis>"> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-policy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
