[Pkg-mono-svn-commits] rev 2123 - in
non-group/monodevelop/trunk/debian: . patches
Mirco Bauer
meebey-guest at costa.debian.org
Sat Nov 26 17:39:04 UTC 2005
Author: meebey-guest
Date: 2005-11-26 17:39:00 +0000 (Sat, 26 Nov 2005)
New Revision: 2123
Added:
non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch
Modified:
non-group/monodevelop/trunk/debian/changelog
non-group/monodevelop/trunk/debian/control
non-group/monodevelop/trunk/debian/patches/00list
non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch
non-group/monodevelop/trunk/debian/rules
Log:
- monodevelop 0.9-1 release
Modified: non-group/monodevelop/trunk/debian/changelog
===================================================================
--- non-group/monodevelop/trunk/debian/changelog 2005-11-22 22:05:24 UTC (rev 2122)
+++ non-group/monodevelop/trunk/debian/changelog 2005-11-26 17:39:00 UTC (rev 2123)
@@ -1,3 +1,19 @@
+monodevelop (0.9-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control:
+ - Added libvte2.0-cil to build-deps.
+ - Added mozilla-dev again to build-deps.
+ - Updated versioned build-dep on Gtk# to >= 2.4.0.
+ * debian/patches/01_use_real_nunit.dpatch:
+ - Updated for MonoDevelop 0.9.
+ * debian/patches/remove_unused_icon.dpatch:
+ - Removes a reference to an icon which doesn't exist, caused exception
+ on PPC. (Closes: #338053)
+ (thanks to Sebastian 'slomo' Dröge <slomo at ubuntu.com> for the patch)
+
+ -- Mirco Bauer <meebey at meebey.net> Sat, 26 Nov 2005 15:16:10 +0100
+
monodevelop (0.8-1) unstable; urgency=low
* New upstream release
Modified: non-group/monodevelop/trunk/debian/control
===================================================================
--- non-group/monodevelop/trunk/debian/control 2005-11-22 22:05:24 UTC (rev 2122)
+++ non-group/monodevelop/trunk/debian/control 2005-11-26 17:39:00 UTC (rev 2123)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Mirco Bauer <meebey at meebey.net>
-Build-Depends-Indep: debhelper (>= 4.0.0), cli-common (>= 0.2.0), dpatch, mono-mcs (>= 1.1.4) | c-sharp-compiler, libmono-dev (>= 1.1.4), boo (>= 0.6.0.1858), ikvm (>= 0.10), monodoc-base (>= 1.1.9), intltool, gtk-sharp2-gapi (>= 2.3.90), libgtk2.0-cil (>= 2.3.90), libgnome2.0-cil (>= 2.3.90), libgconf2.0-cil (>= 2.3.90), libglade2.0-cil (>= 2.3.90), libgtksourceview2.0-cil (>= 0.10), libgecko2.0-cil (>= 0.10), libnunit-cil (>= 1.1.8)
+Build-Depends-Indep: debhelper (>= 4.0.0), cli-common (>= 0.2.0), dpatch, mono-mcs (>= 1.1.4) | c-sharp-compiler, libmono-dev (>= 1.1.4), boo (>= 0.6.0.1858), 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), libnunit-cil (>= 1.1.8), mozilla-dev
Standards-Version: 3.6.2.1
Package: monodevelop
Modified: non-group/monodevelop/trunk/debian/patches/00list
===================================================================
--- non-group/monodevelop/trunk/debian/patches/00list 2005-11-22 22:05:24 UTC (rev 2122)
+++ non-group/monodevelop/trunk/debian/patches/00list 2005-11-26 17:39:00 UTC (rev 2123)
@@ -1 +1,2 @@
01_use_real_nunit
+remove_unused_icon
Modified: non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch 2005-11-22 22:05:24 UTC (rev 2122)
+++ non-group/monodevelop/trunk/debian/patches/01_use_real_nunit.dpatch 2005-11-26 17:39:00 UTC (rev 2123)
@@ -5,49 +5,36 @@
## DP: No description.
@DPATCH@
-diff -urNad monodevelop-0.8~/Extras/MonoDeveloperExtensions/Makefile.in monodevelop-0.8/Extras/MonoDeveloperExtensions/Makefile.in
---- monodevelop-0.8~/Extras/MonoDeveloperExtensions/Makefile.in 2005-10-12 18:55:17.000000000 +0200
-+++ monodevelop-0.8/Extras/MonoDeveloperExtensions/Makefile.in 2005-10-16 22:19:08.000000000 +0200
-@@ -250,7 +250,7 @@
- /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
- /r:$(top_builddir)/build/AddIns/NUnit/MonoDevelop.NUnit.dll \
-- /r:nunit.core.dll \
-+ $(NUNIT_LIBS) \
- $(GTK_SHARP_LIBS) \
- $(GLADE_SHARP_LIBS) \
- $(GCONF_SHARP_LIBS) \
-
-diff -urNad monodevelop-0.8~/Extras/NUnit/Makefile.in monodevelop-0.8/Extras/NUnit/Makefile.in
---- monodevelop-0.8~/Extras/NUnit/Makefile.in 2005-10-12 18:55:18.000000000 +0200
-+++ monodevelop-0.8/Extras/NUnit/Makefile.in 2005-10-16 22:18:44.000000000 +0200
-@@ -238,8 +238,7 @@
+diff -urNad monodevelop-0.9~/Extras/NUnit/Makefile.in monodevelop-0.9/Extras/NUnit/Makefile.in
+--- monodevelop-0.9~/Extras/NUnit/Makefile.in 2005-11-26 18:33:44.000000000 +0100
++++ monodevelop-0.9/Extras/NUnit/Makefile.in 2005-11-26 18:33:48.000000000 +0100
+@@ -240,8 +240,7 @@
target_alias = @target_alias@
ADDIN_BUILD = $(top_builddir)/build/AddIns/NUnit
ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.NUnit.dll
-DLLS = /r:nunit.framework.dll \
- /r:nunit.core.dll \
+DLLS = $(MONO_NUNIT_LIBS) \
- /r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
- /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \
-diff -urNad monodevelop-0.8~/configure.in monodevelop-0.8/configure.in
---- monodevelop-0.8~/configure.in 2005-10-12 18:52:47.000000000 +0200
-+++ monodevelop-0.8/configure.in 2005-10-16 22:18:44.000000000 +0200
-@@ -130,7 +130,7 @@
- AC_ARG_ENABLE(nunit,
- AC_HELP_STRING([--enable-nunit],
- [enable support for NUnit [default=no]]),
-- [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION, enable_nunit=yes, enable_nunit=no)],
-+ [PKG_CHECK_MODULES(MONO_NUNIT, nunit >= $MONO_NUNIT_REQUIRED_VERSION, enable_nunit=yes, enable_nunit=no)],
- enable_nunit=no)
-
- AM_CONDITIONAL(ENABLE_NUNIT, test x$enable_nunit = xyes)
-
-diff -urNad monodevelop-0.8~/configure monodevelop-0.8/configure
---- monodevelop-0.8~/configure 2005-10-12 18:55:21.000000000 +0200
-+++ monodevelop-0.8/configure 2005-10-16 22:18:44.000000000 +0200
-@@ -4259,23 +4259,23 @@
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+diff -urNad monodevelop-0.9~/Extras/WelcomePage/Makefile.in monodevelop-0.9/Extras/WelcomePage/Makefile.in
+--- monodevelop-0.9~/Extras/WelcomePage/Makefile.in 2005-11-26 18:33:44.000000000 +0100
++++ monodevelop-0.9/Extras/WelcomePage/Makefile.in 2005-11-26 18:33:48.000000000 +0100
+@@ -240,8 +240,7 @@
+ target_alias = @target_alias@
+ ADDIN_BUILD = $(top_builddir)/build/AddIns/WelcomePage
+ ASSEMBLY = $(ADDIN_BUILD)/WelcomePage.dll
+-DLLS = /r:nunit.framework.dll \
+- /r:nunit.core.dll \
++DLLS = $(NUNIT_LIBS) \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
+diff -urNad monodevelop-0.9~/configure monodevelop-0.9/configure
+--- monodevelop-0.9~/configure 2005-11-23 21:45:25.000000000 +0100
++++ monodevelop-0.9/configure 2005-11-26 18:34:34.000000000 +0100
+@@ -4365,23 +4365,23 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -76,7 +63,7 @@
echo "$as_me:$LINENO: result: $MONO_NUNIT_LIBS" >&5
echo "${ECHO_T}$MONO_NUNIT_LIBS" >&6
else
-@@ -4283,7 +4283,7 @@
+@@ -4389,7 +4389,7 @@
MONO_NUNIT_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
@@ -85,3 +72,15 @@
fi
+diff -urNad monodevelop-0.9~/configure.in monodevelop-0.9/configure.in
+--- monodevelop-0.9~/configure.in 2005-11-26 18:33:44.000000000 +0100
++++ monodevelop-0.9/configure.in 2005-11-26 18:33:48.000000000 +0100
+@@ -137,7 +137,7 @@
+ AC_ARG_ENABLE(nunit,
+ AC_HELP_STRING([--enable-nunit],
+ [enable support for NUnit [default=yes]]),
+- [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= $MONO_NUNIT_REQUIRED_VERSION, enable_nunit=${enableval}, enable_nunit=no)],
++ [PKG_CHECK_MODULES(MONO_NUNIT, nunit >= $MONO_NUNIT_REQUIRED_VERSION, enable_nunit=${enableval}, enable_nunit=no)],
+ enable_nunit=yes)
+
+ AM_CONDITIONAL(ENABLE_NUNIT, test x$enable_nunit = xyes)
Added: non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch 2005-11-22 22:05:24 UTC (rev 2122)
+++ non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch 2005-11-26 17:39:00 UTC (rev 2123)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.addin.xml 2005/11/09 10:38:33 52780
++++ monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.addin.xml 2005/11/25 13:11:43 53477
+@@ -96,7 +96,6 @@
+ <StockIcon stockid = "md-private-method" resource = "Icons.16x16.PrivateMethod" />
+ <StockIcon stockid = "md-private-property" resource = "Icons.16x16.PrivateProperty" />
+ <StockIcon stockid = "md-private-struct" resource = "Icons.16x16.PrivateStruct" />
+- <StockIcon stockid = "md-project-scout-icon" resource = "Icons.ProjectScoutIcon" />
+ <StockIcon stockid = "md-properties-icon" resource = "Icons.16x16.PropertiesIcon" />
+ <StockIcon stockid = "md-property" resource = "Icons.16x16.Property" />
+ <StockIcon stockid = "md-protected-class" resource = "Icons.16x16.ProtectedClass" />
+
+
+--- monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs 2005/09/27 15:22:05 50869
++++ monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs 2005/11/25 13:11:43 53477
+@@ -83,7 +83,6 @@
+ public static readonly string PrivateMethod = "md-private-method";
+ public static readonly string PrivateProperty = "md-private-property";
+ public static readonly string PrivateStruct = "md-private-struct";
+- public static readonly string ProjectScoutIcon = "md-project-scout-icon";
+ public static readonly string PropertiesIcon = "md-properties-icon";
+ public static readonly string Property = "md-property";
+ public static readonly string ProtectedClass = "md-protected-class";
+
Property changes on: non-group/monodevelop/trunk/debian/patches/remove_unused_icon.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: non-group/monodevelop/trunk/debian/rules
===================================================================
--- non-group/monodevelop/trunk/debian/rules 2005-11-22 22:05:24 UTC (rev 2122)
+++ non-group/monodevelop/trunk/debian/rules 2005-11-26 17:39:00 UTC (rev 2123)
@@ -11,7 +11,8 @@
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--disable-update-mimedb --disable-update-desktopdb \
- --enable-boo --enable-java --enable-nunit --enable-versioncontrol
+ --enable-boo --enable-java --enable-nunit --enable-versioncontrol \
+ --disable-monoextensions
# debugger is not ready yet, needs mono from SVN
# --enable-debugger
touch configure-stamp
More information about the Pkg-mono-svn-commits
mailing list