[Pkg-mono-svn-commits] rev 3305 - in mono/trunk/debian: . man patches

Mirco Bauer meebey-guest at alioth.debian.org
Sun Sep 2 22:58:28 UTC 2007


Author: meebey-guest
Date: 2007-09-02 22:58:28 +0000 (Sun, 02 Sep 2007)
New Revision: 3305

Removed:
   mono/trunk/debian/man/resgen.1
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/mono-mcs.manpages
   mono/trunk/debian/mono-utils.install
   mono/trunk/debian/mono-utils.manpages
   mono/trunk/debian/patches/00list
   mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch
   mono/trunk/debian/patches/kfreebsd_support.dpatch
   mono/trunk/debian/patches/ppc_fix_memory_corruption_r81413.dpatch
   mono/trunk/debian/rules
   mono/trunk/debian/watch
Log:
- mono 1.2.5-1~pre1



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/changelog	2007-09-02 22:58:28 UTC (rev 3305)
@@ -1,3 +1,36 @@
+mono (1.2.5-1~pre1) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Mirco 'meebey' Bauer:
+    + New upstream release
+    + debian/watch:
+      - Updated
+    + debian/rules:
+      - Bumped MONO_API to 1.2.5
+    + debian/patches/kfreebsd_support.dpatch
+      debian/patches/armel_fix_configure_fpu_check.dpatch:
+      - Updated (re-autoconfed)
+      - Updated
+    + debian/patches/ppc_fix_memory_corruption_r81413.dpatch:
+      debian/patches/fix_delegate_memory_leak_r79001.dpatch
+      debian/patches/remove_broken_dllmap_from_mono-shlib-cop.dpatch:
+      - Removed, already applied upstream.
+    + debian/mono-utils.install
+      debian/mono-utils.manpages:
+      - Removed monodiet as removed by upstream
+    + debian/man/resgen.1:
+      - Removed, supplied upstream.
+    + debian/mono-mcs.manpages:
+      - Added monolinker.1
+      - Updated resgen.1
+    + debian/mono-mcs.manpages
+      debian/mono-mjs.manpages:
+      - Moved mono-mjs.1 manpage to mono-mjs package.
+    + debian/control:
+      - Added "Replaces" for mono-mjs.1 move to mono-mjs package.
+
+ -- Mirco Bauer <meebey at debian.org>  Sun, 02 Sep 2007 21:36:13 +0200
+
 mono (1.2.4-6) unstable; urgency=medium
 
   * Mirco 'meebey' Bauer:

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/control	2007-09-02 22:58:28 UTC (rev 3305)
@@ -971,7 +971,7 @@
 Section: devel
 Architecture: all
 Depends: ${cli:Depends}
-Replaces: mono-mcs (<< 1.1.13.6-1)
+Replaces: mono-mcs (<< 1.2.5-1)
 Description: Mono JScript compiler
  This is the Mono JScript compiler, a platform-independent compiler which
  produces CIL (Common Intermediate Language) binary executables.

Deleted: mono/trunk/debian/man/resgen.1
===================================================================
--- mono/trunk/debian/man/resgen.1	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/man/resgen.1	2007-09-02 22:58:28 UTC (rev 3305)
@@ -1,11 +0,0 @@
-.TH UNDOCUMENTED 1 "January 15th, 2004" "Debian GNU/Linux" "Mono Manual"
-.SH NAME
-undocumented \- No manpage for this program.
-.SH DESCRIPTION
-This
-.B program
-does not have a manpage. Run this command with the
-.B help
-switch to see what it does. For further information, refer to the .NET
-documentation from the Mono project, located on
-.B http://www.go-mono.com:8080/

Modified: mono/trunk/debian/mono-mcs.manpages
===================================================================
--- mono/trunk/debian/mono-mcs.manpages	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/mono-mcs.manpages	2007-09-02 22:58:28 UTC (rev 3305)
@@ -11,14 +11,14 @@
 debian/tmp/usr/share/man/man1/macpack.1
 debian/tmp/usr/share/man/man1/makecert.1
 debian/tmp/usr/share/man/man1/mcs.1
-debian/man/mjs.1
 debian/tmp/usr/share/man/man1/mkbundle.1
 debian/tmp/usr/share/man/man1/mono-service.1
 debian/tmp/usr/share/man/man1/mono-shlib-cop.1
