[pkg-java] r7127 - in trunk/cacao/debian: . patches
doko at alioth.debian.org
doko at alioth.debian.org
Sat Oct 11 09:55:24 UTC 2008
Author: doko
Date: 2008-10-11 09:55:24 +0000 (Sat, 11 Oct 2008)
New Revision: 7127
Removed:
trunk/cacao/debian/patches/cacao-0.98-kfreebsd.patch
trunk/cacao/debian/patches/cacao-0.99rc5-s390.patch
Modified:
trunk/cacao/debian/changelog
trunk/cacao/debian/control
trunk/cacao/debian/copyright
trunk/cacao/debian/rules
Log:
cacao (0.99.4~20081011-1) unstable; urgency=low
* Upload with correct maintainer address.
-- Matthias Klose <doko at debian.org> Sat, 11 Oct 2008 09:49:46 +0000
cacao (0.99.4~20081011-0) unstable; urgency=low
* New upstream snapshot, close to the 0.99.4 release.
- Drop cacao-0.98-kfreebsd.patch, as it isn't needed.
* Updated Standards-Version to 3.8.0.
* debian/copyright: Add copyrights for new files, remove copyrights
for files not distributed anymore. Closes: #495223.
-- Matthias Klose <doko at debian.org> Sat, 11 Oct 2008 08:50:53 +0000
Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog 2008-10-06 19:08:12 UTC (rev 7126)
+++ trunk/cacao/debian/changelog 2008-10-11 09:55:24 UTC (rev 7127)
@@ -1,9 +1,19 @@
-cacao (0.99~rc5-2) UNRELEASED; urgency=low
+cacao (0.99.4~20081011-1) unstable; urgency=low
- * Really apply fix for __data_start on s390.
+ * Upload with correct maintainer address.
- -- Michael Koch <konqueror at gmx.de> Sat, 07 Jun 2008 07:26:21 +0200
+ -- Matthias Klose <doko at debian.org> Sat, 11 Oct 2008 09:49:46 +0000
+cacao (0.99.4~20081011-0) unstable; urgency=low
+
+ * New upstream snapshot, close to the 0.99.4 release.
+ - Drop cacao-0.98-kfreebsd.patch, as it isn't needed.
+ * Updated Standards-Version to 3.8.0.
+ * debian/copyright: Add copyrights for new files, remove copyrights
+ for files not distributed anymore. Closes: #495223.
+
+ -- Matthias Klose <doko at debian.org> Sat, 11 Oct 2008 08:50:53 +0000
+
cacao (0.99~rc5-1) experimental; urgency=low
* New upstream release.
Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control 2008-10-06 19:08:12 UTC (rev 7126)
+++ trunk/cacao/debian/control 2008-10-11 09:55:24 UTC (rev 7127)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Stephan Michels <stephan at apache.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.17), default-jdk-builddep, classpath (>= 2:0.96.1), classpath-common (>= 2:0.96.1), zlib1g-dev, libltdl3-dev, zip
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.17), default-jdk-builddep, 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
Homepage: http://www.cacaojvm.org/
@@ -21,3 +21,9 @@
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
+#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.
Modified: trunk/cacao/debian/copyright
===================================================================
--- trunk/cacao/debian/copyright 2008-10-06 19:08:12 UTC (rev 7126)
+++ trunk/cacao/debian/copyright 2008-10-11 09:55:24 UTC (rev 7127)
@@ -278,48 +278,57 @@
3. This notice may not be removed or altered from any source distribution.
-* src/libltdl
+src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/armcc
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
+ * Copyright (c) 2007 by NEC LE-IT: All rights reserved.
+ * A transcription of ARMv6 atomic operations for the ARM Realview Toolchain.
+ * This code works with armcc from RVDS 3.1
+ * This is based on work in gcc/arm.h by
+ * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved.
+ * Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved.
+ * Copyright (c) 1999-2003 by Hewlett-Packard Company. All rights reserved.
+ *
+ *
+ *
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+ *
+ * Permission is hereby granted to use or copy this program
+ * for any purpose, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
+src/mm/boehm-gc/include/private
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
+ Copyright (c) 2004-2005 Andrei Polushin
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+contrib/vmlog:
-* src/libffi
+/* Copyright (C) 2006 Edwin Steiner <edwin.steiner at gmx.net> */
+/* 2007 Peter Molnar <peter.molnar at wm.sk> */
-Copyright (c) 1996 Red Hat, Inc.
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-``Software''), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Some of the build files are
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
Deleted: trunk/cacao/debian/patches/cacao-0.98-kfreebsd.patch
===================================================================
--- trunk/cacao/debian/patches/cacao-0.98-kfreebsd.patch 2008-10-06 19:08:12 UTC (rev 7126)
+++ trunk/cacao/debian/patches/cacao-0.98-kfreebsd.patch 2008-10-11 09:55:24 UTC (rev 7127)
@@ -1,98 +0,0 @@
-only in patch2:
-unchanged:
---- cacao-0.98.orig/src/mm/boehm-gc/os_dep.c
-+++ cacao-0.98/src/mm/boehm-gc/os_dep.c
-@@ -86,7 +86,7 @@
- # define NEED_FIND_LIMIT
- # endif
-
--#if defined(FREEBSD) && (defined(I386) || defined(powerpc) || defined(__powerpc__))
-+#if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc) || defined(__powerpc__))
- # include <machine/trap.h>
- # if !defined(PCR)
- # define NEED_FIND_LIMIT
-@@ -1394,7 +1394,7 @@
- }
- # endif
-
--# if defined(FREEBSD) && (defined(I386) || defined(powerpc) || defined(__powerpc__)) && !defined(PCR)
-+# if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc) || defined(__powerpc__)) && !defined(PCR)
- /* Its unclear whether this should be identical to the above, or */
- /* whether it should apply to non-X86 architectures. */
- /* For now we don't assume that there is always an empty page after */
-only in patch2:
-unchanged:
---- cacao-0.98.orig/src/mm/boehm-gc/include/private/gcconfig.h
-+++ cacao-0.98/src/mm/boehm-gc/include/private/gcconfig.h
-@@ -334,6 +334,10 @@
- # define I386
- # define mach_type_known
- # endif
-+# if defined(FREEBSD) && defined(__x86_64__)
-+# define X86_64
-+# define mach_type_known
-+# endif
- # if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
- # define I386
- # define mach_type_known
-only in patch2:
-unchanged:
---- cacao-0.98.orig/configure.ac
-+++ cacao-0.98/configure.ac
-@@ -129,6 +129,13 @@
- ARCH_CFLAGS="$ARCH_CFLAGS -D__DARWIN__ -ansi -pedantic -Wall -Wno-long-long"
- ;;
-
-+dnl must be before *freebsd*
-+*kfreebsd*-gnu)
-+ OS_DIR="freebsd"
-+ INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-+ ARCH_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-+ ;;
-+
- *freebsd* )
- OS_DIR="freebsd"
- INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
-@@ -141,12 +148,6 @@
- ARCH_CFLAGS="$ARCH_CFLAGS -D__IRIX__"
- ;;
-
--*kfreebsd*-gnu)
-- OS_DIR="freebsd"
-- INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-- ARCH_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-- ;;
--
- dnl must be before *linux*
- *uclinux | *elf )
- OS_DIR="uclinux"
-only in patch2:
-unchanged:
---- cacao-0.98.orig/configure
-+++ cacao-0.98/configure
-@@ -2768,6 +2768,12 @@
- ARCH_CFLAGS="$ARCH_CFLAGS -D__DARWIN__ -ansi -pedantic -Wall -Wno-long-long"
- ;;
-
-+*kfreebsd*-gnu)
-+ OS_DIR="freebsd"
-+ INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-+ ARCH_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-+ ;;
-+
- *freebsd* )
- OS_DIR="freebsd"
- INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_XOPEN_SOURCE_EXTENDED"
-@@ -2780,12 +2786,6 @@
- ARCH_CFLAGS="$ARCH_CFLAGS -D__IRIX__"
- ;;
-
--*kfreebsd*-gnu)
-- OS_DIR="freebsd"
-- INTRP_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-- ARCH_CFLAGS="$ARCH_CFLAGS -D__FREEBSD__ -ansi -pedantic -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
-- ;;
--
- *uclinux | *elf )
- OS_DIR="uclinux"
- INTRP_CFLAGS="$ARCH_CFLAGS -D__LINUX__ -Wall -Wno-long-long -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
Deleted: trunk/cacao/debian/patches/cacao-0.99rc5-s390.patch
===================================================================
--- trunk/cacao/debian/patches/cacao-0.99rc5-s390.patch 2008-10-06 19:08:12 UTC (rev 7126)
+++ trunk/cacao/debian/patches/cacao-0.99rc5-s390.patch 2008-10-11 09:55:24 UTC (rev 7127)
@@ -1,13 +0,0 @@
-diff -u src/mm/boehm-gc/include/private/gcconfig.h src/mm/boehm-gc/include/private/gcconfig.h
---- src/mm/boehm-gc/include/private/gcconfig.h
-+++ src/mm/boehm-gc/include/private/gcconfig.h
-@@ -1829,8 +1829,7 @@
- # define OS_TYPE "LINUX"
- # define LINUX_STACKBOTTOM
- # define DYNAMIC_LOADING
-- extern int __data_start[];
--# define DATASTART ((ptr_t)(__data_start))
-+# define SEARCH_FOR_DATA_START
- extern int _end[];
- # define DATAEND (_end)
- # define CACHE_LINE_SIZE 256
Modified: trunk/cacao/debian/rules
===================================================================
--- trunk/cacao/debian/rules 2008-10-06 19:08:12 UTC (rev 7126)
+++ trunk/cacao/debian/rules 2008-10-11 09:55:24 UTC (rev 7127)
@@ -4,7 +4,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --with-classpath-prefix=/usr --with-classpath-includedir=/usr/include/classpath --disable-disassembler --libdir=/usr/lib/cacao --with-jni_h=/usr/include/classpath --with-jni_md_h=/usr/include/classpath
+DEB_BUILDDIR = $(DEB_SRCDIR)/build
+
+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
DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/default-java/bin/javac"
ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
@@ -13,12 +15,25 @@
endif
DEB_DH_MAKESHLIBS_ARGS := -X/usr/lib/cacao
+upstream_version := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
+
+clean::
+ rm -rf build
+
binary-predeb/cacao::
- # Move executables
- mv $(CURDIR)/debian/cacao/usr/bin/java $(CURDIR)/debian/cacao/usr/lib/jvm/cacao/bin/
+ 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 -f - . \
+ | tar -x -C debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version) -f -
+ 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)
More information about the pkg-java-commits
mailing list