[Pkg-cli-apps-commits] r4095 - in /packages/monodevelop/trunk/debian: ./ patches/

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sun Aug 10 09:24:19 UTC 2008


Author: meebey
Date: Sun Aug 10 09:24:19 2008
New Revision: 4095

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4095
Log:
  * debian/control: 
    + Removed libxul-dev from build-dependencies, as monodevelop is not using
      it anymore. (Closes: #480797)       
    + Build against libmono-nunit2.2-cil instead of libnunit2.2.6-cil.
    + Added mono-2.0-devel to recommends and mono-1.0-devel to suggests, as
      monodevelop invokes resgen(2) and al(2) when needed for *.resx files.
      (Closes: #485797)
    + Updated debhelper build-dependency to >= 7.
    + Updated cli-common-dev build-dependency to >= 0.5.7
      (needed for cli.make)
  * debian/patches/link_system_mono-nunit.dpatch:
    + Link against mono-nunit instead of bundled nunit.
  * debian/rules:
    + Include /usr/share/cli-common/cli.make
    + Migrated to debhelper v7 minimalistic style.
  * debian/compat:
    + Bumped to 7 


Added:
    packages/monodevelop/trunk/debian/patches/link_system_mono-nunit.dpatch   (with props)
    packages/monodevelop/trunk/debian/patches/link_system_nunit.dpatch
      - copied unchanged from r3851, packages/monodevelop/trunk/debian/patches/link_system_nunit2.2.6.dpatch
    packages/monodevelop/trunk/debian/patches/nunit_2.2_backport.dpatch   (with props)
    packages/monodevelop/trunk/debian/patches/nunit_2.4_port.dpatch   (with props)
Removed:
    packages/monodevelop/trunk/debian/patches/link_system_nunit2.2.6.dpatch
Modified:
    packages/monodevelop/trunk/debian/changelog
    packages/monodevelop/trunk/debian/compat
    packages/monodevelop/trunk/debian/control
    packages/monodevelop/trunk/debian/docs
    packages/monodevelop/trunk/debian/patches/00list
    packages/monodevelop/trunk/debian/rules

Modified: packages/monodevelop/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/changelog?rev=4095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/changelog (original)
+++ packages/monodevelop/trunk/debian/changelog Sun Aug 10 09:24:19 2008
@@ -1,3 +1,25 @@
+monodevelop (1.0+dfsg-3) unstable; urgency=medium
+
+  * debian/control:
+    + Removed libxul-dev from build-dependencies, as monodevelop is not using
+      it anymore. (Closes: #480797)
+    + Build against libmono-nunit2.2-cil instead of libnunit2.2.6-cil.
+    + Added mono-2.0-devel to recommends and mono-1.0-devel to suggests, as
+      monodevelop invokes resgen(2) and al(2) when needed for *.resx files.
+      (Closes: #485797)
+    + Updated debhelper build-dependency to >= 7.
+    + Updated cli-common-dev build-dependency to >= 0.5.7
+      (needed for cli.make)
+  * debian/patches/link_system_mono-nunit.dpatch:
+    + Link against mono-nunit instead of bundled nunit.
+  * debian/rules:
+    + Include /usr/share/cli-common/cli.make
+    + Migrated to debhelper v7 minimalistic style.
+  * debian/compat:
+    + Bumped to 7
+
+ -- Mirco Bauer <meebey at debian.org>  Sat, 09 Aug 2008 20:31:49 +0200
+
 monodevelop (1.0+dfsg-2) unstable; urgency=low
 
   * Rebuild against libgtksourceview2.0-cil 0.12-1

Modified: packages/monodevelop/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/compat?rev=4095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/compat (original)
+++ packages/monodevelop/trunk/debian/compat Sun Aug 10 09:24:19 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/monodevelop/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/control?rev=4095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/control (original)
+++ packages/monodevelop/trunk/debian/control Sun Aug 10 09:24:19 2008
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.5.4),
+Build-Depends: debhelper (>= 7), dpatch
+Build-Depends-Indep: cli-common-dev (>= 0.5.7),
  mono-gmcs (>= 1.1.10) | c-sharp-2.0-compiler,
  libmono-dev (>= 1.1.10),
  monodoc-base (>= 1.1.9),
@@ -14,7 +14,7 @@
  libgconf2.0-cil (>= 2.8),
  libglade2.0-cil (>= 2.8),
  libgtksourceview2.0-cil (>= 0.10),
- libnunit2.2.6-cil,
+ libmono-nunit2.2-cil,
  libmono-cairo2.0-cil (>= 1.2),
  libmono-winforms2.0-cil,
  libmono-system-runtime2.0-cil,
@@ -25,7 +25,6 @@
  libsvn-dev,
  libapr1-dev,
  libgtkspell-dev,
- libxul-dev,
  mono-xsp-base,
  mono-xsp2-base,
  desktop-file-utils
@@ -33,9 +32,25 @@
 
 Package: monodevelop
 Architecture: all
-Suggests: monodevelop-boo, monodevelop-java, monodevelop-nunit, monodevelop-versioncontrol, monodevelop-database, nemerle, mono-xsp, mono-xsp2, mono-mcs
-Recommends: mono-gmcs
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libxul0d, monodoc-manual (>= 1.1.9), pkg-config, gnome-icon-theme (>= 1.1.3), xterm | x-terminal-emulator
+Suggests: monodevelop-boo,
+ monodevelop-java,
+ monodevelop-nunit,
+ monodevelop-versioncontrol,
+ monodevelop-database,
+ nemerle,
+ mono-xsp,
+ mono-xsp2,
+ mono-mcs,
+ mono-1.0-devel
+Recommends: mono-gmcs,
+ mono-2.0-devel
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${cli:Depends},
+ monodoc-manual (>= 1.1.9),
+ pkg-config,
+ 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
  MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET)
@@ -48,7 +63,10 @@
 
 Package: monodevelop-nunit
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${source:Version})
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${cli:Depends},
+ monodevelop (= ${source:Version})
 Description: NUnit plugin for MonoDevelop
  MonoDevelop is a GNOME IDE primarily designed for C# and other CLI (.NET)
  languages.
@@ -58,7 +76,10 @@
 Package: monodevelop-versioncontrol
 Architecture: all
 Replaces: monodevelop (<< 0.13.1)
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, monodevelop (= ${source:Version})
+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 CLI (.NET)
  languages.

Modified: packages/monodevelop/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/docs?rev=4095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/docs (original)
+++ packages/monodevelop/trunk/debian/docs Sun Aug 10 09:24:19 2008
@@ -1,2 +1,1 @@
 README
-changelog

Modified: packages/monodevelop/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/00list?rev=4095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/00list (original)
+++ packages/monodevelop/trunk/debian/patches/00list Sun Aug 10 09:24:19 2008
@@ -1,4 +1,7 @@
-link_system_nunit2.2.6
+#link_system_nunit
+#nunit_2.4_port
+link_system_mono-nunit
+nunit_2.2_backport
 use_libsvn1
 use_libapr1
 #use_x-terminal-emulator

Added: packages/monodevelop/trunk/debian/patches/link_system_mono-nunit.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/link_system_mono-nunit.dpatch?rev=4095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/link_system_mono-nunit.dpatch (added)
+++ packages/monodevelop/trunk/debian/patches/link_system_mono-nunit.dpatch Sun Aug 10 09:24:19 2008
@@ -1,0 +1,91 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_nunit2.2.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.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 \
+-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
+-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
++	$(shell pkg-config --libs mono-nunit) \
++	$(shell pkg-config --libs mono-nunit) \
+ 	-r:System \
+ 	-r:System.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)
+ 
+ $(ADDIN_BUILD)/%: $(srcdir)/lib/%
+ 	mkdir -p $(ADDIN_BUILD)
+@@ -90,9 +90,9 @@
+ 
+ 
+ assemblydir = $(MD_ADDIN_DIR)/NUnit
+-assembly_DATA = $(ASSEMBLY) $(SRC_NUNIT_FILES)
++assembly_DATA = $(ASSEMBLY)
+ 
+-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
+-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
++CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
++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 mono-nunit) \
++	$(shell pkg-config --libs mono-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>

Propchange: packages/monodevelop/trunk/debian/patches/link_system_mono-nunit.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/monodevelop/trunk/debian/patches/nunit_2.2_backport.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/nunit_2.2_backport.dpatch?rev=4095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/nunit_2.2_backport.dpatch (added)
+++ packages/monodevelop/trunk/debian/patches/nunit_2.2_backport.dpatch Sun Aug 10 09:24:19 2008
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## nunit_2.2_backport.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-1.0+dfsg~/src/addins/NUnit/Services/ExternalTestRunner.cs monodevelop-1.0+dfsg/src/addins/NUnit/Services/ExternalTestRunner.cs
+--- monodevelop-1.0+dfsg~/src/addins/NUnit/Services/ExternalTestRunner.cs	2008-03-11 03:20:12.000000000 +0100
++++ monodevelop-1.0+dfsg/src/addins/NUnit/Services/ExternalTestRunner.cs	2008-08-09 20:46:01.000000000 +0200
+@@ -262,11 +262,6 @@
+ 			context.Monitor.EndTest (t, res);
+ 		}
+ 		
+-		public void TestOutput (TestOutput testOutput)
+-		{
+-		}
+-
+-
+ 		UnitTest GetLocalTest (Test t)
+ 		{
+ 			if (t == null) return null;

Propchange: packages/monodevelop/trunk/debian/patches/nunit_2.2_backport.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/monodevelop/trunk/debian/patches/nunit_2.4_port.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/nunit_2.4_port.dpatch?rev=4095&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/nunit_2.4_port.dpatch (added)
+++ packages/monodevelop/trunk/debian/patches/nunit_2.4_port.dpatch Sun Aug 10 09:24:19 2008
@@ -1,0 +1,141 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## nunit_2.4_port.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-1.0+dfsg~/src/addins/NUnit/Services/ExternalTestRunner.cs monodevelop-1.0+dfsg/src/addins/NUnit/Services/ExternalTestRunner.cs
+--- monodevelop-1.0+dfsg~/src/addins/NUnit/Services/ExternalTestRunner.cs	2008-06-28 15:03:19.000000000 +0200
++++ monodevelop-1.0+dfsg/src/addins/NUnit/Services/ExternalTestRunner.cs	2008-06-28 15:03:19.000000000 +0200
+@@ -36,6 +36,7 @@
+ using MonoDevelop.Core;
+ using MonoDevelop.Core.Execution;
+ using NUnit.Core;
++using NUnit.Core.Filters;
+ using NF = NUnit.Framework;
+ 
+ namespace MonoDevelop.NUnit
+@@ -47,7 +48,7 @@
+ 		StringWriter stdout = new StringWriter ();
+ 		StringWriter stderr = new StringWriter ();
+ 		
+-		public TestResult Run (EventListener listener, IFilter filter, string path, string suiteName)
++		public TestResult Run (EventListener listener, ITestFilter filter, string path, string suiteName)
+ 		{
+ 			TestSuite rootTS = LoadTestSuite (path, suiteName);
+ 			if (rootTS == null)
+@@ -180,11 +181,11 @@
+ 			get { return runningTest; }
+ 		}
+ 		
+-		void EventListener.RunStarted (Test [] tests)
++		void EventListener.RunStarted (string name, int testCount)
+ 		{
+ 		}
+ 
+-		void EventListener.RunFinished (TestResult [] results)
++		void EventListener.RunFinished (TestResult result)
+ 		{
+ 		}
+ 
+@@ -196,12 +197,12 @@
+ 		{
+ 		}
+ 
+-		void EventListener.TestStarted (TestCase testCase)
++		void EventListener.TestStarted (TestName testName)
+ 		{
+ 			if (singleTestRun)
+ 				return;
+ 			
+-			UnitTest t = GetLocalTest (testCase);
++			UnitTest t = GetLocalTest (testName);
+ 			if (t == null)
+ 				return;
+ 			
+@@ -234,12 +235,12 @@
+ 			runningTest = null;
+ 		}
+ 
+-		void EventListener.SuiteStarted (TestSuite suite)
++		void EventListener.SuiteStarted (TestName testName)
+ 		{
+ 			if (singleTestRun)
+ 				return;
+ 			
+-			UnitTest t = GetLocalTest (suite);
++			UnitTest t = GetLocalTest (testName);
+ 			if (t == null)
+ 				return;
+ 			
+diff -urNad monodevelop-1.0+dfsg~/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs monodevelop-1.0+dfsg/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
+--- monodevelop-1.0+dfsg~/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs	2008-06-28 15:03:19.000000000 +0200
++++ monodevelop-1.0+dfsg/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs	2008-06-28 15:03:19.000000000 +0200
+@@ -37,6 +37,7 @@
+ using MonoDevelop.Projects;
+ using MonoDevelop.Core;
+ using NUnit.Core;
++using NUnit.Core.Filters;
+ 
+ namespace MonoDevelop.NUnit
+ {
+@@ -257,7 +258,7 @@
+ 			ExternalTestRunner runner = (ExternalTestRunner) Runtime.ProcessService.CreateExternalProcessObject (typeof(ExternalTestRunner), false);
+ 			LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, runner, test, suiteName, testName != null);
+ 			
+-			IFilter filter = null;
++			ITestFilter filter = null;
+ 			
+ 			if (testName != null) {
+ 				filter = new TestNameFilter (testName);
+@@ -266,7 +267,10 @@
+ 				if (categoryOptions.EnableFilter && categoryOptions.Categories.Count > 0) {
+ 					string[] cats = new string [categoryOptions.Categories.Count];
+ 					categoryOptions.Categories.CopyTo (cats, 0);
+-					filter = new CategoryFilter (cats, categoryOptions.Exclude);
++					filter = new CategoryFilter (cats);
++					if (categoryOptions.Exclude) {
++						filter = new NotFilter (filter);
++					}
+ 				}
+ 			}
+ 			
+@@ -413,28 +417,32 @@
+ 		}
+ 		
+ 		[Serializable]
+-		public class TestNameFilter: IFilter
++		public class TestNameFilter: ITestFilter
+ 		{
+ 			string name;
+ 			
++			public bool IsEmpty {
++				get { return false; }
++			}
++
+ 			public TestNameFilter (string name)
+ 			{
+ 				this.name = name;
+ 			}
+ 			
+-			public bool Pass (TestSuite suite)
++			public bool Pass (ITest test)
+ 			{
+ 				return true;
+ 			}
+ 			
+-			public bool Pass (TestCase test)
++			public bool Pass (TestName test)
+ 			{
+ 				return test.Name == name;
+ 			}
+ 
+-			public bool Exclude
++			public bool Match(ITest test)
+ 			{
+-				get { return false; }
++				return true;
+ 			}
+ 		}
+ 	}

Propchange: packages/monodevelop/trunk/debian/patches/nunit_2.4_port.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/monodevelop/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/rules?rev=4095&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/rules (original)
+++ packages/monodevelop/trunk/debian/rules Sun Aug 10 09:24:19 2008
@@ -1,83 +1,49 @@
 #!/usr/bin/make -f
+export DH_VERBOSE=1
 
-#export DH_VERBOSE=1
-export MONO_SHARED_DIR=$(CURDIR)
-
+include /usr/share/cli-common/cli.make
 include /usr/share/dpatch/dpatch.make
 
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	./configure --prefix=/usr \
-	  --mandir=\$${prefix}/share/man \
-	  --infodir=\$${prefix}/share/info \
-	  --disable-update-mimedb --disable-update-desktopdb \
+build: build-stamp
+build-stamp: patch-stamp
+	dh build --before configure
+	dh_auto_configure -- \
+	  --disable-update-mimedb \
+	  --disable-update-desktopdb \
 	  --disable-monoextensions \
 	  --enable-versioncontrol --enable-subversion \
-	  --enable-aspnet --enable-gnomeplatform --enable-c
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) RUNTIME=/usr/bin/cli
+	  --enable-aspnet \
+	  --enable-gnomeplatform \
+	  --enable-c
+	dh build --after configure
 	touch build-stamp
 
 clean: clean-patched unpatch
 clean-patched:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -rf $(CURDIR)/.wapi