+debian/tmp/usr/share/man/man1/monolinker.1
 debian/tmp/usr/share/man/man1/monop.1
 debian/tmp/usr/share/man/man1/mozroots.1
 debian/tmp/usr/share/man/man1/permview.1
-debian/man/resgen.1
+debian/tmp/usr/share/man/man1/resgen.1
 debian/tmp/usr/share/man/man1/secutil.1
 debian/tmp/usr/share/man/man1/setreg.1
 debian/tmp/usr/share/man/man1/signcode.1

Modified: mono/trunk/debian/mono-utils.install
===================================================================
--- mono/trunk/debian/mono-utils.install	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/mono-utils.install	2007-09-02 22:58:28 UTC (rev 3305)
@@ -1,6 +1,5 @@
 debian/tmp/usr/bin/pedump
 debian/tmp/usr/bin/monodis		/usr/bin/
 debian/tmp/usr/bin/monograph
-debian/tmp/usr/bin/monodiet
 debian/tmp/usr/bin/mono-find-provides
 debian/tmp/usr/bin/mono-find-requires

Modified: mono/trunk/debian/mono-utils.manpages
===================================================================
--- mono/trunk/debian/mono-utils.manpages	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/mono-utils.manpages	2007-09-02 22:58:28 UTC (rev 3305)
@@ -1,5 +1,4 @@
 debian/man/pedump.1
-debian/man/monodiet.1
 debian/man/monograph.1
 debian/man/mono-find-provides.1
 debian/man/mono-find-requires.1

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/patches/00list	2007-09-02 22:58:28 UTC (rev 3305)
@@ -1,10 +1,7 @@
 armel_fix_configure_fpu_check
 kfreebsd_support
-remove_broken_dllmap_from_mono-shlib-cop
 console-no-utf8-bom
 firebird-fbclient
 fix-mono.pc.in
 fix-mono-cairo.pc.in
 g_thread_init
-ppc_fix_memory_corruption_r81413
-fix_delegate_memory_leak_r79001

Modified: mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch
===================================================================
--- mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch	2007-09-02 22:58:28 UTC (rev 3305)
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad mono-1.2.4~/configure.in mono-1.2.4/configure.in
---- mono-1.2.4~/configure.in	2007-07-21 15:36:55.000000000 +0200
-+++ mono-1.2.4/configure.in	2007-07-21 15:36:59.000000000 +0200
-@@ -1880,19 +1880,24 @@
+diff -urNad mono-1.2.5~/configure.in mono-1.2.5/configure.in
+--- mono-1.2.5~/configure.in	2007-08-17 19:41:56.000000000 +0200
++++ mono-1.2.5/configure.in	2007-08-17 19:42:47.000000000 +0200
+@@ -1893,19 +1893,24 @@
  	])
  fi
  
@@ -40,185 +40,185 @@
  
  	AC_MSG_RESULT($fpu)
  	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
-diff -urNad mono-1.2.4~/configure mono-1.2.4/configure
---- mono-1.2.4~/configure	2007-07-21 15:36:55.000000000 +0200
-+++ mono-1.2.4/configure	2007-07-21 15:38:46.000000000 +0200
-@@ -1606,6 +1606,7 @@
+diff -urNad mono-1.2.5~/configure mono-1.2.5/configure
+--- mono-1.2.5~/configure	2007-08-17 19:41:56.000000000 +0200
++++ mono-1.2.5/configure	2007-08-17 19:43:15.000000000 +0200
+@@ -1610,6 +1610,7 @@
    --with-jit=yes,no       If you want to build scripts that default to the JIT
    --with-interp=yes,no    If you want to build scripts that default to the interpreter
    --with-x                use the X Window System
 + --with-fpu=FPA,VFP,NONE	Select fpu to use on arm
   --with-preview=yes,no     If you want to install the 2.0 FX preview
+  --with-moonlight=yes,no   If you want to build the Moonlight 2.1 assemblies
  
