diff -u mono-1.9.1+dfsg/debian/rules mono-1.9.1+dfsg/debian/rules --- mono-1.9.1+dfsg/debian/rules +++ mono-1.9.1+dfsg/debian/rules @@ -240,6 +240,22 @@ dh_installman -i debian/dh_clistrip -i --dbg-package=mono-dbg dh_compress -i + t=mono-common; \ + for p in $$(dh_listpackages -i -N$$t); do \ + rm -rf debian/$$p/usr/share/doc/$$p; \ + ln -s $$t debian/$$p/usr/share/doc/$$p; \ + if [ -f debian/$$p.docs ]; then \ + mkdir -p debian/$$p/usr/share/doc/$$t; \ + cp -a $$(eval echo $$(cat debian/$$p.docs)) debian/$$p/usr/share/doc/$$t/; \ + dh_compress -p$$p; \ + fi; \ + ( \ + echo "# doc dir is now a symlink to $$p"; \ + echo 'if [ "$$1" = upgrade ] && [ ! -L /usr/share/doc/'$$p' ]; then'; \ + echo " rm -rf /usr/share/doc/$$p"; \ + echo "fi"; \ + ) >> debian/$$p.preinst.debhelper; \ + done dh_fixperms -i debian/dh_clifixperms -i dh_installdeb -i @@ -303,6 +319,22 @@ dh_strip -plibmono0 --dbg-package=libmono0-dbg dh_strip -s dh_compress -s -Xskeleton.cs + t=mono-common; \ + for p in $$(dh_listpackages -i -N$$t); do \ + rm -rf debian/$$p/usr/share/doc/$$p; \ + ln -s $$t debian/$$p/usr/share/doc/$$p; \ + if [ -f debian/$$p.docs ]; then \ + mkdir -p debian/$$p/usr/share/doc/$$t; \ + cp -a $$(eval echo $$(cat debian/$$p.docs)) debian/$$p/usr/share/doc/$$t/; \ + dh_compress -p$$p; \ + fi; \ + ( \ + echo "# doc dir is now a symlink to $$p"; \ + echo 'if [ "$$1" = upgrade ] && [ ! -L /usr/share/doc/'$$p' ]; then'; \ + echo " rm -rf /usr/share/doc/$$p"; \ + echo "fi"; \ + ) >> debian/$$p.preinst.debhelper; \ + done dh_fixperms -s dh_makeshlibs -plibmono0 -V 'libmono0 (>= $(UPVERSION))' dh_installdeb -s diff -u mono-1.9.1+dfsg/debian/shlibs.local mono-1.9.1+dfsg/debian/shlibs.local --- mono-1.9.1+dfsg/debian/shlibs.local +++ mono-1.9.1+dfsg/debian/shlibs.local @@ -9,0 +10,2 @@ +libgda-report-2 3 libgda2-3 +libgdasql 3 libgda2-3 diff -u mono-1.9.1+dfsg/debian/control mono-1.9.1+dfsg/debian/control --- mono-1.9.1+dfsg/debian/control +++ mono-1.9.1+dfsg/debian/control @@ -1,17 +1,18 @@ Source: mono Section: interpreters Priority: optional -Maintainer: Debian Mono Group +Maintainer: Ubuntu Mono Team +XSBC-Original-Maintainer: Debian Mono Group Uploaders: Mirco Bauer , Sebastian Dröge Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, zlib1g-dev -Build-Depends-Indep: libgamin-dev, libcupsys2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev, libgda2-dev +Build-Depends-Indep: libgamin-dev, libcupsys2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev Standards-Version: 3.7.3 Homepage: http://www.mono-project.com/ Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/mono/trunk Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mono/trunk/ Package: mono-common -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: binfmt-support (>= 1.1.2) Description: common files for Mono @@ -26,7 +27,7 @@ Package: mono-runtime Provides: cli-runtime -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Depends: mono-jit (= ${binary:Version}), mono-gac (= ${source:Version}) Description: Mono runtime Mono is a platform for running and developing applications based on the @@ -39,7 +40,7 @@ Package: mono-jit Provides: cli-virtual-machine -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Depends: ${shlibs:Depends}, ${misc:Depends}, mono-common (= ${binary:Version}) Description: fast CLI JIT/AOT compiler for Mono Mono is a platform for running and developing applications based on the @@ -55,7 +56,7 @@ Package: mono-jit-dbg Priority: extra -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Depends: mono-jit (= ${binary:Version}) Recommends: gdb Description: fast CLI JIT/AOT compiler for Mono, debugging symbols @@ -70,7 +71,7 @@ Package: mono-utils Provides: cil-disassembler Section: devel -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Replaces: mono-mcs (<= 1.1.6-4) Depends: ${shlibs:Depends}, ${misc:Depends}, libmono0 (<< ${mono:next-upversion}), libmono-corlib1.0-cil Suggests: libmono-corlib2.0-cil @@ -86,7 +87,7 @@ Package: libmono0 Section: libs -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Replaces: libmono-dev (<= 1.1.6-4) Conflicts: mono-utils (<< 1.2.3.1-4) Depends: ${shlibs:Depends}, ${misc:Depends} @@ -103,7 +104,7 @@ Package: libmono0-dbg Priority: extra Section: libdevel -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Depends: libmono0 (= ${binary:Version}) Recommends: gdb Description: libraries for the Mono JIT, debugging symbols @@ -117,7 +118,7 @@ Package: libmono-dev Section: libdevel -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Depends: libmono0 (= ${binary:Version}), libglib2.0-dev Description: libraries for the Mono JIT - Development files Header files and static libraries for libmono and libmono-profiler-conv. @@ -1201,7 +1202,7 @@ Package: mono-jay Section: devel -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia Depends: ${shlibs:Depends}, ${misc:Depends} Description: LALR(1) parser generator oriented to Java/CLI Mono is a platform for running and developing applications based on the diff -u mono-1.9.1+dfsg/debian/changelog mono-1.9.1+dfsg/debian/changelog --- mono-1.9.1+dfsg/debian/changelog +++ mono-1.9.1+dfsg/debian/changelog @@ -1,3 +1,25 @@ +mono (1.9.1+dfsg-1ubuntu1) intrepid; urgency=low + + * Merge with Debian (LP: #225426), remaining Ubuntu changes: + - debian/control: + + Updated Maintainer Field. + + Added lpia to architectures. Sparc has been added in Debian. + + Remove libgda2-dev build dependency which cannot be satisfied + since that package is in Universe. + - debian/patches/dont_check_proc_self_exe.dpatch: + + Comment out code that checks /proc/self/exe so that + mono will function on the Live CD. + - debian/patches/remove_arg_max_check_r101444.dpatch: + + Comment out buggy dead code (from mono SVN, apparently the same + bug occurs on openSUSE 11) to fix FTBFS. + - debian/rules: + + Symlink doc directories to avoid duplicate files, and remove the doc + directories on upgrade for the now symlinked doc directories. + - debian/shlibs.local: + + Add lines for all libraries mentioned in libgda2-3.shlibs. + + -- Jo Shields Wed, 4 Jun 2008 09:20:59 +0100 + mono (1.9.1+dfsg-1) unstable; urgency=low * DFSG version of Mono 1.9.1 @@ -80,6 +102,30 @@ -- Mirco Bauer Mon, 04 Feb 2008 22:11:53 +0100 +mono (1.2.6+dfsg-6ubuntu3) hardy; urgency=low + + * debian/rules: + + unexport CPPFLAGS because configure relies on them being unset + to pass custom CPPFLAGS to boehm's configure. + + -- Sebastian Dröge Sat, 22 Mar 2008 00:57:15 +0100 + +mono (1.2.6+dfsg-6ubuntu2) hardy; urgency=low + + * debian/rules: + + Put CFLAGS in "" to make the shell happy and fix the build. + + Set default CFLAGS to -O2 -g. + + -- Sebastian Dröge Fri, 21 Mar 2008 20:31:01 +0100 + +mono (1.2.6+dfsg-6ubuntu1) hardy; urgency=low + + * Sync with Debian: + + Alternatives handling is in Debian now, for all other + remaining changes see changelog of 1.2.6+dfsg-5ubuntu1. + + -- Sebastian Dröge Fri, 21 Mar 2008 19:08:06 +0100 + mono (1.2.6+dfsg-6) unstable; urgency=high * debian/mono-mcs.postinst @@ -104,6 +150,32 @@ -- Mirco Bauer Mon, 04 Feb 2008 20:57:20 +0100 +mono (1.2.6+dfsg-5ubuntu2) hardy; urgency=low + + * Correctly install alternatives for mono-1.0-devel package (LP: #182509) + + -- Laurent Bigonville Sun, 13 Jan 2008 11:49:31 +0100 + +mono (1.2.6+dfsg-5ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining Ubuntu changes: + - debian/control: + + Updated Maintainer Field. + + Adjust Replaces for Ubuntu versions. + + Added lpia to architectures. Sparc has been added in Debian. + + Build-depend on libgda3-dev instead of libgda2-dev, since + libgda2 is in universe. + - debian/patches/dont_check_proc_self_exe.dpatch: + + Comment out code that checks /proc/self/exe so that + mono will function on the Live CD. + - debian/rules: + + Symlink doc directories to avoid duplicate files, and remove the doc + directories on upgrade for the now symlinked doc directories. + - debian/shlibs.local: + + Remove libgda2, as it's in universe. + + -- Emilio Pozuelo Monfort Wed, 09 Jan 2008 10:53:18 +0100 + mono (1.2.6+dfsg-5) unstable; urgency=low * debian/rules: @@ -176,6 +248,25 @@ -- Mirco Bauer Fri, 21 Dec 2007 01:35:40 +0100 +mono (1.2.6+dfsg-1ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining Ubuntu changes: + - debian/control: + + Updated Maintainer Field. + + Adjust Replaces for Ubuntu versions. + + Added sparc and lpia to architectures. + + Build-depend on libgda3-dev instead of libgda2-dev. + - debian/patches/dont_check_proc_self_exe.dpatch: + + Comment out code that checks /proc/self/exe so that + mono will function on the Live CD. + - debian/rules: + + Symlink doc directories to avoid duplicate files, and remove the doc + directories on upgrade for the now symlinked doc directories. + - debian/shlibs.local: + + Remove libgda3-dev build dependency, as it's in universe. + + -- Emilio Pozuelo Monfort Sat, 22 Dec 2007 00:16:29 +0100 + mono (1.2.6+dfsg-1) unstable; urgency=low * DFSG version of Mono 1.2.6 @@ -237,6 +328,31 @@ -- Mirco Bauer Sun, 16 Dec 2007 15:44:33 +0100 +mono (1.2.5.1-2ubuntu1) hardy; urgency=low + + [ Emilio Pozuelo Monfort ] + * Merge with Debian, remaining Ubuntu changes: + - debian/control: + + Updated Maintainer Field. + + Adjust Replaces for Ubuntu versions. + + Added sparc and lpia to architectures. + + Build-depend on libgda3-dev instead of libgda2-dev. + - debian/patches/dont_check_proc_self_exe.dpatch: + + Comment out code that checks /proc/self/exe so that + mono will function on the Live CD. + - debian/rules: + + Symlink doc directories to avoid duplicate files, and remove the doc + directories on upgrade for the now symlinked doc directories. + + [ Sebastian Dröge ] + * debian/control, + debian/shlibs.local: + + Remove libgda3-dev build dependency, this only works with gda2 anyway. + Put the gda2 shlibs into shlibs.local and suggest them for + libmono-system-data[12].0-cil instead of depending on it. + + -- Sebastian Dröge Mon, 19 Nov 2007 17:12:12 +0100 + mono (1.2.5.1-2) unstable; urgency=high * Mirco 'meebey' Bauer: @@ -312,6 +428,55 @@ -- Mirco Bauer Sun, 02 Sep 2007 21:36:13 +0200 +mono (1.2.4-6ubuntu6) gutsy; urgency=low + + * Explicitely remove the doc directories on upgrade for the now symlinked + doc directories. + + -- Matthias Klose Fri, 05 Oct 2007 17:02:25 +0000 + +mono (1.2.4-6ubuntu5) gutsy; urgency=low + + * Symlink doc directories to avoid duplicate files. + + -- Matthias Klose Thu, 04 Oct 2007 17:07:25 +0000 + +mono (1.2.4-6ubuntu4) gutsy; urgency=low + + * debian/control: Build against libgda3-dev instead of libgda2-dev. The + latter is obsolete and in universe now. + + -- Martin Pitt Tue, 18 Sep 2007 17:55:30 +0200 + +mono (1.2.4-6ubuntu3) gutsy; urgency=low + + * No-change upload due to soyuz bug (lpia bootstrap). + + -- Matthias Klose Fri, 10 Aug 2007 17:05:50 +0200 + +mono (1.2.4-6ubuntu2) gutsy; urgency=low + + * Build packages for the lpia architecture. + + -- Matthias Klose Fri, 10 Aug 2007 13:34:46 +0000 + +mono (1.2.4-6ubuntu1) gutsy; urgency=low + + * Sync with Debian. Remaining Ubuntu changes: + + debian/control: + - Change maintainer to Ubuntu Mono Team. + - Adjust Replaces for Ubuntu versions. + - Add sparc again. + + debian/control, + debian/libmono-sqlite1.0-cil.clideps-override, + debian/libmono-sqlite2.0-cil.clideps-override: + - Make sqlite2 only a Suggests instead of a Depends. + + debian/patches/dont_check_proc_self_exe.dpatch: + - Comment out code that checks /proc/self/exe so that + mono will function on the Live CD. + + -- Sebastian Dröge Fri, 10 Aug 2007 11:34:04 +0200 + mono (1.2.4-6) unstable; urgency=medium * Mirco 'meebey' Bauer: diff -u mono-1.9.1+dfsg/debian/patches/00list mono-1.9.1+dfsg/debian/patches/00list --- mono-1.9.1+dfsg/debian/patches/00list +++ mono-1.9.1+dfsg/debian/patches/00list @@ -11,0 +12,2 @@ +dont_check_proc_self_exe +remove_arg_max_check_r101444 only in patch2: unchanged: --- mono-1.9.1+dfsg.orig/debian/patches/remove_arg_max_check_r101444.dpatch +++ mono-1.9.1+dfsg/debian/patches/remove_arg_max_check_r101444.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## remove_arg_max_check_r101444.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Comment out check in wapi_glob.c which breaks on recent distributions +## DP: (such as Intrepid). Taken from SVN revision 101444 + +@DPATCH@ +diff -urNad mono-1.9.1+dfsg.orig/mono/io-layer/wapi_glob.c mono-1.9.1/mono/io-layer/wapi_glob.c +--- mono/mono/io-layer/wapi_glob.c (revision 101443) ++++ mono/mono/io-layer/wapi_glob.c (revision 101444) +@@ -299,11 +299,14 @@ + } + pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; + ++#if 0 ++ /* Broken on opensuse 11 */ + if ((pglob->gl_flags & WAPI_GLOB_LIMIT) && + newsize + *limitp >= ARG_MAX) { + errno = 0; + return(WAPI_GLOB_NOSPACE); + } ++#endif + + return(copy == NULL ? WAPI_GLOB_NOSPACE : 0); + } + only in patch2: unchanged: --- mono-1.9.1+dfsg.orig/debian/patches/dont_check_proc_self_exe.dpatch +++ mono-1.9.1+dfsg/debian/patches/dont_check_proc_self_exe.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ + +diff -pruN 1.1.17.1-1/mono/metadata/assembly.c 1.1.17.1-1ubuntu7/mono/metadata/assembly.c +--- 1.1.17.1-1/mono/metadata/assembly.c 2006-08-25 20:35:15.000000000 +0100 ++++ 1.1.17.1-1ubuntu7/mono/metadata/assembly.c 2006-10-27 10:42:26.000000000 +0100 +@@ -582,6 +582,7 @@ mono_set_rootdir (void) + g_free (bindir); + g_free (utf8name); + #else ++#if 0 + char buf [4096]; + int s; + char *str; +@@ -604,6 +605,7 @@ mono_set_rootdir (void) + set_dirs (buf); + return; + } ++#endif + fallback (); + #endif + } +