[Pkg-mono-svn-commits] rev 3009 - in non-group/monodevelop/trunk/debian: . patches

Mirco Bauer meebey-guest at alioth.debian.org
Sun Apr 1 22:50:46 UTC 2007 

Author: meebey-guest
Date: 2007-04-01 22:50:46 +0000 (Sun, 01 Apr 2007)
New Revision: 3009

Removed:
   non-group/monodevelop/trunk/debian/booc2
   non-group/monodevelop/trunk/debian/booc2.exe.config
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/use_nunit2.2.dpatch
   non-group/monodevelop/trunk/debian/rules
Log:
- more updates



Deleted: non-group/monodevelop/trunk/debian/booc2
===================================================================
--- non-group/monodevelop/trunk/debian/booc2	2007-04-01 22:15:17 UTC (rev 3008)
+++ non-group/monodevelop/trunk/debian/booc2	2007-04-01 22:50:46 UTC (rev 3009)
@@ -1,2 +0,0 @@
-#!/bin/sh
-env /usr/bin/mono "$0".exe "$@"

Deleted: non-group/monodevelop/trunk/debian/booc2.exe.config
===================================================================
--- non-group/monodevelop/trunk/debian/booc2.exe.config	2007-04-01 22:15:17 UTC (rev 3008)
+++ non-group/monodevelop/trunk/debian/booc2.exe.config	2007-04-01 22:50:46 UTC (rev 3009)
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <startup>
-    <supportedRuntime version="v2.0.50727" />
-  </startup>
-</configuration>

Modified: non-group/monodevelop/trunk/debian/changelog
===================================================================
--- non-group/monodevelop/trunk/debian/changelog	2007-04-01 22:15:17 UTC (rev 3008)
+++ non-group/monodevelop/trunk/debian/changelog	2007-04-01 22:50:46 UTC (rev 3009)
@@ -1,8 +1,8 @@
-monodevelop (0.13.1+dfsg-1~pre3) unstable; urgency=low
+monodevelop (0.13.1+dfsg-1~pre6) 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:
+     + 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  
@@ -21,6 +21,10 @@
      + 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)
+     + Updated libnunit2.2-cil build dependency to libnunit2.2.6-cil.
+     + Updated booc build dependency to >= 0.7.6.2237-6
+   * debian/rules:
+     + Using /usr/bin/booc2 in configure call instead of debian/booc2.
    * debian/patches/00list:
      + Disabled remove_gtk-sharp-1.0_support, already applied upstream.
    * debian/patches/use_nunit2.2.dpatch
@@ -29,11 +33,15 @@
    * debian/patches/fix_dllmaps.dpatch:
      + Added DLL map for glibsharpglue-2 to
        MonoDevelop.SourceEditor.dll.config.in.
+   * debian/patches/use_x-terminal-emulator.dpatch:
+     + Use x-terminal-emulator instead of xterm when using external console
+       as application output.
+       (disabled though, because multi-gnome-terminal doesn't like it)
    * 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
+ -- Mirco Bauer <meebey at debian.org>  Sun, 25 Mar 2007 22:13:56 +0200
 
 monodevelop (0.12+dfsg-1) unstable; urgency=low
 

Modified: non-group/monodevelop/trunk/debian/control
===================================================================
--- non-group/monodevelop/trunk/debian/control	2007-04-01 22:15:17 UTC (rev 3008)
+++ non-group/monodevelop/trunk/debian/control	2007-04-01 22:50:46 UTC (rev 3009)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Mirco Bauer <meebey at debian.org>
 Build-Depends: debhelper (>= 5), dpatch
-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
+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.6.2237-6), 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.6-cil, 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

Modified: non-group/monodevelop/trunk/debian/patches/00list
===================================================================
--- non-group/monodevelop/trunk/debian/patches/00list	2007-04-01 22:15:17 UTC (rev 3008)
+++ non-group/monodevelop/trunk/debian/patches/00list	2007-04-01 22:50:46 UTC (rev 3009)
@@ -1,5 +1,6 @@
 use_nunit2.2
 use_real_libs
+use_x-terminal-emulator
 cecil_0.4_backport
 update_templates_for_gtk_sharp_2.8.x
 boo_mimetype

Modified: non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch	2007-04-01 22:15:17 UTC (rev 3008)
+++ non-group/monodevelop/trunk/debian/patches/use_nunit2.2.dpatch	2007-04-01 22:50:46 UTC (rev 3009)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 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
+--- monodevelop-0.13.1~/Extras/NUnit/Makefile.am	2007-04-01 22:19:05.000000000 +0200
++++ monodevelop-0.13.1/Extras/NUnit/Makefile.am	2007-04-01 22:19:14.000000000 +0200
 @@ -10,8 +10,7 @@
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
@@ -30,8 +30,8 @@
  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
+--- monodevelop-0.13.1~/Extras/NUnit/Makefile.in	2007-04-01 22:19:05.000000000 +0200
++++ monodevelop-0.13.1/Extras/NUnit/Makefile.in	2007-04-01 22:19:14.000000000 +0200
 @@ -269,8 +269,7 @@
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
  	-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
@@ -53,3 +53,15 @@
  
  SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
  BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
+diff -urNad monodevelop-0.13.1~/Extras/NUnit/MonoDevelopNUnit.addin.xml monodevelop-0.13.1/Extras/NUnit/MonoDevelopNUnit.addin.xml
+--- monodevelop-0.13.1~/Extras/NUnit/MonoDevelopNUnit.addin.xml	2007-03-08 00:02:21.000000000 +0100
++++ monodevelop-0.13.1/Extras/NUnit/MonoDevelopNUnit.addin.xml	2007-04-01 22:19:26.000000000 +0200
+@@ -9,8 +9,6 @@
+ 
+ 	<Runtime>
+ 		<Import assembly="MonoDevelop.NUnit.dll" />
+-		<Import assembly="nunit.core.dll" />
+-		<Import assembly="nunit.framework.dll" />
+ 	</Runtime>
+ 	
+ 	<Dependencies>

Modified: non-group/monodevelop/trunk/debian/rules
===================================================================
--- non-group/monodevelop/trunk/debian/rules	2007-04-01 22:15:17 UTC (rev 3008)
+++ non-group/monodevelop/trunk/debian/rules	2007-04-01 22:50:46 UTC (rev 3009)
@@ -7,8 +7,6 @@
 configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
-	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 \
@@ -18,7 +16,7 @@
 	  --enable-versioncontrol --enable-subversion \
 	  --enable-aspnet \
 	  --disable-monoextensions \
-	  BOOC=$(CURDIR)/debian/booc2
+	  BOOC=/usr/bin/booc2
 	# needs nemerle >= 0.9.3.99
 	#  --enable-nemerle
 	# needs too buggy libjscall0.0-cil
@@ -43,7 +41,6 @@
 	rm -f build-stamp
 	-$(MAKE) distclean
 	rm -rf $(CURDIR)/.wapi
-	rm -f debian/booc2.exe
 	dh_clean 
 
 install: build

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