[Pkg-cli-apps-commits] r4524 - in /packages/monodevelop/trunk/debian: changelog control patches/00list patches/link_system_mono-nunit.dpatch patches/link_system_nunit.dpatch patches/use_csc.dpatch patches/use_libsvn1.dpatch rules watch
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Sun Feb 15 12:16:30 UTC 2009
Author: meebey
Date: Sun Feb 15 12:16:29 2009
New Revision: 4524
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4524
Log:
* NOT RELEASED YET
* DFSG version of MonoDevelop 1.9.2
(deleted all pre-compiled binaries from the tarball)
+ For the record here a list of the deleted files:
src/addins/NUnit/lib/nunit.framework.dll
src/addins/NUnit/lib/nunit.core.dll
src/addins/NUnit/lib/nunit.util.dll
src/addins/NUnit/lib/nunit.core.interfaces.dll
* New upstream release
* debian/control:
+ Added Homepage, Vcs-Browser and Vcs-Svn fields.
+ Enhanced package descriptions.
+ Added monodevelop-debugger-mdb, monodevelop-debugger-gdb and
monodevelop-vala to suggests.
+ Replaced libmono-nunit2.2-cil build-dep with libnunit2.4-cil.
* debian/rules:
+ Implemented get-orig-source target.
* debian/watch:
+ Updated for the unstable releases.
* debian/patches/link_system_mono-nunit.dpatch:
+ Dropped as we link against non-mono nunit again.
* debian/patches/link_system_nunit.dpatch
debian/patches/use_libsvn1.dpatch:
+ Updated.
* debian/patches/bashism.dpatch:
+ Dropped, already applied upstream.
Removed:
packages/monodevelop/trunk/debian/patches/link_system_mono-nunit.dpatch
Modified:
packages/monodevelop/trunk/debian/changelog
packages/monodevelop/trunk/debian/control
packages/monodevelop/trunk/debian/patches/00list
packages/monodevelop/trunk/debian/patches/link_system_nunit.dpatch
packages/monodevelop/trunk/debian/patches/use_csc.dpatch
packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch
packages/monodevelop/trunk/debian/rules
packages/monodevelop/trunk/debian/watch
Modified: packages/monodevelop/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/changelog?rev=4524&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/changelog (original)
+++ packages/monodevelop/trunk/debian/changelog Sun Feb 15 12:16:29 2009
@@ -1,10 +1,33 @@
-monodevelop (1.0+dfsg-5) UNRELEASED; urgency=low
+monodevelop (1.9.2+dfsg-1~pre1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * DFSG version of MonoDevelop 1.9.2
+ (deleted all pre-compiled binaries from the tarball)
+ + For the record here a list of the deleted files:
+ src/addins/NUnit/lib/nunit.framework.dll
+ src/addins/NUnit/lib/nunit.core.dll
+ src/addins/NUnit/lib/nunit.util.dll
+ src/addins/NUnit/lib/nunit.core.interfaces.dll
+ * New upstream release
* debian/control:
+ Added Homepage, Vcs-Browser and Vcs-Svn fields.
-
- -- Mirco Bauer <meebey at debian.org> Tue, 16 Dec 2008 00:49:08 +0100
+ + Enhanced package descriptions.
+ + Added monodevelop-debugger-mdb, monodevelop-debugger-gdb and
+ monodevelop-vala to suggests.
+ + Replaced libmono-nunit2.2-cil build-dep with libnunit2.4-cil.
+ * debian/rules:
+ + Implemented get-orig-source target.
+ * debian/watch:
+ + Updated for the unstable releases.
+ * debian/patches/link_system_mono-nunit.dpatch:
+ + Dropped as we link against non-mono nunit again.
+ * debian/patches/link_system_nunit.dpatch
+ debian/patches/use_libsvn1.dpatch:
+ + Updated.
+ * debian/patches/bashism.dpatch:
+ + Dropped, already applied upstream.
+
+ -- Mirco Bauer <meebey at debian.org> Sat, 14 Feb 2009 18:23:51 +0100
monodevelop (1.0+dfsg-4) experimental; urgency=low
Modified: packages/monodevelop/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/control?rev=4524&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/control (original)
+++ packages/monodevelop/trunk/debian/control Sun Feb 15 12:16:29 2009
@@ -13,11 +13,11 @@
autotools-dev,
gtk-sharp2-gapi (>= 2.8),
libgtk2.0-cil (>= 2.8),
+ libglade2.0-cil (>= 2.8),
libgnome2.0-cil (>= 2.8),
libgconf2.0-cil (>= 2.8),
- libglade2.0-cil (>= 2.8),
libgtksourceview2.0-cil (>= 0.10),
- libmono-nunit2.2-cil,
+ libnunit2.4-cil,
libmono-cairo2.0-cil (>= 1.2),
libmono-winforms2.0-cil,
libmono-system-runtime2.0-cil,
@@ -40,9 +40,12 @@
Architecture: all
Suggests: monodevelop-boo,
monodevelop-java,
+ monodevelop-vala,
monodevelop-nunit,
monodevelop-versioncontrol,
monodevelop-database,
+ monodevelop-debugger-mdb,
+ monodevelop-debugger-gdb,
nemerle,
mono-xsp | mono-xsp2,
mono-1.0-devel
@@ -55,14 +58,19 @@
gnome-icon-theme (>= 1.1.3),
xterm | x-terminal-emulator
Provides: monodoc-viewer
-Description: C/C++/C#/Boo/Java/Nemerle/ILasm/ASP.NET Development Environment
+Description: Development Environment for GNOME
MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET)
languages.
.
- Features: Debugger Integration, Class Browser, Monodoc Integration,
- Code Completion, Embedded HTML viewer, Gettext support, C/C++ project support,
- C# project support, Boo project support, Java project support, Nemerle project
- support, ILAsm project support, ASP.NET project support.
+ It supports the following languages: C, C++, C# (1.0, 2.0 and 3.0), Vala, Boo,
+ Java, Nemerle, ILasm, ASP.NET and VB.NET.
+ .
+ Features: Debugger Integration (Mono Debugger and GNU Debugger),
+ Class Browser, Assembly Browser, Built-in Help, Monodoc Integration,
+ Code Completion (also known as IntelliSense), Code Folding, Color Schemes,
+ Code Refactoring, On-the-fly error underlining, XML Editing, Embedded HTML
+ viewer, Gettext support, GTK# Designer, MSBuild project support and
+ Makefile Generation.
Package: monodevelop-nunit
Architecture: all
Modified: packages/monodevelop/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/00list?rev=4524&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/00list (original)
+++ packages/monodevelop/trunk/debian/patches/00list Sun Feb 15 12:16:29 2009
@@ -1,9 +1,7 @@
-link_system_mono-nunit
-nunit_2.2_backport
+link_system_nunit
use_libsvn1
use_libapr1
#use_x-terminal-emulator
update_templates_for_gtk-sharp_2.10
boo_mimetype
-bashism
use_csc
Modified: packages/monodevelop/trunk/debian/patches/link_system_nunit.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/link_system_nunit.dpatch?rev=4524&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/link_system_nunit.dpatch (original)
+++ packages/monodevelop/trunk/debian/patches/link_system_nunit.dpatch Sun Feb 15 12:16:29 2009
@@ -1,39 +1,49 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## use_nunit2.2.dpatch by Mirco Bauer <meebey at meebey.net>
+## link_system_nunit.dpatch by Mirco Bauer <meebey at meebey.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
-diff -urNad monodevelop-0.18.1+dfsg~/src/addins/NUnit/Makefile.am monodevelop-0.18.1+dfsg/src/addins/NUnit/Makefile.am
---- monodevelop-0.18.1+dfsg~/src/addins/NUnit/Makefile.am 2007-12-25 20:06:18.000000000 +0100
-+++ monodevelop-0.18.1+dfsg/src/addins/NUnit/Makefile.am 2007-12-25 20:06:53.000000000 +0100
-@@ -10,8 +10,8 @@
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
+diff -urNad monodevelop-1.9.2~/src/addins/NUnit/Makefile.am monodevelop-1.9.2/src/addins/NUnit/Makefile.am
+--- monodevelop-1.9.2~/src/addins/NUnit/Makefile.am 2009-02-14 17:17:51.000000000 +0100
++++ monodevelop-1.9.2/src/addins/NUnit/Makefile.am 2009-02-14 17:30:46.000000000 +0100
+@@ -16,10 +16,7 @@
+ $(GLIB_SHARP_LIBS) \
+ $(GTK_SHARP_LIBS) \
+ $(MONO_ADDINS_LIBS) \
- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
+- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.util.dll \
+ $(shell pkg-config --libs nunit) \
-+ $(shell pkg-config --libs nunit) \
+ -r:Mono.Posix \
-r:System \
-r:System.Xml
+@@ -85,16 +82,7 @@
+ templates/NUnitTestClass.xft.xml
-@@ -78,7 +78,7 @@
- SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
- BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
--all: $(ASSEMBLY) $(BUILD_NUNIT_FILES)
-+all: $(ASSEMBLY)
+-NUNIT_FILES = \
+-nunit.core.dll \
+-nunit.framework.dll \
+-nunit.core.interfaces.dll \
+-nunit.util.dll
+-
+-SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
+-BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
+-
+-all: $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
++all: $(ASSEMBLY) $(ASSEMBLY).mdb
$(ADDIN_BUILD)/%: $(srcdir)/lib/%
mkdir -p $(ADDIN_BUILD)
-@@ -90,9 +90,9 @@
-
+@@ -107,9 +95,9 @@
+ $(ASSEMBLY).mdb: $(ASSEMBLY)
assemblydir = $(MD_ADDIN_DIR)/NUnit
--assembly_DATA = $(ASSEMBLY) $(SRC_NUNIT_FILES)
-+assembly_DATA = $(ASSEMBLY)
+-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
++assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
@@ -41,51 +51,46 @@
+EXTRA_DIST = $(FILES) $(RES)
include $(top_srcdir)/Makefile.include
-diff -urNad monodevelop-0.18.1+dfsg~/src/addins/NUnit/Makefile.in monodevelop-0.18.1+dfsg/src/addins/NUnit/Makefile.in
---- monodevelop-0.18.1+dfsg~/src/addins/NUnit/Makefile.in 2007-12-25 20:06:18.000000000 +0100
-+++ monodevelop-0.18.1+dfsg/src/addins/NUnit/Makefile.in 2007-12-25 20:07:34.000000000 +0100
-@@ -249,8 +249,8 @@
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
-- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
-- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
-+ $(shell pkg-config --libs nunit) \
+diff -urNad monodevelop-1.9.2~/src/addins/NUnit/MonoDevelopNUnit.addin.xml monodevelop-1.9.2/src/addins/NUnit/MonoDevelopNUnit.addin.xml
+--- monodevelop-1.9.2~/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2009-02-14 17:17:51.000000000 +0100
++++ monodevelop-1.9.2/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2009-02-14 17:30:46.000000000 +0100
+@@ -10,10 +10,6 @@
+
+ <Runtime>
+ <Import assembly="MonoDevelop.NUnit.dll" />
+- <Import assembly="nunit.core.dll" />
+- <Import assembly="nunit.core.interfaces.dll" />
+- <Import assembly="nunit.framework.dll" />
+- <Import assembly="nunit.util.dll" />
+ </Runtime>
+
+ <Dependencies>
+@@ -67,14 +63,6 @@
+
+ <!-- Extensions -->
+
+- <Extension path="/MonoDevelop/Core/SupportPackages">
+- <Package name="nunit" version="2.4.8.0" clrVersion="Default">
+- <Assembly file="nunit.core.dll" />
+- <Assembly file="nunit.core.interfaces.dll" />
+- <Assembly file="nunit.framework.dll" />
+- </Package>
+- </Extension>
+-
+ <Extension path = "/MonoDevelop/Ide/Pads">
+ <SolutionPad id = "MonoDevelop.NUnit.TestPad" defaultPlacement = "Left" _label = "Unit Tests" icon = "nunit-pad-icon" class = "MonoDevelop.NUnit.TestPad">
+ <PadOption id = "ShowTestTime" _label = "Show Test Time" defaultValue = "False" />
+diff -urNad monodevelop-1.9.2~/src/addins/NUnit/NUnitRunner/Makefile.am monodevelop-1.9.2/src/addins/NUnit/NUnitRunner/Makefile.am
+--- monodevelop-1.9.2~/src/addins/NUnit/NUnitRunner/Makefile.am 2009-02-04 22:47:39.000000000 +0100
++++ monodevelop-1.9.2/src/addins/NUnit/NUnitRunner/Makefile.am 2009-02-14 17:32:39.000000000 +0100
+@@ -1,9 +1,7 @@
+ FILES = NUnitTestRunner.cs
+
+ REFS = \
+- -r:../lib/nunit.core.dll \
+- -r:../lib/nunit.core.interfaces.dll \
+- -r:../lib/nunit.framework.dll \
+ $(shell pkg-config --libs nunit) \
-r:System \
-r:System.Xml
-@@ -316,9 +316,9 @@
- SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
- BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
- assemblydir = $(MD_ADDIN_DIR)/NUnit
--assembly_DATA = $(ASSEMBLY) $(SRC_NUNIT_FILES)
--CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
--EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
-+assembly_DATA = $(ASSEMBLY)
-+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-+EXTRA_DIST = $(FILES) $(RES)
- build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
- build_resources = $(addprefix $(srcdir)/, $(RES))
- build_test_sources = $(addprefix $(srcdir)/, $(TESTFILES)) $(GENERATED_FILES)
-@@ -504,7 +504,7 @@
- pdf-am ps ps-am uninstall uninstall-am uninstall-assemblyDATA
-
-
--all: $(ASSEMBLY) $(BUILD_NUNIT_FILES)
-+all: $(ASSEMBLY)
-
- $(ADDIN_BUILD)/%: $(srcdir)/lib/%
- mkdir -p $(ADDIN_BUILD)
-diff -urNad monodevelop-0.18.1+dfsg~/src/addins/NUnit/MonoDevelopNUnit.addin.xml monodevelop-0.18.1+dfsg/src/addins/NUnit/MonoDevelopNUnit.addin.xml
---- monodevelop-0.18.1+dfsg~/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2007-12-25 20:06:18.000000000 +0100
-+++ monodevelop-0.18.1+dfsg/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2007-12-25 20:06:26.000000000 +0100
-@@ -10,8 +10,6 @@
-
- <Runtime>
- <Import assembly="MonoDevelop.NUnit.dll" />
-- <Import assembly="nunit.core.dll" />
-- <Import assembly="nunit.framework.dll" />
- </Runtime>
-
- <Dependencies>
Modified: packages/monodevelop/trunk/debian/patches/use_csc.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_csc.dpatch?rev=4524&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_csc.dpatch (original)
+++ packages/monodevelop/trunk/debian/patches/use_csc.dpatch Sun Feb 15 12:16:29 2009
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad monodevelop-1.0+dfsg~/contrib/Mono.Cecil/Makefile.am monodevelop-1.0+dfsg/contrib/Mono.Cecil/Makefile.am
---- monodevelop-1.0+dfsg~/contrib/Mono.Cecil/Makefile.am 2008-03-11 03:21:32.000000000 +0100
-+++ monodevelop-1.0+dfsg/contrib/Mono.Cecil/Makefile.am 2008-12-15 22:15:39.000000000 +0100
+diff -urNad monodevelop-1.9.2~/contrib/Mono.Cecil/Makefile.am monodevelop-1.9.2/contrib/Mono.Cecil/Makefile.am
+--- monodevelop-1.9.2~/contrib/Mono.Cecil/Makefile.am 2009-02-04 22:50:58.000000000 +0100
++++ monodevelop-1.9.2/contrib/Mono.Cecil/Makefile.am 2009-02-14 17:44:07.000000000 +0100
@@ -1,4 +1,5 @@
BINDIR=$(top_builddir)/build/bin
+MCS=@CSC@
@@ -32,15 +32,3 @@
$(CECIL_MDB_DEBUG): $(CECIL_MDB)
-diff -urNad monodevelop-1.0+dfsg~/src/addins/MonoDevelop.GtkCore/lib/Makefile.am monodevelop-1.0+dfsg/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
---- monodevelop-1.0+dfsg~/src/addins/MonoDevelop.GtkCore/lib/Makefile.am 2008-03-11 03:19:54.000000000 +0100
-+++ monodevelop-1.0+dfsg/src/addins/MonoDevelop.GtkCore/lib/Makefile.am 2008-12-15 22:15:18.000000000 +0100
-@@ -6,7 +6,7 @@
- libsteticui: $(libsteticui)
-
- ### Common settings ###
--MCS = gmcs
-+MCS = @CSC@
- EXTRACT_VARS = $(top_srcdir)/contrib/extract_makefile_variable.sh
-
-
Modified: packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch?rev=4524&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch (original)
+++ packages/monodevelop/trunk/debian/patches/use_libsvn1.dpatch Sun Feb 15 12:16:29 2009
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad monodevelop-0.18.1+dfsg~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs monodevelop-0.18.1+dfsg/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
---- monodevelop-0.18.1+dfsg~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2007-12-20 20:04:42.000000000 +0100
-+++ monodevelop-0.18.1+dfsg/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2007-12-25 18:54:53.000000000 +0100
+diff -urNad monodevelop-1.9.2~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs monodevelop-1.9.2/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
+--- monodevelop-1.9.2~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2009-02-04 22:47:19.000000000 +0100
++++ monodevelop-1.9.2/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs 2009-02-14 17:39:14.000000000 +0100
@@ -22,10 +22,6 @@
public static LibSvnClient GetLib ()
{
@@ -19,7 +19,7 @@
return new LibSvnClient1 ();
} catch {}
-@@ -501,291 +497,6 @@
+@@ -598,358 +594,6 @@
IntPtr baton, IntPtr pool);
}
@@ -29,6 +29,11 @@
- public override void config_ensure (string config_dir, IntPtr pool)
- {
- svn_config_ensure (config_dir, pool);
+- }
+-
+- public override void config_get_config (ref IntPtr cfg_hash, string config_dir, IntPtr pool)
+- {
+- svn_config_get_config (ref cfg_hash, config_dir, pool);
- }
-
- public override void auth_open (out IntPtr auth_baton, IntPtr providers, IntPtr pool)
@@ -196,6 +201,11 @@
- return svn_client_revert (apr_array_header_t_targets, recursive, ctx, pool);
- }
-
+- public override IntPtr client_resolved (string path, int recursive, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_resolved (path, recursive, ctx, pool);
+- }
+-
- public override IntPtr client_move (ref IntPtr commit_info_p, string srcPath, ref Rev rev,
- string destPath, int force, IntPtr ctx, IntPtr pool)
- {
@@ -223,7 +233,43 @@
- no_diff_deleted, outfile, errfile, ctx, pool);
- }
-
+- public override IntPtr client_merge_peg2 (
+- string source,
+- ref Rev revision1,
+- ref Rev revision2,
+- ref Rev peg_revision,
+- string target_wcpath,
+- bool recurse,
+- bool ignore_ancestry,
+- bool force,
+- bool dry_run,
+- IntPtr merge_options,
+- IntPtr ctx,
+- IntPtr pool)
+- {
+- // svn_boolean_t == int
+- return svn_client_merge_peg2 (source, ref revision1, ref revision2, ref peg_revision, target_wcpath,
+- recurse ? 1: 0, ignore_ancestry ? 1 : 0, force ? 1 : 0, dry_run ? 1 : 0,
+- merge_options, ctx, pool);
+- }
+-
+- public override IntPtr client_lock (IntPtr apr_array_header_t_targets, string comment, int steal_lock, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_lock (apr_array_header_t_targets, comment, steal_lock, ctx, pool);
+- }
+-
+- public override IntPtr client_unlock (IntPtr apr_array_header_t_targets, int break_lock, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_unlock (apr_array_header_t_targets, break_lock, ctx, pool);
+- }
+-
+- public override IntPtr client_prop_get (out IntPtr value, string name, string target, ref Rev revision, int recurse, IntPtr ctx, IntPtr pool)
+- {
+- return svn_client_prop_get (out value, name, target, ref revision, recurse, ctx, pool);
+- }
+-
- [DllImport(svnclientlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool);
+- [DllImport(svnclientlib)] static extern void svn_config_get_config (ref IntPtr cfg_hash, string config_dir, IntPtr pool);
- [DllImport(svnclientlib)] static extern void svn_auth_open (out IntPtr auth_baton, IntPtr providers, IntPtr pool);
- [DllImport(svnclientlib)] static extern void svn_auth_set_parameter (IntPtr auth_baton, string name, IntPtr value);
- [DllImport(svnclientlib)] static extern IntPtr svn_auth_get_parameter (IntPtr auth_baton, string name);
@@ -289,6 +335,8 @@
- [DllImport(svnclientlib)] static extern IntPtr svn_client_revert (IntPtr apr_array_header_t_targets, int recursive,
- IntPtr ctx, IntPtr pool);
-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_resolved (string path, int recursive, IntPtr ctx, IntPtr pool);
+-
- [DllImport(svnclientlib)] static extern IntPtr svn_client_move (ref IntPtr commit_info_p, string srcPath, ref Rev rev,
- string destPath, int force, IntPtr ctx, IntPtr pool);
-
@@ -306,6 +354,25 @@
- IntPtr errfile,
- IntPtr ctx,
- IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_merge_peg2 (string source,
+- ref Rev revision1,
+- ref Rev revision2,
+- ref Rev peg_revision,
+- string target_wcpath,
+- int recurse,
+- int ignore_ancestry,
+- int force,
+- int dry_run,
+- IntPtr merge_options,
+- IntPtr ctx,
+- IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_lock (IntPtr apr_array_header_t_targets, string comment, int steal_lock, IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_unlock (IntPtr apr_array_header_t_targets, int break_lock, IntPtr ctx, IntPtr pool);
+-
+- [DllImport(svnclientlib)] static extern IntPtr svn_client_prop_get (out IntPtr value, string name, string target, ref Rev revision, int recurse, IntPtr ctx, IntPtr pool);
- }
-
public class LibSvnClient1 : LibSvnClient {
Modified: packages/monodevelop/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/rules?rev=4524&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/rules (original)
+++ packages/monodevelop/trunk/debian/rules Sun Feb 15 12:16:29 2009
@@ -1,5 +1,13 @@
#!/usr/bin/make -f
export DH_VERBOSE=1
+
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
+SOURCE_DIR = $(DEBIAN_DIR)/..
+
+DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)
+DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
+VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
include /usr/share/cli-common/cli.make
include /usr/share/dpatch/dpatch.make
@@ -18,7 +26,9 @@
--enable-aspnet \
--enable-gnomeplatform \
--enable-c MCS=/usr/bin/csc CSC=/usr/bin/csc
- dh build --after configure
+ # skip "make test"
+ dh build --before dh_auto_test
+ dh build --after dh_auto_test
touch build-stamp
clean: clean-patched unpatch
@@ -50,5 +60,23 @@
rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/ChangeLogAddIn/
dh $@ --after dh_install
+get-orig-source:
+ uscan \
+ --package $(DEB_SOURCE_NAME) \
+ --watchfile $(DEBIAN_DIR)/watch \
+ --upstream-version $(VERSION) \
+ --download-version $(VERSION) \
+ --destdir . \
+ --force-download \
+ --rename \
+ --repack
+ if [ -d $(DEB_SOURCE_NAME)-$(VERSION) ]; then \
+ echo "$(DEB_SOURCE_NAME)-$(VERSION) is in the way, bailing out!"; \
+ exit 1; \
+ fi
+ tar -xzf $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
+ find $(DEB_SOURCE_NAME)-$(VERSION) -name "*.dll" -delete
+ tar -czf $(DEB_SOURCE_NAME)_$(VERSION)+dfsg.orig.tar.gz $(DEB_SOURCE_NAME)-$(VERSION)
+ rm -rf $(DEB_SOURCE_NAME)-$(VERSION)
%:
dh $@
Modified: packages/monodevelop/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/watch?rev=4524&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/watch (original)
+++ packages/monodevelop/trunk/debian/watch Sun Feb 15 12:16:29 2009
@@ -1,3 +1,3 @@
version=2
opts=dversionmangle=s/\+dfsg// \
- http://www.monodevelop.com/Download .+/monodevelop-([\d\.]+)\.tar\.bz2
+ http://monodevelop.com/Download_-_Unstable .+/monodevelop-([\d\.]+)\.tar\.bz2
More information about the Pkg-cli-apps-commits
mailing list