← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/firebird2.5/oneiric-security

« back to all changes in this revision

Viewing changes to debian/patches/no-spurious-linkage.patch

  • Committer: Bazaar Package Importer
  • Author(s): Damyan Ivanov
  • Date: 2011-04-23 11:14:47 UTC
  • mfrom: (15.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110423111447-liopox8hmj2yb5po
Tags: 2.5.0.26074-0.ds4-5
* watch: protect against 'ReleaseCandidate' in versions
* add a patch from upstream SVN fixing loading of ICU routines
* disable fix_kfreebsd_amd64_miscompile.patch
* link fbtrace with ICU and libpthreads
* drop lintian overrides about manpages in dependency package
* claim conformance to Policy 3.9.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/no-spurious-linkage.patch
141
141
 
142
142
 include $(ROOT)/gen/make.shared.targets
143
143
 
 
144
--- a/builds/posix/Makefile.in.fbtrace
 
145
+++ b/builds/posix/Makefile.in.fbtrace
 
146
@@ -72,7 +72,7 @@ all : fbtrace
 
147
 fbtrace: $(FBTRACE)
 
148
 
 
149
 $(FBTRACE):    $(FBTRACE_Objects)
 
150
-       $(LINK_TRACE) -o $@ $^ $(LINK_TRACE_LIBS)
 
151
+       $(LINK_TRACE) -o $@ $^ $(LINK_TRACE_LIBS) $(ICU_LIBS) $(THR_FLAGS)
 
152
 
 
153
 
 
154
 include $(ROOT)/gen/make.shared.targets