[Pkg-cli-libs-commits] r3966 - in /packages/mono-addins/trunk/debian: ./ patches/
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Sun Feb 1 17:43:17 UTC 2009
Author: meebey
Date: Sun Feb 1 17:43:17 2009
New Revision: 3966
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3966
Log:
[ Mirco Bauer ]
* New upstream release
* debian/rules:
+ Bumped clilibs to >= 0.4.
* debian/patches/fix_addin_scan.patch:
+ Removed, already applied upstream.
* debian/control
debian/rules
debian/patches/*.dpatch
debian/patches/*.dpatch:
+ Switched from dpatch to quilt.
* debian/control
debian/rules:
+ Replaced mono-gac, mono-mcs and mono-1.0-devel with mono-devel for the
Mono 2.0 transition.
+ Pass MCS variable to configure call.
+ Added libmono-cairo2.0-cil to build-deps as required by Mono bug #425194.
* debian/control
debian/rules
debian/patches/99_autoreconf.dpatch:
+ Replaced 99_autoreconf patch with autofoo commands.
* debian/control:
+ Bumped Standards-Version to 3.8.0 (no changes needed)
Added:
packages/mono-addins/trunk/debian/patches/configurable_compiler.patch
packages/mono-addins/trunk/debian/patches/fix_addin_scan.patch (with props)
packages/mono-addins/trunk/debian/patches/fix_configure.ac.patch (with props)
packages/mono-addins/trunk/debian/patches/fix_gac_policy_filenames.patch (with props)
packages/mono-addins/trunk/debian/patches/fix_mono-addins-gui.pc.patch (with props)
packages/mono-addins/trunk/debian/patches/fix_mono-addins-setup.pc.patch (with props)
packages/mono-addins/trunk/debian/patches/fix_mono-addins.pc.patch (with props)
packages/mono-addins/trunk/debian/patches/series
Removed:
packages/mono-addins/trunk/debian/patches/00list
packages/mono-addins/trunk/debian/patches/99_autoreconf.dpatch
packages/mono-addins/trunk/debian/patches/fix_addin_scan.dpatch
packages/mono-addins/trunk/debian/patches/fix_configure.ac.dpatch
packages/mono-addins/trunk/debian/patches/fix_gac_policy_filenames.dpatch
packages/mono-addins/trunk/debian/patches/fix_mono-addins-gui.pc.dpatch
packages/mono-addins/trunk/debian/patches/fix_mono-addins-setup.pc.dpatch
packages/mono-addins/trunk/debian/patches/fix_mono-addins.pc.dpatch
packages/mono-addins/trunk/debian/patches/fix_version.dpatch
packages/mono-addins/trunk/debian/patches/use_real_nunit.dpatch
Modified:
packages/mono-addins/trunk/debian/changelog
packages/mono-addins/trunk/debian/control
packages/mono-addins/trunk/debian/rules
Modified: packages/mono-addins/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/changelog?rev=3966&op=diff
==============================================================================
--- packages/mono-addins/trunk/debian/changelog (original)
+++ packages/mono-addins/trunk/debian/changelog Sun Feb 1 17:43:17 2009
@@ -1,18 +1,34 @@
-mono-addins (0.3.1-6) UNRELEASED; urgency=low
+mono-addins (0.4-1) experimental; urgency=low
+
+ [ Mirco Bauer ]
+ * New upstream release
+ * debian/rules:
+ + Bumped clilibs to >= 0.4.
+ * debian/patches/fix_addin_scan.patch:
+ + Removed, already applied upstream.
+ * debian/control
+ debian/rules
+ debian/patches/*.dpatch
+ debian/patches/*.dpatch:
+ + Switched from dpatch to quilt.
+ * debian/control
+ debian/rules:
+ + Replaced mono-gac, mono-mcs and mono-1.0-devel with mono-devel for the
+ Mono 2.0 transition.
+ + Pass MCS variable to configure call.
+ + Added libmono-cairo2.0-cil to build-deps as required by Mono bug #425194.
+ * debian/control
+ debian/rules
+ debian/patches/99_autoreconf.dpatch:
+ + Replaced 99_autoreconf patch with autofoo commands.
+ * debian/control:
+ + Bumped Standards-Version to 3.8.0 (no changes needed)
[ Tim Retout ]
* debian/mautil.1, debian/libmono-addins0.2-cil.manpages:
+ Add a manual page for mautil. (Closes: #480403)
- [ Steve Langasek ]
- * debian/rules: pass MCS=/usr/bin/csc to configure, for the mono 2.0
- transition.
- * debian/control: update build-dependencies for mono 2.0.
- * debian/patches/fix_build-system.dpatch: fix the Makefile.am's to use
- @MCS@ instead of hard-coding 'mcs'!
- * debian/patches/99_autoreconf.dpatch: refresh.
-
- -- Tim Retout <tim at retout.co.uk> Fri, 09 May 2008 19:37:49 +0100
+ -- Mirco Bauer <meebey at debian.org> Sun, 01 Feb 2009 18:23:53 +0100
mono-addins (0.3.1-5) unstable; urgency=medium
Modified: packages/mono-addins/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/control?rev=3966&op=diff
==============================================================================
--- packages/mono-addins/trunk/debian/control (original)
+++ packages/mono-addins/trunk/debian/control Sun Feb 1 17:43:17 2009
@@ -3,17 +3,21 @@
Priority: optional
Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>, Tim Retout <tim at retout.co.uk>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 5), quilt
Build-Depends-Indep: cli-common-dev (>= 0.5.4),
+ libtool,
+ autoconf,
+ automake,
+ autotools-dev
pkg-config,
- mono-devel (>= 2.0.1),
- automake,
+ mono-devel (>= 2.0),
libmono-dev,
libglib2.0-cil,
libgtk2.0-cil,
libgnome2.0-cil,
- libmono2.0-cil
-Standards-Version: 3.7.3
+ libmono2.0-cil,
+ libmono-cairo2.0-cil
+Standards-Version: 3.8.0
Homepage: http://www.mono-project.com/Mono.Addins
Vcs-Svn: svn://svn.debian.org/pkg-cli-libs/packages/mono-addins/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/
Added: packages/mono-addins/trunk/debian/patches/configurable_compiler.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/configurable_compiler.patch?rev=3966&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/configurable_compiler.patch (added)
+++ packages/mono-addins/trunk/debian/patches/configurable_compiler.patch Sun Feb 1 17:43:17 2009
@@ -1,0 +1,164 @@
+--- mono-addins-0.4.orig/Mono.Addins.CecilReflector/Makefile.am
++++ mono-addins-0.4/Mono.Addins.CecilReflector/Makefile.am
+@@ -1,6 +1,6 @@
+
+ KEY_FILE=$(top_srcdir)/mono-addins.snk
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/Mono.Addins.CecilReflector.dll
+ ASSEMBLY_NAME=Mono.Addins.CecilReflector
+--- mono-addins-0.4.orig/Mono.Addins.Gui/Makefile.am
++++ mono-addins-0.4/Mono.Addins.Gui/Makefile.am
+@@ -1,6 +1,6 @@
+
+ KEY_FILE=$(top_srcdir)/mono-addins.snk
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/Mono.Addins.Gui.dll
+ ASSEMBLY_NAME=Mono.Addins.Gui
+--- mono-addins-0.4.orig/Mono.Addins.Setup/Makefile.am
++++ mono-addins-0.4/Mono.Addins.Setup/Makefile.am
+@@ -1,6 +1,6 @@
+
+ KEY_FILE=$(top_srcdir)/mono-addins.snk
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/Mono.Addins.Setup.dll
+ ASSEMBLY_NAME=Mono.Addins.Setup
+--- mono-addins-0.4.orig/Mono.Addins/Makefile.am
++++ mono-addins-0.4/Mono.Addins/Makefile.am
+@@ -1,6 +1,6 @@
+
+ KEY_FILE=$(top_srcdir)/mono-addins.snk
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG "-main:Mono.Addins.Database.SetupProcess"
+ ASSEMBLY = ../bin/Mono.Addins.dll
+ ASSEMBLY_NAME=Mono.Addins
+--- mono-addins-0.4.orig/Samples/TextEditor.CompilerService.CSharp/Makefile.am
++++ mono-addins-0.4/Samples/TextEditor.CompilerService.CSharp/Makefile.am
+@@ -1,5 +1,5 @@
+
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/TextEditor.CompilerService.CSharp.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Samples/TextEditor.CompilerService/Makefile.am
++++ mono-addins-0.4/Samples/TextEditor.CompilerService/Makefile.am
+@@ -1,5 +1,5 @@
+
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/TextEditor.CompilerService.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Samples/TextEditor.Xml/Makefile.am
++++ mono-addins-0.4/Samples/TextEditor.Xml/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/XmlAddin.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Samples/TextEditor/Makefile.am
++++ mono-addins-0.4/Samples/TextEditor/Makefile.am
+@@ -1,5 +1,5 @@
+
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/TextEditor.exe
+ COMPILE_TARGET = exe
+--- mono-addins-0.4.orig/Samples/TextEditorLib/Makefile.am
++++ mono-addins-0.4/Samples/TextEditorLib/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/TextEditorLib.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Samples/WriterService.SampleExtender/Makefile.am
++++ mono-addins-0.4/Samples/WriterService.SampleExtender/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/SampleExtender.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Samples/WriterService/Makefile.am
++++ mono-addins-0.4/Samples/WriterService/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/WriterService.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Samples/WriterServiceHost/Makefile.am
++++ mono-addins-0.4/Samples/WriterServiceHost/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/SampleAddinHost.exe
+ COMPILE_TARGET = exe
+--- mono-addins-0.4.orig/Test/CommandExtension/Makefile.am
++++ mono-addins-0.4/Test/CommandExtension/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/CommandExtension.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Test/FileContentExtension/Makefile.am
++++ mono-addins-0.4/Test/FileContentExtension/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/FileContentExtension.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Test/FileExtender/Makefile.am
++++ mono-addins-0.4/Test/FileExtender/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/extras/FileExtender.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Test/HelloWorldExtension/Makefile.am
++++ mono-addins-0.4/Test/HelloWorldExtension/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/HelloWorldExtension.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Test/SystemInfoExtension/Makefile.am
++++ mono-addins-0.4/Test/SystemInfoExtension/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../lib/SystemInfoExtension.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/Test/UnitTests/Makefile.am
++++ mono-addins-0.4/Test/UnitTests/Makefile.am
+@@ -1,4 +1,4 @@
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ./bin/Debug/UnitTests.dll
+ COMPILE_TARGET = library
+--- mono-addins-0.4.orig/mautil/Makefile.am
++++ mono-addins-0.4/mautil/Makefile.am
+@@ -1,5 +1,5 @@
+
+-ASSEMBLY_COMPILER_COMMAND = mcs
++ASSEMBLY_COMPILER_COMMAND = @MCS@
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+ ASSEMBLY = ../bin/mautil.exe
+ COMPILE_TARGET = exe
Added: packages/mono-addins/trunk/debian/patches/fix_addin_scan.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/fix_addin_scan.patch?rev=3966&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/fix_addin_scan.patch (added)
+++ packages/mono-addins/trunk/debian/patches/fix_addin_scan.patch Sun Feb 1 17:43:17 2009
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_addin_scan.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix from upstream SVN r95443 for addin scan issue. Closes: #459649
+
+ at DPATCH@
+diff -urNad mono-addins~/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
+--- mono-addins~/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs 2008-01-30 22:37:53.000000000 +0000
++++ mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs 2008-03-20 16:46:40.000000000 +0000
+@@ -512,6 +512,8 @@
+ string dir = Path.GetDirectoryName (mp);
+ string pat = Path.GetFileName (mp);
+ foreach (string fmp in fileDatabase.GetDirectoryFiles (dir, pat)) {
++ if (files.Contains (fmp))
++ continue;
+ files.Add (fmp);
+ string an = Path.GetFileNameWithoutExtension (fmp);
+ changedAddins [an] = an;
Propchange: packages/mono-addins/trunk/debian/patches/fix_addin_scan.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/mono-addins/trunk/debian/patches/fix_configure.ac.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/fix_configure.ac.patch?rev=3966&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/fix_configure.ac.patch (added)
+++ packages/mono-addins/trunk/debian/patches/fix_configure.ac.patch Sun Feb 1 17:43:17 2009
@@ -1,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_configure.ac.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- mono-addins-0.4.orig/configure.ac
++++ mono-addins-0.4/configure.ac
+@@ -72,34 +72,33 @@
+ AC_SUBST(MONO_ADDINS_SETUP_DEFAULT_LIB)
+
+ AC_CONFIG_FILES([
+-./Mono.Addins/mono-addins.pc
+-./Mono.Addins.Gui/mono-addins-gui.pc
+-./Mono.Addins.Setup/mono-addins-setup.pc
+-./Makefile
+-./policy.config
+-./Mono.Addins.Gui/Makefile
+-./Mono.Addins.Setup/Makefile
+-./Mono.Addins/Makefile
+-./Mono.Addins.CecilReflector/Makefile
+-./mautil/Makefile
+-./mautil/mautil
+-./Test/HelloWorldExtension/Makefile
+-./Test/FileContentExtension/Makefile
+-./Test/UnitTests/Makefile
+-./Test/CommandExtension/Makefile
+-./Test/SystemInfoExtension/Makefile
+-./Test/FileExtender/Makefile
+-./Test/Makefile
+-./Samples/TextEditor.Xml/Makefile
+-./Samples/TextEditor/Makefile
+-./Samples/TextEditor.CompilerService/Makefile
+-./Samples/WriterServiceHost/Makefile
+-./Samples/TextEditor.CompilerService.CSharp/Makefile
+-./Samples/WriterService.SampleExtender/Makefile
+-./Samples/Makefile
+-./Samples/TextEditorLib/Makefile
+-./Samples/WriterService/Makefile
+-
++Mono.Addins/mono-addins.pc
++Mono.Addins.Gui/mono-addins-gui.pc
++Mono.Addins.Setup/mono-addins-setup.pc
++Makefile
++policy.config
++Mono.Addins.Gui/Makefile
++Mono.Addins.Setup/Makefile
++Mono.Addins/Makefile
++Mono.Addins.CecilReflector/Makefile
++mautil/Makefile
++mautil/mautil
++Test/HelloWorldExtension/Makefile
++Test/FileContentExtension/Makefile
++Test/UnitTests/Makefile
++Test/CommandExtension/Makefile
++Test/SystemInfoExtension/Makefile
++Test/FileExtender/Makefile
++Test/Makefile
++Samples/TextEditor.Xml/Makefile
++Samples/TextEditor/Makefile
++Samples/TextEditor.CompilerService/Makefile
++Samples/WriterServiceHost/Makefile
++Samples/TextEditor.CompilerService.CSharp/Makefile
++Samples/WriterService.SampleExtender/Makefile
++Samples/Makefile
++Samples/TextEditorLib/Makefile
++Samples/WriterService/Makefile
+ ])
+
+ AC_OUTPUT
Propchange: packages/mono-addins/trunk/debian/patches/fix_configure.ac.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/mono-addins/trunk/debian/patches/fix_gac_policy_filenames.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/fix_gac_policy_filenames.patch?rev=3966&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/fix_gac_policy_filenames.patch (added)
+++ packages/mono-addins/trunk/debian/patches/fix_gac_policy_filenames.patch Sun Feb 1 17:43:17 2009
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_gac_policy_filenames.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- mono-addins-0.4.orig/Makefile.include
++++ mono-addins-0.4/Makefile.include
+@@ -20,8 +20,8 @@
+ $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config $(top_srcdir)/mono-addins.snk
+ @for i in $(POLICY_VERSIONS); do \
+ echo "Creating policy.$$i.$(ASSEMBLY_NAME)"; \
+- sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config; \
+- $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY_NAME).dll -keyfile:$(top_srcdir)/mono-addins.snk; \
++ sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.$(ASSEMBLY_NAME).config; \
++ $(AL) -link:policy.$$i.$(ASSEMBLY_NAME).config -out:policy.$$i.$(ASSEMBLY_NAME).dll -keyfile:$(top_srcdir)/mono-addins.snk; \
+ done
+
+ gac-install: $(POLICY_ASSEMBLIES)
Propchange: packages/mono-addins/trunk/debian/patches/fix_gac_policy_filenames.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/mono-addins/trunk/debian/patches/fix_mono-addins-gui.pc.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/fix_mono-addins-gui.pc.patch?rev=3966&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/fix_mono-addins-gui.pc.patch (added)
+++ packages/mono-addins/trunk/debian/patches/fix_mono-addins-gui.pc.patch Sun Feb 1 17:43:17 2009
@@ -1,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_mono-addins-gui.pc.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 mono-addins-0.3~/Mono.Addins.Gui/mono-addins-gui.pc.in mono-addins-0.3/Mono.Addins.Gui/mono-addins-gui.pc.in
+--- mono-addins-0.3~/Mono.Addins.Gui/mono-addins-gui.pc.in 2007-12-18 20:16:23.000000000 +0100
++++ mono-addins-0.3/Mono.Addins.Gui/mono-addins-gui.pc.in 2007-12-30 14:54:19.000000000 +0100
+@@ -1,11 +1,10 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-pkglibdir=@libdir@/mono/@PACKAGE@
+-Libraries= ${pkglibdir}/@MONO_ADDINS_GUI_DEFAULT_LIB@
++pkglibdir=@libdir@/cli/@PACKAGE at -#PACKAGE_ABI_VERSION#
+
+ Name: Mono.Addins.Gui
+ Description:
+ Version: @VERSION@
+
+-Requires: mono-addins
+-Libs: -r:${pkglibdir}/@MONO_ADDINS_GUI_DEFAULT_LIB@
+\ No newline at end of file
++Requires: gnome-sharp-2.0 gtk-sharp-2.0 glade-sharp-2.0 mono-addins
++Libs: -r:${pkglibdir}/@MONO_ADDINS_GUI_DEFAULT_LIB@
+\ No newline at end of file
Propchange: packages/mono-addins/trunk/debian/patches/fix_mono-addins-gui.pc.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/mono-addins/trunk/debian/patches/fix_mono-addins-setup.pc.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/fix_mono-addins-setup.pc.patch?rev=3966&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/fix_mono-addins-setup.pc.patch (added)
+++ packages/mono-addins/trunk/debian/patches/fix_mono-addins-setup.pc.patch Sun Feb 1 17:43:17 2009
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_mono-addins-setup.pc.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 mono-addins-0.3~/Mono.Addins.Setup/mono-addins-setup.pc.in mono-addins-0.3/Mono.Addins.Setup/mono-addins-setup.pc.in
+--- mono-addins-0.3~/Mono.Addins.Setup/mono-addins-setup.pc.in 2007-12-18 20:16:25.000000000 +0100
++++ mono-addins-0.3/Mono.Addins.Setup/mono-addins-setup.pc.in 2007-12-30 14:55:04.000000000 +0100
+@@ -1,11 +1,10 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-pkglibdir=@libdir@/mono/@PACKAGE@
+-Libraries= ${pkglibdir}/@MONO_ADDINS_SETUP_DEFAULT_LIB@
++pkglibdir=@libdir@/cli/@PACKAGE at -#PACKAGE_ABI_VERSION#
+
+ Name: Mono.Addins.Setup
+ Description:
+ Version: @VERSION@
+
+-Requires: mono-addins
+-Libs: -r:${pkglibdir}/@MONO_ADDINS_SETUP_DEFAULT_LIB@
++Requires: mono-addins
++Libs: -r:${pkglibdir}/@MONO_ADDINS_SETUP_DEFAULT_LIB@
Propchange: packages/mono-addins/trunk/debian/patches/fix_mono-addins-setup.pc.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/mono-addins/trunk/debian/patches/fix_mono-addins.pc.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/fix_mono-addins.pc.patch?rev=3966&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/fix_mono-addins.pc.patch (added)
+++ packages/mono-addins/trunk/debian/patches/fix_mono-addins.pc.patch Sun Feb 1 17:43:17 2009
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_mono-addins-gui.pc.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 mono-addins-0.3~/Mono.Addins/mono-addins.pc.in mono-addins-0.3/Mono.Addins/mono-addins.pc.in
+--- mono-addins-0.3~/Mono.Addins/mono-addins.pc.in 2007-12-30 14:44:58.000000000 +0100
++++ mono-addins-0.3/Mono.Addins/mono-addins.pc.in 2007-12-30 14:52:37.000000000 +0100
+@@ -1,11 +1,9 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-pkglibdir=@libdir@/mono/@PACKAGE@
+-Libraries= ${pkglibdir}/@MONO_ADDINS_DEFAULT_LIB@
++pkglibdir=@libdir@/cli/@PACKAGE at -#PACKAGE_ABI_VERSION#
+
+ Name: Mono.Addins
+ Description:
+ Version: @VERSION@
+
+-Requires:
+-Libs: -r:${pkglibdir}/@MONO_ADDINS_DEFAULT_LIB@
+\ No newline at end of file
++Libs: -r:${pkglibdir}/@MONO_ADDINS_DEFAULT_LIB@
Propchange: packages/mono-addins/trunk/debian/patches/fix_mono-addins.pc.patch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/mono-addins/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/patches/series?rev=3966&op=file
==============================================================================
--- packages/mono-addins/trunk/debian/patches/series (added)
+++ packages/mono-addins/trunk/debian/patches/series Sun Feb 1 17:43:17 2009
@@ -1,0 +1,6 @@
+configurable_compiler.patch
+fix_mono-addins.pc.patch
+fix_mono-addins-gui.pc.patch
+fix_mono-addins-setup.pc.patch
+fix_gac_policy_filenames.patch
+fix_configure.ac.patch
Modified: packages/mono-addins/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mono-addins/trunk/debian/rules?rev=3966&op=diff
==============================================================================
--- packages/mono-addins/trunk/debian/rules (original)
+++ packages/mono-addins/trunk/debian/rules Sun Feb 1 17:43:17 2009
@@ -4,17 +4,32 @@
export MONO_SHARED_DIR=$(CURDIR)
DEB_CLI_ABI_VERSION=0.2
-DEB_CLI_API_VERSION=0.3
+DEB_CLI_API_VERSION=0.4
-include /usr/share/dpatch/dpatch.make
+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)
+
+include /usr/share/quilt/quilt.make
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
+
+ libtoolize
+ aclocal
+ autoconf
+ automake --add-missing --copy
+
./configure --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --enable-tests=no MCS=/usr/bin/csc
+ --enable-tests=no \
+ MCS=/usr/bin/csc
touch configure-stamp
build: build-stamp
@@ -30,7 +45,12 @@
[ ! -f Makefile ] || $(MAKE) distclean
rm -rf $(CURDIR)/.wapi
rm -f configure-stamp build-stamp
- dh_clean
+
+ # delete generated autofoo stuff from above
+ find . -name "Makefile.in" -delete
+ rm -f config.status config.sub config.guess configure ltmain.sh
+
+ dh_clean
install: build
dh_testdir
@@ -74,4 +94,15 @@
binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary-indep binary install configure
+get-orig-source:
+ uscan \
+ --package $(DEB_SOURCE_NAME) \
+ --watchfile $(DEBIAN_DIR)/watch \
+ --upstream-version $(VERSION) \
+ --download-version $(VERSION) \
+ --destdir . \
+ --force-download \
+ --rename \
+ --repack
+
+.PHONY: build clean binary-arch binary-indep binary install configure get-orig-source
More information about the Pkg-cli-libs-commits
mailing list