Package: odin
Version: 1.8.1-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch

Hi,

*** /tmp/tmpBuJ50Y
In Ubuntu, we've applied the attached patch to fix the FTBFS wih binutils-gold,
 by adding missing libs to LDADD in several Makefile.in

We thought you might be interested in doing the same. 


-- System Information:
Debian Release: squeeze/sid
  APT prefers maverick-updates
  APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500, 
'maverick-proposed'), (500, 'maverick')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.35-23-generic (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru odin-1.8.1/debian/patches/fix-FTBFS-binutils-gold.patch odin-1.8.1/debian/patches/fix-FTBFS-binutils-gold.patch
--- odin-1.8.1/debian/patches/fix-FTBFS-binutils-gold.patch	1970-01-01 01:00:00.000000000 +0100
+++ odin-1.8.1/debian/patches/fix-FTBFS-binutils-gold.patch	2010-12-05 22:56:51.000000000 +0100
@@ -0,0 +1,59 @@
+Description: fix FTBFS wih binutils-gold, by adding missing libs to LDADD in
+ several Makefile.in
+Author: Fabrice Coutadeur <fabric...@ubuntu.com>
+
+--- odin-1.8.1.orig/geoedit/Makefile.in
++++ odin-1.8.1/geoedit/Makefile.in
+@@ -217,7 +217,7 @@ top_srcdir = @top_srcdir@
+ @GUI_ENABLED_TRUE@  geoeditlabel.cpp  geoeditlabel.h geoeditlabel_moc.cpp \
+ @GUI_ENABLED_TRUE@  geoeditview.cpp  geoeditview.h geoeditview_moc.cpp
+ 
+...@gui_enabled_true@geoedit_LDADD = ../odinqt/libodinqt.la ../odindata/libodindata.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+...@gui_enabled_true@geoedit_LDADD = ../odinqt/libodinqt.la ../odindata/libodindata.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la -lQtGui -lQtCore
+ 
+ # Manual pages for distribution
+ @gui_enabled_t...@dist_man_mans = geoedit.1
+--- odin-1.8.1.orig/cmdline-utils/Makefile.in
++++ odin-1.8.1/cmdline-utils/Makefile.in
+@@ -248,7 +248,7 @@ top_srcdir = @top_srcdir@
+ @only_libs_fa...@odintestsuite_ldadd = ../odindata/libodindata.la ../odinseq/libodinseq.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+ @only_libs_fa...@gencoil_ldadd = ../odindata/libodindata.la ../odinseq/libodinseq.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+ @only_libs_fa...@gensample_ldadd = ../odindata/libodindata.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+...@only_libs_false@genmakefile_LDADD = ../odinseq/libodinseq.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+...@only_libs_false@genmakefile_LDADD = ../odinseq/libodinseq.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la -ldl
+ @only_libs_fa...@miconv_ldadd = ../odindata/libodindata.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+ @only_libs_fa...@micalc_ldadd = ../odindata/libodindata.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+ @only_libs_fa...@swab_ldadd = 
+--- odin-1.8.1.orig/pulsar/Makefile.in
++++ odin-1.8.1/pulsar/Makefile.in
+@@ -211,7 +211,7 @@ top_srcdir = @top_srcdir@
+ @GUI_ENABLED_TRUE@  pulsar.cpp  pulsar.h pulsar_moc.cpp \
+ @GUI_ENABLED_TRUE@  pulsarview.cpp  pulsarview.h pulsarview_moc.cpp
+ 
+...@gui_enabled_true@pulsar_LDADD = ../odinseq/libodinseq.la ../odinqt/libodinqt.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+...@gui_enabled_true@pulsar_LDADD = ../odinseq/libodinseq.la ../odinqt/libodinqt.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la  -lQtGui -lQtCore
+ 
+ # Manual pages for distribution
+ @gui_enabled_t...@dist_man_mans = pulsar.1
+--- odin-1.8.1.orig/odin/Makefile.in
++++ odin-1.8.1/odin/Makefile.in
+@@ -266,7 +266,7 @@ top_srcdir = @top_srcdir@
+ @GUI_ENABLED_TRUE@  odin.cpp odin.h icons.h odin_moc.cpp \
+ @GUI_ENABLED_TRUE@  main.cpp
+ 
+...@gui_enabled_true@odin_LDADD = ../odinseq/libodinseq.la ../odinqt/libodinqt.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+...@gui_enabled_true@odin_LDADD = ../odinseq/libodinseq.la ../odinqt/libodinqt.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la $(VTKLIBS) -lQtGui -lQtCore -lvtkGraphics -lvtkFiltering
+ @gui_enabled_t...@odin_ldflags = $(VTKLIBS)
+ 
+ # Manual pages for distribution
+--- odin-1.8.1.orig/miview/Makefile.in
++++ odin-1.8.1/miview/Makefile.in
+@@ -214,7 +214,7 @@ top_srcdir = @top_srcdir@
+ @GUI_ENABLED_TRUE@  miview.cpp  miview.h miview_moc.cpp \
+ @GUI_ENABLED_TRUE@  main.cpp
+ 
+...@gui_enabled_true@miview_LDADD = ../odindata/libodindata.la ../odinqt/libodinqt.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la
+...@gui_enabled_true@miview_LDADD = ../odindata/libodindata.la ../odinqt/libodinqt.la ../odinpara/libodinpara.la ../tjutils/libtjutils.la -lQtGui -lQtCore
+ 
+ # Manual pages for distribution
+ @gui_enabled_t...@dist_man_mans = miview.1
diff -Nru odin-1.8.1/debian/patches/series odin-1.8.1/debian/patches/series
--- odin-1.8.1/debian/patches/series	2010-05-25 14:27:43.000000000 +0200
+++ odin-1.8.1/debian/patches/series	2010-12-05 22:52:51.000000000 +0100
@@ -1,2 +1,3 @@
 missing_header
 disable_tests
+fix-FTBFS-binutils-gold.patch

Reply via email to