[Pkg-mono-svn-commits] rev 3001 - in
non-group/monodevelop/trunk/debian: . patches
Mirco Bauer
meebey-guest at alioth.debian.org
Wed Mar 28 23:17:13 UTC 2007
Author: meebey-guest
Date: 2007-03-28 22:17:13 +0000 (Wed, 28 Mar 2007)
New Revision: 3001
Added:
non-group/monodevelop/trunk/debian/patches/cecil_0.4_backport.dpatch
non-group/monodevelop/trunk/debian/patches/fix_dllmaps.dpatch
Modified:
non-group/monodevelop/trunk/debian/changelog
non-group/monodevelop/trunk/debian/control
non-group/monodevelop/trunk/debian/monodevelop-versioncontrol.install
non-group/monodevelop/trunk/debian/patches/00list
non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch
non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch
non-group/monodevelop/trunk/debian/rules
Log:
- preview package
Modified: non-group/monodevelop/trunk/debian/changelog
===================================================================
--- non-group/monodevelop/trunk/debian/changelog 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/changelog 2007-03-28 22:17:13 UTC (rev 3001)
@@ -1,3 +1,40 @@
+monodevelop (0.13.1+dfsg-1~pre3) unstable; urgency=low
+
+ * DFSG version of MonoDevelop 0.13.1
+ (deleted all precompiled binaries from the tarball)
+ - For the record here a list of the deleted files:
+ Extras/NUnit/lib/nunit.core.dll
+ Extras/NUnit/lib/nunit.framework.dll
+ Extras/MonoDevelop.GtkCore/lib/libstetic.dll
+ Extras/MonoDevelop.GtkCore/lib/libsteticui.dll
+ contrib/log4net.dll
+ contrib/Mono.Cecil.dll
+ contrib/FirebirdSql.Data.Firebird.dll
+ * New upstream release (Closes: #414019)
+ + Supports method parameters and constructors for auto-completion now.
+ (Closes: #350084)
+ + Fixes a crash problem with Gecko.WebControl on startup.
+ (Closes: #400239)
+ * debian/control:
+ + Using my Debian email address now.
+ + Updated cli-common-dev build dependency to >= 0.4.4
+ + Updates stetic build dependency to >= 0.1.0~svn.74962
+ + Added Replaces: monodevelop << 0.13.1 to monodevelop-versioncontrol
+ + Removed hardcoded unneeded metacity dependency (Closes: #400816)
+ * debian/patches/00list:
+ + Disabled remove_gtk-sharp-1.0_support, already applied upstream.
+ * debian/patches/use_nunit2.2.dpatch
+ debian/patches/use_real_libs.dpatch:
+ + Updated for MonoDevelop 0.13.1
+ * debian/patches/fix_dllmaps.dpatch:
+ + Added DLL map for glibsharpglue-2 to
+ MonoDevelop.SourceEditor.dll.config.in.
+ * debian/monodevelop-versioncontrol.install:
+ + Added ChangeLogAddIn (moved from monodevelop package), as this plugin
+ requires the VersionControl plugin.
+
+ -- Mirco Bauer <meebey at debian.org> Thu, 15 Mar 2007 22:13:56 +0200
+
monodevelop (0.12+dfsg-1) unstable; urgency=low
* DFSG version of MonoDevelop 0.12
Modified: non-group/monodevelop/trunk/debian/control
===================================================================
--- non-group/monodevelop/trunk/debian/control 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/control 2007-03-28 22:17:13 UTC (rev 3001)
@@ -1,15 +1,15 @@
Source: monodevelop
Section: devel
Priority: optional
-Maintainer: Mirco Bauer <meebey at meebey.net>
+Maintainer: Mirco Bauer <meebey at debian.org>
Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.0), mono-gmcs (>= 1.1.10) | c-sharp-2.0-compiler, libmono-dev (>= 1.1.10), boo (>= 0.7.5.2013), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, gtk-sharp2-gapi (>= 2.4.0), libgtk2.0-cil (>= 2.4.0), libgnome2.0-cil (>= 2.4.0), libgconf2.0-cil (>= 2.4.0), libglade2.0-cil (>= 2.4.0), libvte2.0-cil (>= 2.4.0), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10), libnunit2.2-cil (>= 2.2.0), libmono-system-runtime2.0-cil, libmono-oracle2.0-cil, libmono-bytefx0.7.6.2-cil, libmono-npgsql2.0-cil, libmono-sqlite2.0-cil, libmono-cecil0.4-cil (>= 0.4.3), liblog4net1.2-cil, libmono-firebirdsql1.7-cil, libmetacity-dev, libsvn-dev, libapr1-dev, stetic, mono-xsp, mono-xsp2
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.10) | c-sharp-2.0-compiler, libmono-dev (>= 1.1.10), boo (>= 0.7.5.2013), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, gtk-sharp2-gapi (>= 2.4.0), libgtk2.0-cil (>= 2.4.0), libgnome2.0-cil (>= 2.4.0), libgconf2.0-cil (>= 2.4.0), libglade2.0-cil (>= 2.4.0), libvte2.0-cil (>= 2.4.0), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10), libnunit2.2-cil (>= 2.2.0), libmono-system-runtime2.0-cil, libmono-oracle2.0-cil, libmono-bytefx0.7.6.2-cil, libmono-npgsql2.0-cil, libmono-sqlite2.0-cil, libmono-cecil0.4-cil (>= 0.4.3), liblog4net1.2-cil, libmono-firebirdsql1.7-cil, libmetacity-dev, libsvn-dev, libapr1-dev, stetic (>= 0.1.0~svn.74962), mono-xsp, mono-xsp2
Standards-Version: 3.6.2.1
Package: monodevelop
Architecture: all
Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol, monodevelop-query, nemerle, mono-gmcs, mono-xsp, mono-xsp2
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs (>= 1.1.10), monodoc-manual (>= 1.1.9), pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator, metacity
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-mcs (>= 1.1.10), monodoc-manual (>= 1.1.9), pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator
Provides: monodoc-viewer
Description: C#/Boo/Java/Nemerle/ILasm/ASP.NET Development Environment
MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
@@ -49,6 +49,7 @@
Package: monodevelop-versioncontrol
Architecture: all
+Replaces: monodevelop (<< 0.13.1)
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${Source-Version})
Description: VersionControl plugin for MonoDevelop
MonoDevelop is a GNOME IDE primarily designed for C# and other .NET
Modified: non-group/monodevelop/trunk/debian/monodevelop-versioncontrol.install
===================================================================
--- non-group/monodevelop/trunk/debian/monodevelop-versioncontrol.install 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/monodevelop-versioncontrol.install 2007-03-28 22:17:13 UTC (rev 3001)
@@ -1 +1,2 @@
debian/tmp/usr/lib/monodevelop/AddIns/VersionControl/
+debian/tmp/usr/lib/monodevelop/AddIns/ChangeLogAddIn/
Modified: non-group/monodevelop/trunk/debian/patches/00list
===================================================================
--- non-group/monodevelop/trunk/debian/patches/00list 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/patches/00list 2007-03-28 22:17:13 UTC (rev 3001)
@@ -1,10 +1,12 @@
use_nunit2.2
use_real_libs
+cecil_0.4_backport
update_templates_for_gtk_sharp_2.8.x
boo_mimetype
-remove_gtk-sharp-1.0_support
+#remove_gtk-sharp-1.0_support
glade_wrong_file_extension
#use_xulrunner
fix_registering_2.0_system_assemblies
#libstetic-dllmap
fix_aspnetedit_build_system
+fix_dllmaps
Added: non-group/monodevelop/trunk/debian/patches/cecil_0.4_backport.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/cecil_0.4_backport.dpatch 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/patches/cecil_0.4_backport.dpatch 2007-03-28 22:17:13 UTC (rev 3001)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cecil_0.4_backport.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-0.13.1~/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/ReflectionParameter.cs monodevelop-0.13.1/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/ReflectionParameter.cs
+--- monodevelop-0.13.1~/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/ReflectionParameter.cs 2007-03-08 00:01:50.000000000 +0100
++++ monodevelop-0.13.1/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/ReflectionParameter.cs 2007-03-25 21:06:15.000000000 +0200
+@@ -27,7 +27,7 @@
+ }
+ }
+
+- if ((parameterInfo.Attributes & ParameterAttributes.Out) != 0) {
++ if ((parameterInfo.Attributes & ParamAttributes.Out) != 0) {
+ modifier |= ParameterModifier.Out;
+ } else if (returnType.ByRef) {
+ // FIX: We should look at the return type of this parameter to
Property changes on: non-group/monodevelop/trunk/debian/patches/cecil_0.4_backport.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: non-group/monodevelop/trunk/debian/patches/fix_dllmaps.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/fix_dllmaps.dpatch 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/patches/fix_dllmaps.dpatch 2007-03-28 22:17:13 UTC (rev 3001)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_dllmaps.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-0.13.1~/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config.in monodevelop-0.13.1/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config.in
+--- monodevelop-0.13.1~/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config.in 2007-03-08 00:02:20.000000000 +0100
++++ monodevelop-0.13.1/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.dll.config.in 2007-03-25 23:04:36.000000000 +0200
+@@ -2,4 +2,5 @@
+ <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@" />
+ <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0 at LIB_PREFIX@.0 at LIB_SUFFIX@" />
+ <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@" />
++ <dllmap dll="glibsharpglue-2" target="/usr/lib/mono/gtk-sharp-2.0/libglibsharpglue-2.so"/>
+ </configuration>
Property changes on: non-group/monodevelop/trunk/debian/patches/fix_dllmaps.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch 2007-03-28 22:17:13 UTC (rev 3001)
@@ -5,56 +5,51 @@
## DP: No description.
@DPATCH@
-diff -urNad monodevelop-0.10~/configure monodevelop-0.10/configure
---- monodevelop-0.10~/configure 2006-04-09 15:51:49.000000000 +0200
-+++ monodevelop-0.10/configure 2006-04-09 16:11:59.000000000 +0200
-@@ -4381,23 +4381,23 @@
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for nunit >= 2.2.0" >&5
--echo $ECHO_N "checking for nunit >= 2.2.0... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for nunit-2.2 >= 2.2.0" >&5
-+echo $ECHO_N "checking for nunit-2.2 >= 2.2.0... $ECHO_C" >&6
+diff -urNad monodevelop-0.13.1~/Extras/NUnit/Makefile.am monodevelop-0.13.1/Extras/NUnit/Makefile.am
+--- monodevelop-0.13.1~/Extras/NUnit/Makefile.am 2007-03-08 00:02:21.000000000 +0100
++++ monodevelop-0.13.1/Extras/NUnit/Makefile.am 2007-03-15 22:32:48.000000000 +0100
+@@ -10,8 +10,7 @@
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+- -r:./lib/nunit.core.dll \
+- -r:./lib/nunit.framework.dll \
++ `pkg-config --libs nunit` \
+ -r:System \
+ -r:System.Xml
-- if $PKG_CONFIG --exists "nunit >= 2.2.0" ; then
-+ if $PKG_CONFIG --exists "nunit-2.2 >= 2.2.0" ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- succeeded=yes
+@@ -68,9 +67,7 @@
+ templates/NUnitTestClass.xft.xml
- echo "$as_me:$LINENO: checking NUNIT_CFLAGS" >&5
- echo $ECHO_N "checking NUNIT_CFLAGS... $ECHO_C" >&6
-- NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit >= 2.2.0"`
-+ NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit-2.2 >= 2.2.0"`
- echo "$as_me:$LINENO: result: $NUNIT_CFLAGS" >&5
- echo "${ECHO_T}$NUNIT_CFLAGS" >&6
- echo "$as_me:$LINENO: checking NUNIT_LIBS" >&5
- echo $ECHO_N "checking NUNIT_LIBS... $ECHO_C" >&6
-- NUNIT_LIBS=`$PKG_CONFIG --libs "nunit >= 2.2.0"`
-+ NUNIT_LIBS=`$PKG_CONFIG --libs "nunit-2.2 >= 2.2.0"`
- echo "$as_me:$LINENO: result: $NUNIT_LIBS" >&5
- echo "${ECHO_T}$NUNIT_LIBS" >&6
- else
-@@ -4405,7 +4405,7 @@
- NUNIT_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
-- NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit >= 2.2.0"`
-+ NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit-2.2 >= 2.2.0"`
+-NUNIT_FILES = \
+-nunit.core.dll \
+-nunit.framework.dll
++NUNIT_FILES =
- fi
+ SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
+ BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
+diff -urNad monodevelop-0.13.1~/Extras/NUnit/Makefile.in monodevelop-0.13.1/Extras/NUnit/Makefile.in
+--- monodevelop-0.13.1~/Extras/NUnit/Makefile.in 2007-03-08 00:03:06.000000000 +0100
++++ monodevelop-0.13.1/Extras/NUnit/Makefile.in 2007-03-15 22:32:48.000000000 +0100
+@@ -269,8 +269,7 @@
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+- -r:./lib/nunit.core.dll \
+- -r:./lib/nunit.framework.dll \
++ `pkg-config --libs nunit` \
+ -r:System \
+ -r:System.Xml
-diff -urNad monodevelop-0.10~/configure.in monodevelop-0.10/configure.in
---- monodevelop-0.10~/configure.in 2006-04-09 16:04:22.000000000 +0200
-+++ monodevelop-0.10/configure.in 2006-04-09 16:12:18.000000000 +0200
-@@ -147,7 +147,7 @@
- AC_HELP_STRING([--enable-nunit],[enable support for NUnit [default=yes]]),
- enable_nunit=${enableval}, enable_nunit=yes)
- if test "x$enable_nunit" = "xyes"; then
-- PKG_CHECK_MODULES(NUNIT, nunit >= 2.2.0, [],
-+ PKG_CHECK_MODULES(NUNIT, nunit-2.2 >= 2.2.0, [],
- [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= 1.1.9)
- NUNIT_LIBS="$MONO_NUNIT_LIBS"
- ])
+@@ -326,9 +325,7 @@
+ templates/NUnitProject.xpt.xml \
+ templates/NUnitTestClass.xft.xml
+
+-NUNIT_FILES = \
+-nunit.core.dll \
+-nunit.framework.dll
++NUNIT_FILES =
+
+ SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
+ BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
Modified: non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/patches/use_real_libs.dpatch 2007-03-28 22:17:13 UTC (rev 3001)
@@ -1,85 +1,85 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
@DPATCH@
-diff -urNad monodevelop-0.12~/Core/src/MonoDevelop.Core/Makefile.am monodevelop-0.12/Core/src/MonoDevelop.Core/Makefile.am
---- monodevelop-0.12~/Core/src/MonoDevelop.Core/Makefile.am 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Core/src/MonoDevelop.Core/Makefile.am 2006-09-17 01:26:35.000000000 +0200
-@@ -141,8 +141,8 @@
- -r:System.Xml \
- -r:System.Runtime.Remoting \
- -r:ICSharpCode.SharpZipLib.dll \
+diff -urNad monodevelop-0.13.1~/Core/src/MonoDevelop.Core/Makefile.am monodevelop-0.13.1/Core/src/MonoDevelop.Core/Makefile.am
+--- monodevelop-0.13.1~/Core/src/MonoDevelop.Core/Makefile.am 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Core/src/MonoDevelop.Core/Makefile.am 2007-03-15 23:07:02.000000000 +0100
+@@ -140,8 +140,8 @@
+ RES =
+
+ REFS = \
- -r:$(top_builddir)/build/bin/log4net.dll \
-- -r:$(top_builddir)/build/bin/Mono.Cecil.dll
+- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ `pkg-config --libs log4net` \
-+ `pkg-config --libs mono-cecil`
++ `pkg-config --libs mono-cecil` \
+ -r:ICSharpCode.SharpZipLib \
+ -r:Mono.Posix \
+ -r:System \
+diff -urNad monodevelop-0.13.1~/Core/src/MonoDevelop.Core/Makefile.in monodevelop-0.13.1/Core/src/MonoDevelop.Core/Makefile.in
+--- monodevelop-0.13.1~/Core/src/MonoDevelop.Core/Makefile.in 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Core/src/MonoDevelop.Core/Makefile.in 2007-03-15 23:08:08.000000000 +0100
+@@ -398,8 +398,8 @@
- all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)
-
-diff -urNad monodevelop-0.12~/Core/src/MonoDevelop.Core/Makefile.in monodevelop-0.12/Core/src/MonoDevelop.Core/Makefile.in
---- monodevelop-0.12~/Core/src/MonoDevelop.Core/Makefile.in 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Core/src/MonoDevelop.Core/Makefile.in 2006-09-17 01:26:35.000000000 +0200
-@@ -402,8 +402,8 @@
- -r:System.Xml \
- -r:System.Runtime.Remoting \
- -r:ICSharpCode.SharpZipLib.dll \
+ RES =
+ REFS = \
- -r:$(top_builddir)/build/bin/log4net.dll \
-- -r:$(top_builddir)/build/bin/Mono.Cecil.dll
+- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ `pkg-config --libs log4net` \
-+ `pkg-config --libs mono-cecil`
-
- ADDIN = MonoDevelop.Core.addin.xml
- ADDIN_BUILD = $(top_builddir)/build/AddIns
-diff -urNad monodevelop-0.12~/Core/src/MonoDevelop.Ide/Makefile.am monodevelop-0.12/Core/src/MonoDevelop.Ide/Makefile.am
---- monodevelop-0.12~/Core/src/MonoDevelop.Ide/Makefile.am 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Core/src/MonoDevelop.Ide/Makefile.am 2006-09-17 01:26:35.000000000 +0200
++ `pkg-config --libs mono-cecil` \
+ -r:ICSharpCode.SharpZipLib \
+ -r:Mono.Posix \
+ -r:System \
+diff -urNad monodevelop-0.13.1~/Core/src/MonoDevelop.Ide/Makefile.am monodevelop-0.13.1/Core/src/MonoDevelop.Ide/Makefile.am
+--- monodevelop-0.13.1~/Core/src/MonoDevelop.Ide/Makefile.am 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Core/src/MonoDevelop.Ide/Makefile.am 2007-03-15 23:37:39.000000000 +0100
@@ -14,7 +14,7 @@
- -r:Mono.Posix \
- -r:Mono.GetOptions \
- -r:System.Runtime.Remoting \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Documentation.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
- -r:$(top_builddir)/build/bin/log4net.dll \
+ `pkg-config --libs log4net` \
- $(GTK_SHARP_LIBS) \
- $(GNOME_SHARP_LIBS) \
- $(GNOME_VFS_SHARP_LIBS) \
-diff -urNad monodevelop-0.12~/Core/src/MonoDevelop.Ide/Makefile.in monodevelop-0.12/Core/src/MonoDevelop.Ide/Makefile.in
---- monodevelop-0.12~/Core/src/MonoDevelop.Ide/Makefile.in 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Core/src/MonoDevelop.Ide/Makefile.in 2006-09-17 01:26:35.000000000 +0200
-@@ -280,7 +280,7 @@
- -r:Mono.Posix \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:ICSharpCode.SharpZipLib \
-r:Mono.GetOptions \
- -r:System.Runtime.Remoting \
+diff -urNad monodevelop-0.13.1~/Core/src/MonoDevelop.Ide/Makefile.in monodevelop-0.13.1/Core/src/MonoDevelop.Ide/Makefile.in
+--- monodevelop-0.13.1~/Core/src/MonoDevelop.Ide/Makefile.in 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Core/src/MonoDevelop.Ide/Makefile.in 2007-03-15 23:37:51.000000000 +0100
+@@ -275,7 +275,7 @@
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Documentation.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
- -r:$(top_builddir)/build/bin/log4net.dll \
+ `pkg-config --libs log4net` \
- $(GTK_SHARP_LIBS) \
- $(GNOME_SHARP_LIBS) \
- $(GNOME_VFS_SHARP_LIBS) \
-diff -urNad monodevelop-0.12~/Core/src/MonoDevelop.Projects/Makefile.am monodevelop-0.12/Core/src/MonoDevelop.Projects/Makefile.am
---- monodevelop-0.12~/Core/src/MonoDevelop.Projects/Makefile.am 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Core/src/MonoDevelop.Projects/Makefile.am 2006-09-17 01:26:35.000000000 +0200
-@@ -7,7 +7,7 @@
- -r:System.Xml \
- -r:System.Drawing \
- -r:Mono.Posix \
-- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
-+ `pkg-config --libs mono-cecil` \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- $(MONODOC_LIBS)
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:ICSharpCode.SharpZipLib \
+ -r:Mono.GetOptions \
+diff -urNad monodevelop-0.13.1~/Core/src/MonoDevelop.Projects/Makefile.am monodevelop-0.13.1/Core/src/MonoDevelop.Projects/Makefile.am
+--- monodevelop-0.13.1~/Core/src/MonoDevelop.Projects/Makefile.am 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Core/src/MonoDevelop.Projects/Makefile.am 2007-03-15 23:38:25.000000000 +0100
+@@ -5,7 +5,7 @@
-diff -urNad monodevelop-0.12~/Core/src/MonoDevelop.Projects/Makefile.in monodevelop-0.12/Core/src/MonoDevelop.Projects/Makefile.in
---- monodevelop-0.12~/Core/src/MonoDevelop.Projects/Makefile.in 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Core/src/MonoDevelop.Projects/Makefile.in 2006-09-17 01:26:35.000000000 +0200
-@@ -271,7 +271,7 @@
- -r:System.Xml \
- -r:System.Drawing \
- -r:Mono.Posix \
-- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
-+ `pkg-config --libs mono-cecil` \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- $(MONODOC_LIBS)
-
-diff -urNad monodevelop-0.12~/Extras/MonoDevelop.Autotools/Makefile.am monodevelop-0.12/Extras/MonoDevelop.Autotools/Makefile.am
---- monodevelop-0.12~/Extras/MonoDevelop.Autotools/Makefile.am 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Extras/MonoDevelop.Autotools/Makefile.am 2006-09-17 01:26:35.000000000 +0200
+ REFS = \
+ $(MONODOC_LIBS) \
+- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
++ `pkg-config --libs mono-cecil` \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:Mono.Posix \
+ -r:System \
+diff -urNad monodevelop-0.13.1~/Core/src/MonoDevelop.Projects/Makefile.in monodevelop-0.13.1/Core/src/MonoDevelop.Projects/Makefile.in
+--- monodevelop-0.13.1~/Core/src/MonoDevelop.Projects/Makefile.in 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Core/src/MonoDevelop.Projects/Makefile.in 2007-03-15 23:38:42.000000000 +0100
+@@ -265,7 +265,7 @@
+ CONFIG = MonoDevelop.Projects.dll.config
+ REFS = \
+ $(MONODOC_LIBS) \
+- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
++ `pkg-config --libs mono-cecil` \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:Mono.Posix \
+ -r:System \
+diff -urNad monodevelop-0.13.1~/Extras/MonoDevelop.Autotools/Makefile.am monodevelop-0.13.1/Extras/MonoDevelop.Autotools/Makefile.am
+--- monodevelop-0.13.1~/Extras/MonoDevelop.Autotools/Makefile.am 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Extras/MonoDevelop.Autotools/Makefile.am 2007-03-15 23:07:02.000000000 +0100
@@ -4,7 +4,7 @@
REFS = -r:Mono.Posix \
@@ -89,10 +89,10 @@
-r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
-diff -urNad monodevelop-0.12~/Extras/MonoDevelop.Autotools/Makefile.in monodevelop-0.12/Extras/MonoDevelop.Autotools/Makefile.in
---- monodevelop-0.12~/Extras/MonoDevelop.Autotools/Makefile.in 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Extras/MonoDevelop.Autotools/Makefile.in 2006-09-17 01:26:35.000000000 +0200
-@@ -265,7 +265,7 @@
+diff -urNad monodevelop-0.13.1~/Extras/MonoDevelop.Autotools/Makefile.in monodevelop-0.13.1/Extras/MonoDevelop.Autotools/Makefile.in
+--- monodevelop-0.13.1~/Extras/MonoDevelop.Autotools/Makefile.in 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Extras/MonoDevelop.Autotools/Makefile.in 2007-03-15 23:07:02.000000000 +0100
+@@ -262,7 +262,7 @@
ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Autotools.dll
REFS = -r:Mono.Posix \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
@@ -101,57 +101,57 @@
-r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
-diff -urNad monodevelop-0.12~/Extras/MonoDevelop.GtkCore/Makefile.am monodevelop-0.12/Extras/MonoDevelop.GtkCore/Makefile.am
---- monodevelop-0.12~/Extras/MonoDevelop.GtkCore/Makefile.am 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Extras/MonoDevelop.GtkCore/Makefile.am 2006-09-17 01:26:35.000000000 +0200
-@@ -11,7 +11,7 @@
- -r:$(srcdir)/lib/libstetic.dll \
- -r:$(srcdir)/lib/libsteticui.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+diff -urNad monodevelop-0.13.1~/Extras/MonoDevelop.GtkCore/Makefile.am monodevelop-0.13.1/Extras/MonoDevelop.GtkCore/Makefile.am
+--- monodevelop-0.13.1~/Extras/MonoDevelop.GtkCore/Makefile.am 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Extras/MonoDevelop.GtkCore/Makefile.am 2007-03-15 23:42:07.000000000 +0100
+@@ -12,7 +12,7 @@
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ `pkg-config --libs mono-cecil` \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:./lib/libstetic.dll \
+ -r:./lib/libsteticui.dll \
+diff -urNad monodevelop-0.13.1~/Extras/MonoDevelop.GtkCore/Makefile.in monodevelop-0.13.1/Extras/MonoDevelop.GtkCore/Makefile.in
+--- monodevelop-0.13.1~/Extras/MonoDevelop.GtkCore/Makefile.in 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Extras/MonoDevelop.GtkCore/Makefile.in 2007-03-15 23:42:29.000000000 +0100
+@@ -270,7 +270,7 @@
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-diff -urNad monodevelop-0.12~/Extras/MonoDevelop.GtkCore/Makefile.in monodevelop-0.12/Extras/MonoDevelop.GtkCore/Makefile.in
---- monodevelop-0.12~/Extras/MonoDevelop.GtkCore/Makefile.in 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Extras/MonoDevelop.GtkCore/Makefile.in 2006-09-17 01:26:35.000000000 +0200
-@@ -272,7 +272,7 @@
- -r:$(srcdir)/lib/libstetic.dll \
- -r:$(srcdir)/lib/libsteticui.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ `pkg-config --libs mono-cecil` \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-diff -urNad monodevelop-0.12~/Extras/MonoQuery/Mono.Data.Sql/Makefile.am monodevelop-0.12/Extras/MonoQuery/Mono.Data.Sql/Makefile.am
---- monodevelop-0.12~/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2006-09-17 01:28:25.000000000 +0200
-@@ -42,7 +42,7 @@
- -r:Mono.Data.SqliteClient \
- -r:System.Data.OracleClient \
- -r:Mono.Data.SybaseClient \
---r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
-+-r:/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:./lib/libstetic.dll \
+ -r:./lib/libsteticui.dll \
+diff -urNad monodevelop-0.13.1~/Extras/MonoQuery/Mono.Data.Sql/Makefile.am monodevelop-0.13.1/Extras/MonoQuery/Mono.Data.Sql/Makefile.am
+--- monodevelop-0.13.1~/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Extras/MonoQuery/Mono.Data.Sql/Makefile.am 2007-03-15 23:39:26.000000000 +0100
+@@ -37,7 +37,7 @@
+ Schema/ViewSchema.cs
- ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
+ REFS = \
+- -r:$(top_builddir)/build/AddIns/MonoQuery/FirebirdSql.Data.Firebird.dll \
++ -r:/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll \
+ -r:ByteFX.Data \
+ -r:Mono.Data.SqliteClient \
+ -r:Mono.Data.SybaseClient \
+diff -urNad monodevelop-0.13.1~/Extras/MonoQuery/Mono.Data.Sql/Makefile.in monodevelop-0.13.1/Extras/MonoQuery/Mono.Data.Sql/Makefile.in
+--- monodevelop-0.13.1~/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2007-03-15 23:39:47.000000000 +0100
+@@ -296,7 +296,7 @@
+ Schema/ViewSchema.cs
-diff -urNad monodevelop-0.12~/Extras/MonoQuery/Mono.Data.Sql/Makefile.in monodevelop-0.12/Extras/MonoQuery/Mono.Data.Sql/Makefile.in
---- monodevelop-0.12~/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/Extras/MonoQuery/Mono.Data.Sql/Makefile.in 2006-09-17 01:28:36.000000000 +0200
-@@ -305,7 +305,7 @@
- -r:Mono.Data.SqliteClient \
- -r:System.Data.OracleClient \
- -r:Mono.Data.SybaseClient \
---r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
-+-r:/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll
-
- ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
- ASSEMBLY = $(ADDIN_BUILD)/Mono.Data.Sql.dll
-diff -urNad monodevelop-0.12~/contrib/Makefile.am monodevelop-0.12/contrib/Makefile.am
---- monodevelop-0.12~/contrib/Makefile.am 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/contrib/Makefile.am 2006-09-17 01:26:35.000000000 +0200
+ REFS = \
+- -r:$(top_builddir)/build/AddIns/MonoQuery/FirebirdSql.Data.Firebird.dll \
++ -r:/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll \
+ -r:ByteFX.Data \
+ -r:Mono.Data.SqliteClient \
+ -r:Mono.Data.SybaseClient \
+diff -urNad monodevelop-0.13.1~/contrib/Makefile.am monodevelop-0.13.1/contrib/Makefile.am
+--- monodevelop-0.13.1~/contrib/Makefile.am 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/contrib/Makefile.am 2007-03-15 23:07:02.000000000 +0100
@@ -1,34 +1,8 @@
BINDIR=$(top_builddir)/build/bin
@@ -189,10 +189,10 @@
+CLEANFILES =
EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
-diff -urNad monodevelop-0.12~/contrib/Makefile.in monodevelop-0.12/contrib/Makefile.in
---- monodevelop-0.12~/contrib/Makefile.in 2006-09-17 01:26:25.000000000 +0200
-+++ monodevelop-0.12/contrib/Makefile.in 2006-09-17 01:26:35.000000000 +0200
-@@ -261,19 +261,7 @@
+diff -urNad monodevelop-0.13.1~/contrib/Makefile.in monodevelop-0.13.1/contrib/Makefile.in
+--- monodevelop-0.13.1~/contrib/Makefile.in 2007-03-15 22:33:18.000000000 +0100
++++ monodevelop-0.13.1/contrib/Makefile.in 2007-03-15 23:07:02.000000000 +0100
+@@ -258,19 +258,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
BINDIR = $(top_builddir)/build/bin
@@ -212,7 +212,7 @@
CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
all: all-am
-@@ -449,19 +437,8 @@
+@@ -446,19 +434,8 @@
uninstall-info-am
Modified: non-group/monodevelop/trunk/debian/rules
===================================================================
--- non-group/monodevelop/trunk/debian/rules 2007-03-27 22:18:41 UTC (rev 3000)
+++ non-group/monodevelop/trunk/debian/rules 2007-03-28 22:17:13 UTC (rev 3001)
@@ -7,16 +7,18 @@
configure: patch configure-stamp
configure-stamp:
dh_testdir
- ln -s /usr/lib/boo/booc.exe debian/booc2.exe
+ ln -sf /usr/lib/boo/booc.exe debian/booc2.exe
chmod +x debian/booc2
./configure --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--disable-update-mimedb --disable-update-desktopdb \
--enable-boo --enable-java \
- --enable-nunit --enable-versioncontrol \
+ --enable-nunit \
+ --enable-versioncontrol --enable-subversion \
--enable-aspnet \
- --disable-monoextensions BOOC=$(CURDIR)/debian/booc2
+ --disable-monoextensions \
+ BOOC=$(CURDIR)/debian/booc2
# needs nemerle >= 0.9.3.99
# --enable-nemerle
# needs too buggy libjscall0.0-cil
@@ -67,6 +69,8 @@
rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/NUnit/
# remove versioncontrol files (shipped in monodevelop-versioncontrol)
rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/VersionControl/
+ # remove ChangeLogAddIn files (shipped in monodevelop-versioncontrol)
+ rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/ChangeLogAddIn/
# remove query files (shipped in monodevelop-query)
rm -r debian/monodevelop/usr/lib/monodevelop/AddIns/MonoQuery/
cp $(CURDIR)/ChangeLog $(CURDIR)/changelog
@@ -87,5 +91,7 @@
dh_md5sums
dh_builddeb
+binary-arch:
+
binary: binary-indep
-.PHONY: build clean binary-indep binary install configure patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
More information about the Pkg-mono-svn-commits
mailing list