- Some influential environment variables:
-@@ -6531,7 +6532,7 @@
+@@ -6545,7 +6546,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 6534 "configure"' > conftest.$ac_ext
-+  echo '#line 6535 "configure"' > conftest.$ac_ext
+-  echo '#line 6548 "configure"' > conftest.$ac_ext
++  echo '#line 6549 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -9330,11 +9331,11 @@
+@@ -9344,11 +9345,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9333: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9334: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9347: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9348: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9337: \$? = $ac_status" >&5
-+   echo "$as_me:9338: \$? = $ac_status" >&5
+-   echo "$as_me:9351: \$? = $ac_status" >&5
++   echo "$as_me:9352: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9598,11 +9599,11 @@
+@@ -9612,11 +9613,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9601: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9602: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9615: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9616: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9605: \$? = $ac_status" >&5
-+   echo "$as_me:9606: \$? = $ac_status" >&5
+-   echo "$as_me:9619: \$? = $ac_status" >&5
++   echo "$as_me:9620: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9702,11 +9703,11 @@
+@@ -9716,11 +9717,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9705: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9706: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9719: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9720: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9709: \$? = $ac_status" >&5
-+   echo "$as_me:9710: \$? = $ac_status" >&5
+-   echo "$as_me:9723: \$? = $ac_status" >&5
++   echo "$as_me:9724: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -12154,7 +12155,7 @@
+@@ -12168,7 +12169,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 12157 "configure"
-+#line 12158 "configure"
+-#line 12171 "configure"
++#line 12172 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12254,7 +12255,7 @@
+@@ -12268,7 +12269,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 12257 "configure"
-+#line 12258 "configure"
+-#line 12271 "configure"
++#line 12272 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -14622,11 +14623,11 @@
+@@ -14636,11 +14637,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14625: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14626: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14639: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14640: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14629: \$? = $ac_status" >&5
-+   echo "$as_me:14630: \$? = $ac_status" >&5
+-   echo "$as_me:14643: \$? = $ac_status" >&5
++   echo "$as_me:14644: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14726,11 +14727,11 @@
+@@ -14740,11 +14741,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14730: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14743: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14744: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14733: \$? = $ac_status" >&5
-+   echo "$as_me:14734: \$? = $ac_status" >&5
+-   echo "$as_me:14747: \$? = $ac_status" >&5
++   echo "$as_me:14748: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16296,11 +16297,11 @@
+@@ -16310,11 +16311,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16299: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16300: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16313: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16314: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16303: \$? = $ac_status" >&5
-+   echo "$as_me:16304: \$? = $ac_status" >&5
+-   echo "$as_me:16317: \$? = $ac_status" >&5
++   echo "$as_me:16318: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16400,11 +16401,11 @@
+@@ -16414,11 +16415,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16403: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16404: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16417: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16418: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16407: \$? = $ac_status" >&5
-+   echo "$as_me:16408: \$? = $ac_status" >&5
+-   echo "$as_me:16421: \$? = $ac_status" >&5
++   echo "$as_me:16422: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -18630,11 +18631,11 @@
+@@ -18644,11 +18645,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18633: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18634: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18647: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18648: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18637: \$? = $ac_status" >&5
-+   echo "$as_me:18638: \$? = $ac_status" >&5
+-   echo "$as_me:18651: \$? = $ac_status" >&5
++   echo "$as_me:18652: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -18898,11 +18899,11 @@
+@@ -18912,11 +18913,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18901: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18902: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18915: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18916: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18905: \$? = $ac_status" >&5
-+   echo "$as_me:18906: \$? = $ac_status" >&5
+-   echo "$as_me:18919: \$? = $ac_status" >&5
++   echo "$as_me:18920: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -19002,11 +19003,11 @@
+@@ -19016,11 +19017,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:19005: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19006: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:19019: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19020: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:19009: \$? = $ac_status" >&5
-+   echo "$as_me:19010: \$? = $ac_status" >&5
+-   echo "$as_me:19023: \$? = $ac_status" >&5
++   echo "$as_me:19024: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -40074,11 +40075,20 @@
+@@ -40617,11 +40618,20 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -240,7 +240,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -40089,7 +40099,7 @@
+@@ -40632,7 +40642,7 @@
  main ()
  {
  
@@ -249,7 +249,7 @@
  
    ;
    return 0;
-@@ -40135,7 +40145,7 @@
+@@ -40678,7 +40688,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -258,7 +258,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -40146,7 +40156,7 @@
+@@ -40689,7 +40699,7 @@
  main ()
  {
  
@@ -267,7 +267,7 @@
  
    ;
    return 0;
-@@ -40199,6 +40209,7 @@
+@@ -40742,6 +40752,7 @@
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

Modified: mono/trunk/debian/patches/kfreebsd_support.dpatch
===================================================================
--- mono/trunk/debian/patches/kfreebsd_support.dpatch	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/patches/kfreebsd_support.dpatch	2007-09-02 22:58:28 UTC (rev 3305)
@@ -5,9 +5,9 @@
 ## DP: kfreebsd support - mainly backport of gc 6.8
 
 @DPATCH@
-diff -urNad mono-1.2.4~/configure.in mono-1.2.4/configure.in
---- mono-1.2.4~/configure.in	2007-08-09 20:27:13.000000000 +0200
-+++ mono-1.2.4/configure.in	2007-08-09 20:27:18.000000000 +0200
+diff -urNad mono-1.2.5~/configure.in mono-1.2.5/configure.in
+--- mono-1.2.5~/configure.in	2007-08-17 19:44:44.000000000 +0200
++++ mono-1.2.5/configure.in	2007-08-17 19:44:56.000000000 +0200
 @@ -93,6 +93,16 @@
  		libgc_threads=pthreads
  		with_sigaltstack=no
@@ -25,7 +25,7 @@
  # these flags will work for all versions of -STABLE
  #
  	*-*-*freebsd4*)
-@@ -1795,6 +1805,11 @@
+@@ -1808,6 +1818,11 @@
  	LIBC="libc.so.12"
  	INTL="libintl.so.0"
  	;;
@@ -37,10 +37,10 @@
      *-*-*freebsd*)
      	LIBC="libc.so"
  	INTL="libintl.so"
-diff -urNad mono-1.2.4~/configure mono-1.2.4/configure
---- mono-1.2.4~/configure	2007-08-09 20:27:13.000000000 +0200
-+++ mono-1.2.4/configure	2007-08-09 20:27:58.000000000 +0200
-@@ -2848,6 +2848,16 @@
+diff -urNad mono-1.2.5~/configure mono-1.2.5/configure
+--- mono-1.2.5~/configure	2007-08-17 19:44:44.000000000 +0200
++++ mono-1.2.5/configure	2007-08-17 19:45:20.000000000 +0200
+@@ -2855,6 +2855,16 @@
  		libgc_threads=pthreads
  		with_sigaltstack=no
  		;;
@@ -57,174 +57,174 @@
  # these flags will work for all versions of -STABLE
  #
  	*-*-*freebsd4*)
-@@ -6532,7 +6542,7 @@
+@@ -6546,7 +6556,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 6535 "configure"' > conftest.$ac_ext
-+  echo '#line 6545 "configure"' > conftest.$ac_ext
+-  echo '#line 6549 "configure"' > conftest.$ac_ext
++  echo '#line 6559 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -9331,11 +9341,11 @@
+@@ -9345,11 +9355,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9334: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9344: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9348: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9358: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9338: \$? = $ac_status" >&5
-+   echo "$as_me:9348: \$? = $ac_status" >&5
+-   echo "$as_me:9352: \$? = $ac_status" >&5
++   echo "$as_me:9362: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9599,11 +9609,11 @@
+@@ -9613,11 +9623,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9602: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9612: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9616: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9626: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9606: \$? = $ac_status" >&5
-+   echo "$as_me:9616: \$? = $ac_status" >&5
+-   echo "$as_me:9620: \$? = $ac_status" >&5
++   echo "$as_me:9630: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9703,11 +9713,11 @@
+@@ -9717,11 +9727,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9706: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9716: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9720: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9730: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9710: \$? = $ac_status" >&5
-+   echo "$as_me:9720: \$? = $ac_status" >&5
+-   echo "$as_me:9724: \$? = $ac_status" >&5
++   echo "$as_me:9734: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -12155,7 +12165,7 @@
+@@ -12169,7 +12179,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 12158 "configure"
-+#line 12168 "configure"
+-#line 12172 "configure"
++#line 12182 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12255,7 +12265,7 @@
+@@ -12269,7 +12279,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 12258 "configure"
-+#line 12268 "configure"
+-#line 12272 "configure"
++#line 12282 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -14623,11 +14633,11 @@
+@@ -14637,11 +14647,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14626: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14636: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14640: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14650: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14630: \$? = $ac_status" >&5
-+   echo "$as_me:14640: \$? = $ac_status" >&5
+-   echo "$as_me:14644: \$? = $ac_status" >&5
++   echo "$as_me:14654: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14727,11 +14737,11 @@
+@@ -14741,11 +14751,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14730: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14740: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14744: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14754: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14734: \$? = $ac_status" >&5
-+   echo "$as_me:14744: \$? = $ac_status" >&5
+-   echo "$as_me:14748: \$? = $ac_status" >&5
++   echo "$as_me:14758: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16297,11 +16307,11 @@
+@@ -16311,11 +16321,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16300: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16310: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16314: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16324: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16304: \$? = $ac_status" >&5
-+   echo "$as_me:16314: \$? = $ac_status" >&5
+-   echo "$as_me:16318: \$? = $ac_status" >&5
++   echo "$as_me:16328: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16401,11 +16411,11 @@
+@@ -16415,11 +16425,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16404: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16414: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16418: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16428: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16408: \$? = $ac_status" >&5
-+   echo "$as_me:16418: \$? = $ac_status" >&5
+-   echo "$as_me:16422: \$? = $ac_status" >&5
++   echo "$as_me:16432: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -18631,11 +18641,11 @@
+@@ -18645,11 +18655,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18634: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18644: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18648: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18658: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18638: \$? = $ac_status" >&5
-+   echo "$as_me:18648: \$? = $ac_status" >&5
+-   echo "$as_me:18652: \$? = $ac_status" >&5
++   echo "$as_me:18662: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -18899,11 +18909,11 @@
+@@ -18913,11 +18923,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18902: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18912: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18916: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18926: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18906: \$? = $ac_status" >&5
-+   echo "$as_me:18916: \$? = $ac_status" >&5
+-   echo "$as_me:18920: \$? = $ac_status" >&5
++   echo "$as_me:18930: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -19003,11 +19013,11 @@
+@@ -19017,11 +19027,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:19006: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19016: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:19020: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19030: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:19010: \$? = $ac_status" >&5
-+   echo "$as_me:19020: \$? = $ac_status" >&5
+-   echo "$as_me:19024: \$? = $ac_status" >&5
++   echo "$as_me:19034: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -39480,6 +39490,11 @@
+@@ -40023,6 +40033,11 @@
  	LIBC="libc.so.12"
  	INTL="libintl.so.0"
  	;;
