[Pkg-mono-svn-commits] rev 3973 - in mono-debugger/trunk/debian: . patches
Jo Shields
directhex-guest at alioth.debian.org
Tue Apr 28 23:26:22 UTC 2009
Author: directhex-guest
Date: 2009-04-28 23:26:22 +0000 (Tue, 28 Apr 2009)
New Revision: 3973
Removed:
mono-debugger/trunk/debian/patches/99_autoreconf.dpatch
Modified:
mono-debugger/trunk/debian/changelog
mono-debugger/trunk/debian/control
mono-debugger/trunk/debian/patches/00list
mono-debugger/trunk/debian/patches/use_real_nunit.dpatch
mono-debugger/trunk/debian/rules
Log:
* New upstream release
* debian/control:
+ Bump standards to version 3.8.1 (no changes needed)
* debian/patches/use_real_nunit.dpatch:
+ Updated
* debian/rules,
debian/patches/99_autoreconf.dpatch,
debian/control:
+ Switch from using autoreconf patch to generating fresh data at build
time - add required build dependencies accordingly
* debian/rules:
+ No more .a files to delete
Modified: mono-debugger/trunk/debian/changelog
===================================================================
--- mono-debugger/trunk/debian/changelog 2009-04-27 09:12:18 UTC (rev 3972)
+++ mono-debugger/trunk/debian/changelog 2009-04-28 23:26:22 UTC (rev 3973)
@@ -1,3 +1,20 @@
+mono-debugger (2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control:
+ + Bump standards to version 3.8.1 (no changes needed)
+ * debian/patches/use_real_nunit.dpatch:
+ + Updated
+ * debian/rules,
+ debian/patches/99_autoreconf.dpatch,
+ debian/control:
+ + Switch from using autoreconf patch to generating fresh data at build
+ time - add required build dependencies accordingly
+ * debian/rules:
+ + No more .a files to delete
+
+ -- Jo Shields <directhex at apebox.org> Tue, 28 Apr 2009 23:08:21 +0100
+
mono-debugger (2.0-2) unstable; urgency=low
* Upload to unstable.
Modified: mono-debugger/trunk/debian/control
===================================================================
--- mono-debugger/trunk/debian/control 2009-04-27 09:12:18 UTC (rev 3972)
+++ mono-debugger/trunk/debian/control 2009-04-28 23:26:22 UTC (rev 3973)
@@ -11,12 +11,14 @@
libmono-system-runtime2.0-cil,
nunit-console,
libnunit2.4-cil,
+ autoconf,
+ automake,
+ autotools-dev,
libtool,
- automake1.4,
libmono-dev (>= 2.0),
libglib2.0-dev,
libreadline5-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://www.mono-project.com/Debugger
Vcs-Svn: svn://svn.debian.org/pkg-mono/mono-debugger/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mono-debugger/trunk/
Modified: mono-debugger/trunk/debian/patches/00list
===================================================================
--- mono-debugger/trunk/debian/patches/00list 2009-04-27 09:12:18 UTC (rev 3972)
+++ mono-debugger/trunk/debian/patches/00list 2009-04-28 23:26:22 UTC (rev 3973)
@@ -1,3 +1,2 @@
use_real_nunit
fix_dllmap
-99_autoreconf
Deleted: mono-debugger/trunk/debian/patches/99_autoreconf.dpatch
===================================================================
--- mono-debugger/trunk/debian/patches/99_autoreconf.dpatch 2009-04-27 09:12:18 UTC (rev 3972)
+++ mono-debugger/trunk/debian/patches/99_autoreconf.dpatch 2009-04-28 23:26:22 UTC (rev 3973)
@@ -1,745 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_autoreconf.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-debugger-2.0~/aclocal.m4 mono-debugger-2.0/aclocal.m4
---- mono-debugger-2.0~/aclocal.m4 2008-09-10 18:38:35.000000000 +0200
-+++ mono-debugger-2.0/aclocal.m4 2008-11-16 23:08:08.000000000 +0100
-@@ -21,7 +21,7 @@
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
--# serial 52 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1723,6 +1723,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -2504,7 +2516,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -3511,7 +3523,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -5203,7 +5215,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -5580,6 +5592,9 @@
- cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- *)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -5788,12 +5803,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -6224,7 +6240,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -6723,14 +6739,16 @@
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- else
-- pkg_failed=untried
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
-
-@@ -6774,9 +6792,9 @@
- if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -urNad mono-debugger-2.0~/build/Makefile.in mono-debugger-2.0/build/Makefile.in
---- mono-debugger-2.0~/build/Makefile.in 2008-11-16 22:55:24.000000000 +0100
-+++ mono-debugger-2.0/build/Makefile.in 2008-11-16 23:08:11.000000000 +0100
-@@ -290,8 +290,7 @@
- -r:Mono.GetOptions \
- -r:./Mono.Debugger.dll \
- -r:./Mono.Debugger.Frontend.dll \
-- -r:nunit.framework \
-- -r:nunit.core
-+ -pkg:nunit
-
- noinst_DATA = Mono.Debugger.dll.config
- CLEANFILES = *.exe *.mdb mdb AssemblyInfo.cs Mono.Debugger.dll.config \
-diff -urNad mono-debugger-2.0~/configure mono-debugger-2.0/configure
---- mono-debugger-2.0~/configure 2008-09-10 18:38:44.000000000 +0200
-+++ mono-debugger-2.0/configure 2008-11-16 23:08:10.000000000 +0100
-@@ -6016,7 +6016,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
-@@ -9442,12 +9442,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs=no
- else
- ld_shlibs=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -9990,7 +9991,7 @@
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -10701,6 +10702,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -11541,7 +11554,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11544 "configure"
-+#line 11557 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11641,7 +11654,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11644 "configure"
-+#line 11657 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -13229,7 +13242,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
-@@ -13933,7 +13946,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -14042,11 +14055,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:14045: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14058: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:14049: \$? = $ac_status" >&5
-+ echo "$as_me:14062: \$? = $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.
-@@ -14146,11 +14159,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:14149: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14162: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:14153: \$? = $ac_status" >&5
-+ echo "$as_me:14166: \$? = $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
-@@ -14218,6 +14231,9 @@
- cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs_CXX=no
-+ ;;
- *)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -14664,6 +14680,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -15729,11 +15757,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:15732: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15760: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15736: \$? = $ac_status" >&5
-+ echo "$as_me:15764: \$? = $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.
-@@ -15833,11 +15861,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:15836: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15864: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15840: \$? = $ac_status" >&5
-+ echo "$as_me:15868: \$? = $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
-@@ -16098,12 +16126,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_F77=no
- else
- ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -16626,7 +16655,7 @@
- link_all_deplibs_F77=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -17285,6 +17314,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -18040,11 +18081,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:18043: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18084: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18047: \$? = $ac_status" >&5
-+ echo "$as_me:18088: \$? = $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.
-@@ -18330,11 +18371,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:18333: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18374: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18337: \$? = $ac_status" >&5
-+ echo "$as_me:18378: \$? = $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.
-@@ -18434,11 +18475,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:18437: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18478: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:18441: \$? = $ac_status" >&5
-+ echo "$as_me:18482: \$? = $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
-@@ -18699,12 +18740,13 @@
- $echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-+ link_all_deplibs_GCJ=no
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -19247,7 +19289,7 @@
- link_all_deplibs_GCJ=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -19906,6 +19948,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -21734,10 +21788,11 @@
- { echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5
- echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; }
-
--if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -21747,13 +21802,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$BASE_DEPENDENCIES_LIBS"; then
-- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BASE_DEPENDENCIES_LIBS"; then
-+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -21763,8 +21820,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -21777,9 +21835,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION" 2>&1`
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION"`
- else
-- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION" 2>&1`
-+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-@@ -21845,10 +21903,11 @@
- { echo "$as_me:$LINENO: checking for SERVER_DEPENDENCIES" >&5
- echo $ECHO_N "checking for SERVER_DEPENDENCIES... $ECHO_C" >&6; }
-
--if test -n "$SERVER_DEPENDENCIES_CFLAGS"; then
-- pkg_cv_SERVER_DEPENDENCIES_CFLAGS="$SERVER_DEPENDENCIES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$SERVER_DEPENDENCIES_CFLAGS"; then
-+ pkg_cv_SERVER_DEPENDENCIES_CFLAGS="$SERVER_DEPENDENCIES_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= \$MONO_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION \$martin_deps\"") >&5
- ($PKG_CONFIG --exists --print-errors "mono >= $MONO_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION $martin_deps") 2>&5
- ac_status=$?
-@@ -21858,13 +21917,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$SERVER_DEPENDENCIES_LIBS"; then
-- pkg_cv_SERVER_DEPENDENCIES_LIBS="$SERVER_DEPENDENCIES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$SERVER_DEPENDENCIES_LIBS"; then
-+ pkg_cv_SERVER_DEPENDENCIES_LIBS="$SERVER_DEPENDENCIES_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= \$MONO_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION \$martin_deps\"") >&5
- ($PKG_CONFIG --exists --print-errors "mono >= $MONO_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION $martin_deps") 2>&5
- ac_status=$?
-@@ -21874,8 +21935,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -21888,9 +21950,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- SERVER_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mono >= $MONO_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION $martin_deps" 2>&1`
-+ SERVER_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mono >= $MONO_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION $martin_deps"`
- else
-- SERVER_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "mono >= $MONO_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION $martin_deps" 2>&1`
-+ SERVER_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono >= $MONO_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION $martin_deps"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$SERVER_DEPENDENCIES_PKG_ERRORS" >&5
-@@ -21969,10 +22031,11 @@
- { echo "$as_me:$LINENO: checking for WRAPPER" >&5
- echo $ECHO_N "checking for WRAPPER... $ECHO_C" >&6; }
-
--if test -n "$WRAPPER_CFLAGS"; then
-- pkg_cv_WRAPPER_CFLAGS="$WRAPPER_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$WRAPPER_CFLAGS"; then
-+ pkg_cv_WRAPPER_CFLAGS="$WRAPPER_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= \$MONO_REQUIRED_VERSION gthread-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "mono >= $MONO_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -21982,13 +22045,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$WRAPPER_LIBS"; then
-- pkg_cv_WRAPPER_LIBS="$WRAPPER_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$WRAPPER_LIBS"; then
-+ pkg_cv_WRAPPER_LIBS="$WRAPPER_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono >= \$MONO_REQUIRED_VERSION gthread-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "mono >= $MONO_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -21998,8 +22063,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -22012,9 +22078,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- WRAPPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mono >= $MONO_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION" 2>&1`
-+ WRAPPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mono >= $MONO_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION"`
- else
-- WRAPPER_PKG_ERRORS=`$PKG_CONFIG --print-errors "mono >= $MONO_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION" 2>&1`
-+ WRAPPER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono >= $MONO_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$WRAPPER_PKG_ERRORS" >&5
-@@ -22226,8 +22292,8 @@
- { (exit 1); exit 1; }; }
- fi
-
-- # Extract the first word of "nunit-console2", so it can be a program name with args.
--set dummy nunit-console2; ac_word=$2
-+ # Extract the first word of "nunit-console", so it can be a program name with args.
-+set dummy nunit-console; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_NUNIT_CONSOLE+set}" = set; then
-@@ -22267,8 +22333,8 @@
-
-
- if test "x$NUNIT_CONSOLE" = "x" ; then
-- { { echo "$as_me:$LINENO: error: Can't find \"nunit-console2\" in your PATH" >&5
--echo "$as_me: error: Can't find \"nunit-console2\" in your PATH" >&2;}
-+ { { echo "$as_me:$LINENO: error: Can't find \"nunit-console\" in your PATH" >&5
-+echo "$as_me: error: Can't find \"nunit-console\" in your PATH" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -22303,15 +22369,15 @@
- TARGET_MONO="$MONO"
-
- ## Check NUnit
-- if pkg-config --modversion mono-nunit>/dev/null; then
-- { echo "$as_me:$LINENO: result: \"Found mono-nunit.pc\"" >&5
--echo "${ECHO_T}\"Found mono-nunit.pc\"" >&6; }
-+ if pkg-config --modversion nunit>/dev/null; then
-+ { echo "$as_me:$LINENO: result: \"Found nunit.pc\"" >&5
-+echo "${ECHO_T}\"Found nunit.pc\"" >&6; }
- else
-- { { echo "$as_me:$LINENO: error: Cannot find mono-nunit (mono-unit.pc for packageconfig)" >&5
--echo "$as_me: error: Cannot find mono-nunit (mono-unit.pc for packageconfig)" >&2;}
-+ { { echo "$as_me:$LINENO: error: Cannot find nunit (nunit.pc for packageconfig)" >&5
-+echo "$as_me: error: Cannot find nunit (nunit.pc for packageconfig)" >&2;}
- { (exit 1); exit 1; }; }
- fi
-- NUNIT_PREFIX=`pkg-config --variable=prefix mono-nunit`
-+ NUNIT_PREFIX=`pkg-config --variable=prefix nunit`
- fi
- NUNIT_PREFIX=`cd $NUNIT_PREFIX && pwd`
-
-@@ -23295,10 +23361,11 @@
- { echo "$as_me:$LINENO: checking for XSP" >&5
- echo $ECHO_N "checking for XSP... $ECHO_C" >&6; }
-
--if test -n "$XSP_CFLAGS"; then
-- pkg_cv_XSP_CFLAGS="$XSP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$XSP_CFLAGS"; then
-+ pkg_cv_XSP_CFLAGS="$XSP_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xsp-2 >= \$XSP_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "xsp-2 >= $XSP_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -23308,13 +23375,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$XSP_LIBS"; then
-- pkg_cv_XSP_LIBS="$XSP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$XSP_LIBS"; then
-+ pkg_cv_XSP_LIBS="$XSP_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xsp-2 >= \$XSP_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "xsp-2 >= $XSP_REQUIRED_VERSION") 2>&5
- ac_status=$?
-@@ -23324,8 +23393,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -23338,9 +23408,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- XSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xsp-2 >= $XSP_REQUIRED_VERSION" 2>&1`
-+ XSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xsp-2 >= $XSP_REQUIRED_VERSION"`
- else
-- XSP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xsp-2 >= $XSP_REQUIRED_VERSION" 2>&1`
-+ XSP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xsp-2 >= $XSP_REQUIRED_VERSION"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$XSP_PKG_ERRORS" >&5
Modified: mono-debugger/trunk/debian/patches/use_real_nunit.dpatch
===================================================================
--- mono-debugger/trunk/debian/patches/use_real_nunit.dpatch 2009-04-27 09:12:18 UTC (rev 3972)
+++ mono-debugger/trunk/debian/patches/use_real_nunit.dpatch 2009-04-28 23:26:22 UTC (rev 3973)
@@ -5,10 +5,10 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-debugger-2.0~/build/Makefile.am mono-debugger-2.0/build/Makefile.am
---- mono-debugger-2.0~/build/Makefile.am 2008-11-16 22:55:24.000000000 +0100
-+++ mono-debugger-2.0/build/Makefile.am 2008-11-16 23:07:32.000000000 +0100
-@@ -96,8 +96,7 @@
+diff -urNad mono-debugger-2.4~/build/Makefile.am mono-debugger-2.4/build/Makefile.am
+--- mono-debugger-2.4~/build/Makefile.am 2009-04-28 23:19:46.000000000 +0100
++++ mono-debugger-2.4/build/Makefile.am 2009-04-28 23:22:19.000000000 +0100
+@@ -100,8 +100,7 @@
-r:Mono.GetOptions \
-r:./Mono.Debugger.dll \
-r:./Mono.Debugger.Frontend.dll \
@@ -18,9 +18,9 @@
if MARTIN_PRIVATE
MCS_FLAGS += -define:MARTIN_PRIVATE
-diff -urNad mono-debugger-2.0~/configure.in mono-debugger-2.0/configure.in
---- mono-debugger-2.0~/configure.in 2008-09-02 17:38:14.000000000 +0200
-+++ mono-debugger-2.0/configure.in 2008-11-16 23:07:56.000000000 +0100
+diff -urNad mono-debugger-2.4~/configure.in mono-debugger-2.4/configure.in
+--- mono-debugger-2.4~/configure.in 2009-04-28 23:19:46.000000000 +0100
++++ mono-debugger-2.4/configure.in 2009-04-28 23:24:43.000000000 +0100
@@ -191,9 +191,9 @@
AC_MSG_ERROR([Can't find "mcs" in your PATH])
fi
@@ -33,7 +33,7 @@
fi
fi
-@@ -217,12 +217,12 @@
+@@ -218,13 +218,13 @@
TARGET_MONO="$MONO"
## Check NUnit
@@ -46,7 +46,9 @@
+ AC_MSG_ERROR([Cannot find nunit (nunit.pc for packageconfig)])
fi
- NUNIT_PREFIX=`pkg-config --variable=prefix mono-nunit`
+- NUNIT_VERSION=`pkg-config --modversion mono-nunit`
+ NUNIT_PREFIX=`pkg-config --variable=prefix nunit`
++ NUNIT_VERSION=`pkg-config --modversion nunit`
fi
NUNIT_PREFIX=`cd $NUNIT_PREFIX && pwd`
AC_SUBST(TARGET_MCS)
Modified: mono-debugger/trunk/debian/rules
===================================================================
--- mono-debugger/trunk/debian/rules 2009-04-27 09:12:18 UTC (rev 3972)
+++ mono-debugger/trunk/debian/rules 2009-04-28 23:26:22 UTC (rev 3973)
@@ -16,6 +16,12 @@
configure: configure-stamp
configure-stamp: patch-stamp
dh_testdir
+
+ libtoolize
+ aclocal
+ autoconf
+ automake --add-missing --copy
+
./configure --prefix=/usr MCS=/usr/bin/csc
touch configure-stamp
@@ -30,8 +36,10 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
+ rm -fr autom4te.cache
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
+ find . -name "Makefile.in" | xargs rm -fr
+ dh_clean config.sub config.guess aclocal.m4
install: build
dh_testdir
@@ -41,7 +49,6 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/mono-debugger
cp $(CURDIR)/debian/mdb.exe.config $(CURDIR)/debian/mono-debugger/usr/lib/mono/2.0/
rm $(CURDIR)/debian/mono-debugger/usr/lib/*.so
- rm $(CURDIR)/debian/mono-debugger/usr/lib/*.a
rm $(CURDIR)/debian/mono-debugger/usr/lib/*.la
binary-indep: build install
More information about the Pkg-mono-svn-commits
mailing list