[pkg-java] r7135 - in trunk/cacao/debian: . patches

[doko at alioth.debian.org]

Author: doko
Date: 2008-10-12 22:16:47 +0000 (Sun, 12 Oct 2008)
New Revision: 7135

Removed:
   trunk/cacao/debian/patches/cacao-data-start.diff
   trunk/cacao/debian/patches/cacao-mipsel-linux.diff
Modified:
   trunk/cacao/debian/changelog
   trunk/cacao/debian/control
Log:
cacao (0.99.4~20081012-1) experimental; urgency=low

  * Build a cacao-source package (to be used as a build dependency of
    cacao-oj6).
  * New upstream snapshot; remove patches integrated upstream.

 -- Matthias Klose <doko at debian.org>  Sun, 12 Oct 2008 22:07:46 +0000


Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog	2008-10-12 21:34:48 UTC (rev 7134)
+++ trunk/cacao/debian/changelog	2008-10-12 22:16:47 UTC (rev 7135)
@@ -1,3 +1,11 @@
+cacao (0.99.4~20081012-1) experimental; urgency=low
+
+  * Build a cacao-source package (to be used as a build dependency of
+    cacao-oj6).
+  * New upstream snapshot; remove patches integrated upstream.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 12 Oct 2008 22:07:46 +0000
+
 cacao (0.99.4~20081011-2) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control	2008-10-12 21:34:48 UTC (rev 7134)
+++ trunk/cacao/debian/control	2008-10-12 22:16:47 UTC (rev 7135)
@@ -22,8 +22,8 @@
  -- 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.
+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.

Deleted: trunk/cacao/debian/patches/cacao-data-start.diff
===================================================================
--- trunk/cacao/debian/patches/cacao-data-start.diff	2008-10-12 21:34:48 UTC (rev 7134)
+++ trunk/cacao/debian/patches/cacao-data-start.diff	2008-10-12 22:16:47 UTC (rev 7135)
@@ -1,22 +0,0 @@
---- cacao/src/mm/boehm-gc/include/private/gcconfig.h.orig	2008-09-10 18:06:16.000000000 +0200
-+++ cacao/src/mm/boehm-gc/include/private/gcconfig.h	2008-10-11 21:16:45.000000000 +0200
-@@ -1320,8 +1320,7 @@
- #     define DYNAMIC_LOADING
-       extern int _end[];
- #     define DATAEND (_end)
--      extern int __data_start[];
--#     define DATASTART ((ptr_t)(__data_start))
-+#     define SEARCH_FOR_DATA_START
- #     define CPP_WORDSZ _MIPS_SZPTR
- #     define ALIGNMENT (_MIPS_SZPTR/8)
- #     if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2
-@@ -1708,8 +1707,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

Deleted: trunk/cacao/debian/patches/cacao-mipsel-linux.diff
===================================================================
--- trunk/cacao/debian/patches/cacao-mipsel-linux.diff	2008-10-12 21:34:48 UTC (rev 7134)
+++ trunk/cacao/debian/patches/cacao-mipsel-linux.diff	2008-10-12 22:16:47 UTC (rev 7135)
@@ -1,44 +0,0 @@
---- cacao/configure.ac.orig	2008-09-10 18:42:21.000000000 +0200
-+++ cacao/configure.ac	2008-10-11 12:25:34.000000000 +0200
-@@ -74,13 +74,18 @@
-     JAVA_ARCH="m68k"
-     ;;
- 
--mips | mipsel )
-+mips )
-     ARCH_DIR="mips"
-     ARCH_CFLAGS="-D__MIPS__"
--    dnl Is this correct for mipsel?
-     JAVA_ARCH="mips"
-     ;;
- 
-+mipsel )
-+    ARCH_DIR="mips"
-+    ARCH_CFLAGS="-D__MIPS__"
-+    JAVA_ARCH="mipsel"
-+    ;;
-+
- powerpc )
-     ARCH_DIR="powerpc"
-     ARCH_CFLAGS="-m32 -D__POWERPC__"
---- cacao/configure.orig	2008-10-11 10:46:02.000000000 +0200
-+++ cacao/configure	2008-10-11 12:25:34.000000000 +0200
-@@ -2861,10 +2861,16 @@
-     JAVA_ARCH="m68k"
-     ;;
- 
--mips | mipsel )
-+mips )
-     ARCH_DIR="mips"
-     ARCH_CFLAGS="-D__MIPS__"
--        JAVA_ARCH="mips"
-+    JAVA_ARCH="mips"
-+    ;;
-+
-+mipsel )
-+    ARCH_DIR="mips"
-+    ARCH_CFLAGS="-D__MIPS__"
-+    JAVA_ARCH="mipsel"
-     ;;
- 
- powerpc )