@@ -236,9 +236,9 @@
      *-*-*freebsd*)
      	LIBC="libc.so"
  	INTL="libintl.so"
-diff -urNad mono-1.2.4~/libgc/configure.in mono-1.2.4/libgc/configure.in
---- mono-1.2.4~/libgc/configure.in	2007-08-09 20:16:30.000000000 +0200
-+++ mono-1.2.4/libgc/configure.in	2007-08-09 20:27:18.000000000 +0200
+diff -urNad mono-1.2.5~/libgc/configure.in mono-1.2.5/libgc/configure.in
+--- mono-1.2.5~/libgc/configure.in	2007-08-17 19:44:19.000000000 +0200
++++ mono-1.2.5/libgc/configure.in	2007-08-17 19:44:56.000000000 +0200
 @@ -103,6 +103,17 @@
  	AC_DEFINE(THREAD_LOCAL_ALLOC)
  	THREADDLLIBS="-lpthread -lrt"
@@ -257,9 +257,9 @@
       *-*-freebsd4*)
  	AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
  	AC_DEFINE(GC_FREEBSD_THREADS)
-diff -urNad mono-1.2.4~/libgc/configure mono-1.2.4/libgc/configure
---- mono-1.2.4~/libgc/configure	2007-08-09 20:16:30.000000000 +0200
-+++ mono-1.2.4/libgc/configure	2007-08-09 20:27:18.000000000 +0200
+diff -urNad mono-1.2.5~/libgc/configure mono-1.2.5/libgc/configure
+--- mono-1.2.5~/libgc/configure	2007-08-17 19:44:19.000000000 +0200
++++ mono-1.2.5/libgc/configure	2007-08-17 19:44:56.000000000 +0200
 @@ -4632,6 +4632,32 @@
  
  	THREADDLLIBS="-lpthread -lrt"
