← Back to branch summary

~ubuntu-branches/ubuntu/edgy/monodevelop/edgy

« back to all changes in this revision

Viewing changes to debian/patches/use_real_log4net_and_firebird.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-03-19 19:04:37 UTC
  • Revision ID: james.westby@ubuntu.com-20060319190437-ddajpr6apylxsn1t
Tags: 0.9-1ubuntu5
* monodevelop.desktop.dpatch:
  + Use a HIG conform name and tooltip text (Closes: Malone #34918)
* use_real_log4net_and_firebird.dpatch:
  + Use the real FirebirdSql.Data.Firebird.dll and log4net.dll

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/use_real_log4net_and_firebird.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
 
 
3
@DPATCH@
 
4
 
 
5
--- ../monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.am    2005-11-15 18:59:50.000000000 +0100
 
6
+++ monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.am       2006-03-19 19:28:38.925077088 +0100
 
7
@@ -127,7 +127,7 @@
 
8
 REFS = -r:Mono.Posix.dll \
 
9
        -r:System.Runtime.Remoting \
 
10
        -r:ICSharpCode.SharpZipLib.dll \
 
11
-       -r:$(top_builddir)/build/bin/log4net.dll \
 
12
+       `pkg-config --libs log4net` \
 
13
        -r:$(top_builddir)/build/bin/Mono.Cecil.dll
 
14
 
 
15
 all: $(DLL) $(ADDIN_BUILD)/$(ADDIN)
 
16
--- ../monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.in    2005-11-23 21:45:11.000000000 +0100
 
17
+++ monodevelop-0.9/Core/src/MonoDevelop.Core/Makefile.in       2006-03-19 19:27:17.123512816 +0100
 
18
@@ -366,7 +366,7 @@
 
19
 REFS = -r:Mono.Posix.dll \
 
20
        -r:System.Runtime.Remoting \
 
21
        -r:ICSharpCode.SharpZipLib.dll \
 
22
-       -r:$(top_builddir)/build/bin/log4net.dll \
 
23
+       `pkg-config --libs log4net` \
 
24
        -r:$(top_builddir)/build/bin/Mono.Cecil.dll
 
25
 
 
26
 ADDIN = MonoDevelop.Core.addin.xml
 
27
--- ../monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.am     2005-11-15 11:37:23.000000000 +0100
 
28
+++ monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.am        2006-03-19 19:30:12.766810976 +0100
 
29
@@ -10,7 +10,7 @@
 
30
        /r:Mono.Posix.dll \
 
31
        /r:Mono.GetOptions.dll \
 
32
        /r:System.Runtime.Remoting \
 
33
-       /r:$(top_builddir)/build/bin/log4net.dll \
 
34
+       `pkg-config --libs log4net` \
 
35
        $(GTK_SHARP_LIBS) \
 
36
        $(GNOME_SHARP_LIBS) \
 
37
        $(GNOME_VFS_SHARP_LIBS) \
 
38
--- ../monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.in     2005-11-23 21:45:12.000000000 +0100
 
39
+++ monodevelop-0.9/Core/src/MonoDevelop.Ide/Makefile.in        2006-03-19 19:30:35.479358144 +0100
 
40
@@ -253,7 +253,7 @@
 
41
        /r:Mono.Posix.dll \
 
42
        /r:Mono.GetOptions.dll \
 
43
        /r:System.Runtime.Remoting \
 
44
-       /r:$(top_builddir)/build/bin/log4net.dll \
 
45
+       `pkg-config --libs log4net` \
 
46
        $(GTK_SHARP_LIBS) \
 
47
        $(GNOME_SHARP_LIBS) \
 
48
        $(GNOME_VFS_SHARP_LIBS) \
 
49
--- ../monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.am       2005-09-23 22:11:15.000000000 +0200
 
50
+++ monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.am  2006-03-19 19:37:12.247040288 +0100
 
51
@@ -44,7 +44,7 @@
 
52
 -r:Mono.Data.SqliteClient \
 
53
 -r:System.Data.OracleClient \
 
54
 -r:Mono.Data.SybaseClient \
 
55
--r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
 
56
+-r:FirebirdSql.Data.Firebird
 
57
 
 
58
 ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
 
59
 
 
60
--- ../monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.in       2005-11-23 21:45:18.000000000 +0100
 
61
+++ monodevelop-0.9/Extras/MonoQuery/Mono.Data.Sql/Makefile.in  2006-03-19 19:37:23.302359624 +0100
 
62
@@ -282,7 +282,7 @@
 
63
 -r:Mono.Data.SqliteClient \
 
64
 -r:System.Data.OracleClient \
 
65
 -r:Mono.Data.SybaseClient \
 
66
--r:$(top_srcdir)/contrib/FirebirdSql.Data.Firebird.dll
 
67
+-r:FirebirdSql.Data.Firebird
 
68
 
 
69
 ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
 
70
 DLL = $(ADDIN_BUILD)/Mono.Data.Sql.dll
 
71
 
 
72
--- ../monodevelop-0.9/contrib/Makefile.am      2005-09-23 22:11:15.000000000 +0200
 
73
+++ monodevelop-0.9/contrib/Makefile.am 2006-03-19 19:40:43.207969352 +0100
 
74
@@ -1,34 +1,17 @@
 
75
 
 
76
 BINDIR=$(top_builddir)/build/bin
 
77
-LOG4NET_DLL=log4net.dll
 
78
-LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
 
79
 CECIL_DLL=Mono.Cecil.dll
 
80
 CECIL = $(BINDIR)/$(CECIL_DLL)
 
81
 
 
82
-# We need to copy Firebird to the same directory as where
 
83
-# mono.data.sql builds. otherwise, mono.data.sql cant find the
 
84
-# firebird provider when monoquery links against mono.data.sql.
 
85
-FIREBIRDDIR=$(top_builddir)/build/AddIns/MonoQuery
 
86
-FIREBIRD_DLL=FirebirdSql.Data.Firebird.dll
 
87
-FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
 
88
-
 
89
-all: $(LOG4NET) $(CECIL) $(FIREBIRD)
 
90
-
 
91
-$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
 
92
-       mkdir -p $(BINDIR)
 
93
-       cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
 
94
+all: $(CECIL)
 
95
 
 
96
 $(CECIL): $(srcdir)/$(CECIL_DLL)
 
97
        mkdir -p $(BINDIR)
 
98
        cp $(srcdir)/$(CECIL_DLL) $(CECIL)
 
99
 
 
100
-$(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
 
101
-       mkdir -p $(FIREBIRDDIR)
 
102
-       cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
 
103
-
 
104
 assemblydir = $(MD_ASSEMBLY_DIR)
 
105
-assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD)
 
106
+assembly_DATA = $(CECIL)
 
107
 
 
108
-CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
 
109
-EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
 
110
+CLEANFILES = $(CECIL)
 
111
+EXTRA_DIST = $(CECIL_DLL)
 
112
 
 
113
--- ../monodevelop-0.9/contrib/Makefile.in      2005-11-23 21:45:23.000000000 +0100
 
114
+++ monodevelop-0.9/contrib/Makefile.in 2006-03-19 19:41:25.750501904 +0100
 
115
@@ -238,21 +238,16 @@
 
116
 sysconfdir = @sysconfdir@
 
117
 target_alias = @target_alias@
 
118
 BINDIR = $(top_builddir)/build/bin
 
119
-LOG4NET_DLL = log4net.dll
 
120
-LOG4NET = $(BINDIR)/$(LOG4NET_DLL)
 
121
 CECIL_DLL = Mono.Cecil.dll
 
122
 CECIL = $(BINDIR)/$(CECIL_DLL)
 
123
 
 
124
 # We need to copy Firebird to the same directory as where
 
125
 # mono.data.sql builds. otherwise, mono.data.sql cant find the
 
126
 # firebird provider when monoquery links against mono.data.sql.
 
127
-FIREBIRDDIR = $(top_builddir)/build/AddIns/MonoQuery
 
128
-FIREBIRD_DLL = FirebirdSql.Data.Firebird.dll
 
129
-FIREBIRD = $(FIREBIRDDIR)/$(FIREBIRD_DLL)
 
130
 assemblydir = $(MD_ASSEMBLY_DIR)
 
131
-assembly_DATA = $(LOG4NET) $(CECIL) $(FIREBIRD)
 
132
-CLEANFILES = $(LOG4NET) $(CECIL) $(FIREBIRD)
 
133
-EXTRA_DIST = $(LOG4NET_DLL) $(CECIL_DLL) $(FIREBIRD_DLL)
 
134
+assembly_DATA = $(CECIL)
 
135
+CLEANFILES = $(CECIL)
 
136
+EXTRA_DIST = $(CECIL_DLL)
 
137
 all: all-am
 
138
 
 
139
 .SUFFIXES:
 
140
@@ -426,19 +421,12 @@
 
141
        uninstall-info-am
 
142
 
 
143
 
 
144
-all: $(LOG4NET) $(CECIL) $(FIREBIRD)
 
145
-
 
146
-$(LOG4NET): $(srcdir)/$(LOG4NET_DLL)
 
147
-       mkdir -p $(BINDIR)
 
148
-       cp $(srcdir)/$(LOG4NET_DLL) $(LOG4NET)
 
149
+all: $(CECIL)
 
150
 
 
151
 $(CECIL): $(srcdir)/$(CECIL_DLL)
 
152
        mkdir -p $(BINDIR)
 
153
        cp $(srcdir)/$(CECIL_DLL) $(CECIL)
 
154
 
 
155
-$(FIREBIRD): $(srcdir)/$(FIREBIRD_DLL)
 
156
-       mkdir -p $(FIREBIRDDIR)
 
157
-       cp $(srcdir)/$(FIREBIRD_DLL) $(FIREBIRD)
 
158
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 
159
 # Otherwise a system limit (for SysV at least) may be exceeded.
 
160
 .NOEXPORT: