Author: doko Date: 2009-08-03 14:33:26 +0000 (Mon, 03 Aug 2009) New Revision: 9520
Removed: trunk/cacao-source/debian/cacao.dirs trunk/cacao-source/debian/cacao.links trunk/cacao-source/debian/cacao.lintian-overrides trunk/cacao-source/debian/cacao.postinst trunk/cacao-source/debian/cacao.prerm trunk/cacao-source/debian/patches/ Modified: trunk/cacao-source/debian/changelog trunk/cacao-source/debian/compat trunk/cacao-source/debian/control trunk/cacao-source/debian/docs trunk/cacao-source/debian/rules trunk/cacao-source/debian/watch Log: - cacao-source-0.99.4-2 upload Deleted: trunk/cacao-source/debian/cacao.dirs =================================================================== --- trunk/cacao-source/debian/cacao.dirs 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/cacao.dirs 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,8 +0,0 @@ -usr/lib/jvm/cacao/bin -usr/lib/jvm/cacao/include/linux -usr/lib/jvm/cacao/lib -usr/lib/jvm/cacao/man/man1 -usr/lib/jvm/cacao/jre/bin -usr/lib/jvm/cacao/jre/lib -usr/lib/jvm/cacao/jre/lib/security -usr/share/lintian/overrides Deleted: trunk/cacao-source/debian/cacao.links =================================================================== --- trunk/cacao-source/debian/cacao.links 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/cacao.links 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,32 +0,0 @@ -usr/lib/jvm/cacao/jre/bin/java usr/lib/jvm/cacao/bin/java -usr/bin/javac usr/lib/jvm/cacao/bin/javac -usr/bin/javah usr/lib/jvm/cacao/bin/javah -usr/bin/javap usr/lib/jvm/cacao/bin/javap -usr/bin/javadoc usr/lib/jvm/cacao/bin/javadoc -usr/bin/jar usr/lib/jvm/cacao/bin/jar -usr/lib/jvm/cacao/jre/bin/rmiregistry usr/lib/jvm/cacao/bin/rmiregistry -usr/bin/serialver usr/lib/jvm/cacao/bin/serialver -usr/lib/jvm/cacao/jre/bin/javaw usr/lib/jvm/cacao/bin/javaw -usr/bin/native2ascii usr/lib/jvm/cacao/bin/native2ascii - -usr/share/man/man1/cacao.1.gz usr/lib/jvm/cacao/man/man1/java.1.gz -usr/share/man/man1/javac.1.gz usr/lib/jvm/cacao/man/man1/javac.1.gz -usr/share/man/man1/javah.1.gz usr/lib/jvm/cacao/man/man1/javah.1.gz -usr/share/man/man1/javap.1.gz usr/lib/jvm/cacao/man/man1/javap.1.gz -usr/share/man/man1/javadoc.1.gz usr/lib/jvm/cacao/man/man1/javadoc.1.gz -usr/share/man/man1/rmic.1.gz usr/lib/jvm/cacao/man/man1/rmic.1.gz -usr/share/man/man1/rmiregistry.1.gz usr/lib/jvm/cacao/man/man1/rmiregistry.1.gz -usr/share/man/man1/serialver.1.gz usr/lib/jvm/cacao/man/man1/serialver.1.gz - -usr/bin/cacao usr/lib/jvm/cacao/jre/bin/java -usr/bin/rmiregistry usr/lib/jvm/cacao/jre/bin/rmiregistry -usr/lib/jvm/cacao/jre/bin/java usr/lib/jvm/cacao/jre/bin/javaw - -usr/share/classpath/tools.zip usr/lib/jvm/cacao/lib/tools.jar - -usr/share/classpath/glibj.zip usr/lib/jvm/cacao/jre/lib/jaas.jar -usr/share/classpath/glibj.zip usr/lib/jvm/cacao/jre/lib/jdbc-stdext.jar -usr/share/classpath/glibj.zip usr/lib/jvm/cacao/jre/lib/jndi.jar -usr/share/classpath/glibj.zip usr/lib/jvm/cacao/jre/lib/rt.jar -usr/share/classpath/glibj.zip usr/lib/jvm/cacao/jre/lib/jsse.jar -usr/lib/security/classpath.security usr/lib/jvm/cacao/jre/lib/security/java.security Deleted: trunk/cacao-source/debian/cacao.lintian-overrides =================================================================== --- trunk/cacao-source/debian/cacao.lintian-overrides 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/cacao.lintian-overrides 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,6 +0,0 @@ -cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/lib/tools.jar ../../../../share/classpath/tools.zip -cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jsse.jar ../../../../../share/classpath/glibj.zip -cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/rt.jar ../../../../../share/classpath/glibj.zip -cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jndi.jar ../../../../../share/classpath/glibj.zip -cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jdbc-stdext.jar ../../../../../share/classpath/glibj.zip -cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jaas.jar ../../../../../share/classpath/glibj.zip Deleted: trunk/cacao-source/debian/cacao.postinst =================================================================== --- trunk/cacao-source/debian/cacao.postinst 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/cacao.postinst 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,17 +0,0 @@ -#!/bin/sh -e - -case "$1" in - configure) - update-alternatives \ - --install /usr/bin/java java /usr/bin/cacao 10 \ - --slave /usr/share/man/man1/java.1.gz java.1.gz \ - /usr/share/man/man1/cacao.1.gz - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 Deleted: trunk/cacao-source/debian/cacao.prerm =================================================================== --- trunk/cacao-source/debian/cacao.prerm 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/cacao.prerm 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,14 +0,0 @@ -#!/bin/sh -e - -case "$1" in - upgrade | remove) - update-alternatives --remove java /usr/bin/cacao - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 Modified: trunk/cacao-source/debian/changelog =================================================================== --- trunk/cacao-source/debian/changelog 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/changelog 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,3 +1,24 @@ +cacao-source (0.99.4-2) unstable; urgency=low + + * Rename the source package to cacao-source. + * Build the cacao-source binary package only, which is used by other + source packages to build a VM based on cacao. + * Allows independent builds of all packages using a CACAO VM. + + -- Matthias Klose <[email protected]> Mon, 03 Aug 2009 15:52:20 +0200 + +cacao (0.99.4-1) unstable; urgency=low + + * Cacao 0.99.4 release. + + -- Matthias Klose <[email protected]> Mon, 16 Mar 2009 21:19:31 +0100 + +cacao (0.99.4~20090303-1) unstable; urgency=low + + * New upstream snapshot, closer to a 0.99.4 release. + + -- Matthias Klose <[email protected]> Wed, 04 Mar 2009 22:19:14 +0100 + cacao (0.99.4~20081012-3) unstable; urgency=low * debian/rules: Set DEB_DESTDIR. Closes: #503164. @@ -49,6 +70,24 @@ -- Matthias Klose <[email protected]> Sat, 11 Oct 2008 08:50:53 +0000 +cacao (0.99.4~20081006-0ubuntu2) intrepid; urgency=low + + * Use a toplevel directory in the cacao-source tarball. + * Build in a separate builddir and don't include the build in the + cacao-source package. + + -- Matthias Klose <[email protected]> Tue, 07 Oct 2008 14:22:24 +0200 + +cacao (0.99.4~20081006-0ubuntu1) intrepid; urgency=low + + * Update to a HG snapshot of 0.99.4. (LP: #278957) + * Add a cacao-source package. + * Drop cacao-0.98-kfreebsd.patch, as it isn't needed. + * Chop and change ./configure options. + * Don't move the executable, it isn't installed to /usr/bin any more. + + -- Steve Kowalik <[email protected]> Mon, 06 Oct 2008 19:36:11 +1100 + cacao (0.99~rc5-1) experimental; urgency=low * New upstream release. Modified: trunk/cacao-source/debian/compat =================================================================== --- trunk/cacao-source/debian/compat 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/compat 2009-08-03 14:33:26 UTC (rev 9520) @@ -1 +1 @@ -4 +5 Modified: trunk/cacao-source/debian/control =================================================================== --- trunk/cacao-source/debian/control 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/control 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,31 +1,21 @@ -Source: cacao -Section: interpreters +Source: cacao-source +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Stephan Michels <[email protected]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 5), cdbs (>= 0.4.17), default-jdk-builddep [!alpha], openjdk-6-jdk [alpha], classpath (>= 2:0.96.1), classpath-common (>= 2:0.96.1), zlib1g-dev, libltdl3-dev, zip, bzip2 -Standards-Version: 3.8.0 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cacao -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cacao +Uploaders: Matthias Klose <[email protected]>, Michael Koch <[email protected]> +Build-Depends: debhelper (>= 5), bzip2 +Standards-Version: 3.8.2 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cacao-source +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cacao-source Homepage: http://www.cacaojvm.org/ -Package: cacao -Architecture: any -Depends: classpath (>= 2:0.96.1), classpath-common (>= 2:0.96.1), ${shlibs:Depends} -Description: Java virtual machine - CACAO is a free virtual machine for running Java programs - It has a state-of-the-art optimizing JIT compiler, with - performance competitive with that of the Sun HotSpot product JVM. - . - Note that CACAO is not officially certified as Java. (Nor is any - other free virtual machine.) This is because some aspects of Java - -- such as the Swing extensions -- are not implemented by the - free GNU Classpath libraries, which the CACAO runtime uses. - Package: cacao-source Priority: extra -Section: devel +Section: java Architecture: all Description: Source for CACAO, a Java virtual machine This package provides the source for CACAO so that other packages can utilise it easily. + . + It is used by packages like OpenJDK and classpath to build a VM based + on CACAO. Modified: trunk/cacao-source/debian/docs =================================================================== --- trunk/cacao-source/debian/docs 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/docs 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,10 +1,2 @@ NEWS README -ChangeLog-1998 -ChangeLog-1999 -ChangeLog-2000 -ChangeLog-2001 -ChangeLog-2002 -ChangeLog-2003 -ChangeLog-2004 -ChangeLog-2005 Modified: trunk/cacao-source/debian/rules =================================================================== --- trunk/cacao-source/debian/rules 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/rules 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,59 +1,38 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +upstream_version = 0.99.4 -DEB_DESTDIR = $(CURDIR)/debian/cacao +build: + @echo Nothing to build. -DEB_BUILDDIR = $(DEB_SRCDIR)/build +clean: + dh_clean -DEB_CONFIGURE_EXTRA_FLAGS := \ - --with-java-runtime-library-prefix=/usr \ - --disable-disassembler \ - --libdir=/usr/lib/cacao \ - --with-jni_h=/usr/include/classpath \ - --with-jni_md_h=/usr/include/classpath +install: + dh_testdir + dh_testroot + dh_clean -k + mkdir -p $(CURDIR)/debian/cacao-source/usr/src/cacao-$(upstream_version) + tar -c --exclude=debian --exclude=build --exclude=*.cdbs-orig --exclude=*.orig -f - . \ + | tar -x -C debian/cacao-source/usr/src/cacao-$(upstream_version) -f - + cd debian/cacao-source/usr/src \ + && tar cfj cacao-$(upstream_version).tar.bz2 cacao-$(upstream_version) + rm -rf debian/cacao-source/usr/src/cacao-$(upstream_version) -ifneq (,$(filter $(DEB_HOST_ARCH), alpha)) - DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/java-6-openjdk/bin/javac" -else - DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/default-java/bin/javac" -endif +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs -i + dh_installdocs -i NEWS README + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i -ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) - DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread -else - DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs" -endif +binary-arch: build install +# nothing to do -DEB_DH_MAKESHLIBS_ARGS := -X/usr/lib/cacao - -upstream_version := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//') - -clean:: - rm -rf build - -binary-predeb/cacao:: - rm -f $(CURDIR)/debian/cacao/usr/bin/java - - # Remove unecessary directories - rm -rf $(CURDIR)/debian/cacao/usr/include - - # Install lintian overrides - cp $(CURDIR)/debian/cacao.lintian-overrides \ - $(CURDIR)/debian/cacao/usr/share/lintian/overrides/cacao - -binary-predeb/cacao-source:: - mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version) - tar -c --exclude=debian --exclude=build --exclude=*.cdbs-orig --exclude=*.orig -f - . \ - | tar -x -C debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version) -f - - cd debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version) \ - && for i in $(CURDIR)/debian/patches/*; do \ - case "$$i" in *.log) continue; esac; \ - echo "Reverting patch $$i"; \ - patch -p1 -R --no-backup < $$i; \ - done - cd debian/$(cdbs_curpkg)/usr/src \ - && tar cfj cacao-$(upstream_version).tar.bz2 cacao-$(upstream_version) - rm -rf debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version) +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install Modified: trunk/cacao-source/debian/watch =================================================================== --- trunk/cacao-source/debian/watch 2009-08-03 14:29:43 UTC (rev 9519) +++ trunk/cacao-source/debian/watch 2009-08-03 14:33:26 UTC (rev 9520) @@ -1,2 +1,2 @@ version=3 -http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-([\d.]+)/cacao-([\d.]+)\.tar\.(?:gz|bz2) debian uupdate +http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-([.0-9]+)/ cacao-([.0-9]+)\.tar\.bz2 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