@@ -293,9 +293,9 @@
       *-*-freebsd4*)
  	{ echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
  echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
-diff -urNad mono-1.2.4~/libgc/dyn_load.c mono-1.2.4/libgc/dyn_load.c
---- mono-1.2.4~/libgc/dyn_load.c	2007-08-09 20:16:30.000000000 +0200
-+++ mono-1.2.4/libgc/dyn_load.c	2007-08-09 20:27:18.000000000 +0200
+diff -urNad mono-1.2.5~/libgc/dyn_load.c mono-1.2.5/libgc/dyn_load.c
+--- mono-1.2.5~/libgc/dyn_load.c	2007-08-17 19:44:19.000000000 +0200
++++ mono-1.2.5/libgc/dyn_load.c	2007-08-17 19:44:56.000000000 +0200
 @@ -26,7 +26,7 @@
   * None of this is safe with dlclose and incremental collection.
   * But then not much of anything is safe in the presence of dlclose.
@@ -314,9 +314,9 @@
       && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
           || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) 
  
-diff -urNad mono-1.2.4~/libgc/include/gc.h mono-1.2.4/libgc/include/gc.h
---- mono-1.2.4~/libgc/include/gc.h	2007-08-09 20:16:30.000000000 +0200
-+++ mono-1.2.4/libgc/include/gc.h	2007-08-09 20:27:18.000000000 +0200
+diff -urNad mono-1.2.5~/libgc/include/gc.h mono-1.2.5/libgc/include/gc.h
+--- mono-1.2.5~/libgc/include/gc.h	2007-08-17 19:44:19.000000000 +0200
++++ mono-1.2.5/libgc/include/gc.h	2007-08-17 19:44:56.000000000 +0200
 @@ -484,7 +484,7 @@
  #   define GC_RETURN_ADDR (GC_word)__return_address
  #endif
@@ -326,9 +326,9 @@
  # include <features.h>
  # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
       && !defined(__ia64__)
-diff -urNad mono-1.2.4~/libgc/include/private/gcconfig.h mono-1.2.4/libgc/include/private/gcconfig.h
---- mono-1.2.4~/libgc/include/private/gcconfig.h	2007-08-09 20:16:30.000000000 +0200
-+++ mono-1.2.4/libgc/include/private/gcconfig.h	2007-08-09 20:27:18.000000000 +0200
+diff -urNad mono-1.2.5~/libgc/include/private/gcconfig.h mono-1.2.5/libgc/include/private/gcconfig.h
+--- mono-1.2.5~/libgc/include/private/gcconfig.h	2007-08-17 19:44:19.000000000 +0200
++++ mono-1.2.5/libgc/include/private/gcconfig.h	2007-08-17 19:44:56.000000000 +0200
 @@ -55,7 +55,7 @@
  # endif
  
@@ -412,9 +412,9 @@
  	    /* SAVE_CALL_CHAIN is supported if the code is compiled to save	*/
  	    /* frame pointers by default, i.e. no -fomit-frame-pointer flag.	*/
  # define CAN_SAVE_CALL_ARGS
-diff -urNad mono-1.2.4~/mono/mini/exceptions-amd64.c mono-1.2.4/mono/mini/exceptions-amd64.c
---- mono-1.2.4~/mono/mini/exceptions-amd64.c	2007-08-09 20:16:30.000000000 +0200
-+++ mono-1.2.4/mono/mini/exceptions-amd64.c	2007-08-09 20:27:18.000000000 +0200
+diff -urNad mono-1.2.5~/mono/mini/exceptions-amd64.c mono-1.2.5/mono/mini/exceptions-amd64.c
+--- mono-1.2.5~/mono/mini/exceptions-amd64.c	2007-08-17 19:44:19.000000000 +0200
++++ mono-1.2.5/mono/mini/exceptions-amd64.c	2007-08-17 19:44:56.000000000 +0200
 @@ -643,7 +643,7 @@
  static inline guint64*
  gregs_from_ucontext (ucontext_t *ctx)
@@ -424,10 +424,10 @@
      guint64 *gregs = (guint64 *) &ctx->uc_mcontext;
  #else
      guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs;