-	rm -f $(CURDIR)/changelog
-	rm -f configure-stamp build-stamp
-	dh_clean 
+	dh clean
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh $@ --before dh_install
 	# install missing DLL maps
 	cp debian/MonoDevelop.SourceEditor.dll.config debian/tmp/usr/lib/monodevelop/AddIns/
 	cp debian/MonoDevelop.Gettext.dll.config debian/tmp/usr/lib/monodevelop/AddIns/MonoDevelop.Gettext/
 	# fix permissions of .mo files
-	find $(CURDIR)/debian/tmp/usr/share/locale -name "*.mo" -exec chmod -x {} \;
+	cd $(CURDIR)/debian/tmp/usr/share/locale && find -name "*.mo" -exec chmod -x {} \;
+	dh $@ --remaining
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_link -i
-	dh_install -i
-	# remove nunit files (shipped in monodevelop-nunit)
-	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/
-	cp $(CURDIR)/ChangeLog $(CURDIR)/changelog
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installmenu -i
-	dh_installman -i
-	dh_installmime -i
-	dh_desktop -i
-	dh_strip -i
-	dh_clistrip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_clifixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_clideps -i -d
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+binary: binary-arch binary-indep
 
 binary-arch:
 
-binary: binary-arch binary-indep
+binary-indep: build install
+	dh $@ --until dh_install
+	# remove nunit files (shipped in monodevelop-nunit)
+	rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/NUnit/
+	# remove versioncontrol files (shipped in monodevelop-versioncontrol)
+	rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/VersionControl/
+	# remove ChangeLogAddIn files (shipped in monodevelop-versioncontrol)
+	rm -rf debian/monodevelop/usr/lib/monodevelop/AddIns/ChangeLogAddIn/
+	dh $@ --after dh_install
 
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+%:
+	dh $@




More information about the Pkg-cli-apps-commits mailing list