-diff -urNad mono-1.2.4~/mono/mini/mini-amd64.h mono-1.2.4/mono/mini/mini-amd64.h
---- mono-1.2.4~/mono/mini/mini-amd64.h	2007-08-09 20:16:30.000000000 +0200
-+++ mono-1.2.4/mono/mini/mini-amd64.h	2007-08-09 20:27:18.000000000 +0200
-@@ -210,7 +210,7 @@
+diff -urNad mono-1.2.5~/mono/mini/mini-amd64.h mono-1.2.5/mono/mini/mini-amd64.h
+--- mono-1.2.5~/mono/mini/mini-amd64.h	2007-08-17 19:44:19.000000000 +0200
++++ mono-1.2.5/mono/mini/mini-amd64.h	2007-08-17 19:44:56.000000000 +0200
+@@ -215,7 +215,7 @@
  
  #endif /* PLATFORM_WIN32 */
  

Modified: mono/trunk/debian/patches/ppc_fix_memory_corruption_r81413.dpatch
===================================================================
--- mono/trunk/debian/patches/ppc_fix_memory_corruption_r81413.dpatch	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/patches/ppc_fix_memory_corruption_r81413.dpatch	2007-09-02 22:58:28 UTC (rev 3305)
@@ -1,12 +1,10 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
 @DPATCH@
-
-Index: mono/mono/mini/mini-ppc.c
-===================================================================
---- mono/mono/mini/mini-ppc.c	(Revision 81412)
-+++ mono/mono/mini/mini-ppc.c	(Revision 81413)
-@@ -2560,8 +2560,12 @@
+diff -urNad mono-1.2.5~/mono/mini/mini-ppc.c mono-1.2.5/mono/mini/mini-ppc.c
+--- mono-1.2.5~/mono/mini/mini-ppc.c	2007-08-17 19:54:05.000000000 +0200
++++ mono-1.2.5/mono/mini/mini-ppc.c	2007-08-17 19:58:10.000000000 +0200
+@@ -2563,8 +2563,12 @@
  			ppc_rlwinm (code, ppc_r11, ppc_r11, 0, 0, 27);
  			/* use ctr to store the number of words to 0 if needed */
  			if (ins->flags & MONO_INST_INIT) {
@@ -21,7 +19,7 @@
  				ppc_srawi (code, ppc_r0, ppc_r0, 2);
  				ppc_mtctr (code, ppc_r0);
  			}
-@@ -2571,7 +2575,10 @@
+@@ -2574,7 +2578,10 @@
  			
  			if (ins->flags & MONO_INST_INIT) {
  				/* adjust the dest reg by -4 so we can use stwu */

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/rules	2007-09-02 22:58:28 UTC (rev 3305)
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
-MONO_API = 1.2.4
+MONO_API = 1.2.5
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
@@ -55,6 +55,9 @@
 		  --with-jit=yes --with-ikvm-native=no --with-preview=yes \
 		  --with-libgdiplus=installed --with-x=yes
 
+# no usable moonlight yet, maybe with 1.2.6
+#		  --with-moonlight=yes \
+
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
@@ -96,6 +99,8 @@
 
 build: build-arch
 
+build-all: build-arch build-indep
+
 clean: clean-patched unpatch
 	#rm -f configure
 
@@ -155,7 +160,8 @@
 	rm -f debian/tmp/usr/lib/mono/1.0/prj2make.exe*
 	# upstream forgot to remove this one
 	rm -f debian/tmp/usr/bin/mbas
-	
+	# shouldn't be there without --with-moonlight
+	rm -f debian/tmp/usr/bin/smcs	
 	# that exclude list are programs for arch-dep packages
 	dh_install -i -Xbin/monodiet -Xbin/monodis -Xbin/monograph -Xbin/mono-find-provides -Xbin/mono-find-requires -Xbin/pedump -Xbin/jay
 

Modified: mono/trunk/debian/watch
===================================================================
--- mono/trunk/debian/watch	2007-09-02 11:29:19 UTC (rev 3304)
+++ mono/trunk/debian/watch	2007-09-02 22:58:28 UTC (rev 3305)
@@ -1,2 +1,2 @@
 version=2
-http://go-mono.com/sources-stable/ .+/mono-([\d\.]+)\.tar\.gz
+http://go-mono.com/sources-stable/ .+/mono-([\d\.]+)\.tar\.bz2




More information about the Pkg-mono-svn-commits mailing list