Merge lp:~jtaylor/ubuntu/oneiric/termit/fix-803204 into lp:ubuntu/oneiric/termit

[Julian Taylor]

fix ftbs

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-11 16:39:12 +0000
+++ debian/changelog	2011-08-21 15:10:25 +0000
@@ -1,3 +1,10 @@
+termit (2.6.0-1ubuntu1) oneiric; urgency=low
+
+  * debian/patches/fix-as-needed-build.patch:
+    - fix build with ld --as-needed (LP: #803204)
+
+ -- Julian Taylor <[e-mail]>  Sun, 21 Aug 2011 17:00:06 +0200
+
 termit (2.6.0-1) unstable; urgency=low
 
   * Initial release (Closes: #576409)

=== modified file 'debian/control'
--- debian/control	2011-01-11 16:39:12 +0000
+++ debian/control	2011-08-21 15:10:25 +0000
@@ -1,7 +1,8 @@
 Source: termit
 Section: misc
 Priority: optional
-Maintainer: Tomas Fasth <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Tomas Fasth <[e-mail]>
 Build-Depends: cdbs, debhelper (>= 7.0.50~), cmake, libgtk2.0-dev, libvte-dev, liblua5.1-0-dev
 Standards-Version: 3.8.4
 Homepage: https://github.com/nonstop/termit/wiki

=== added directory 'debian/patches'
=== added file 'debian/patches/fix-as-needed-build.patch'
--- debian/patches/fix-as-needed-build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-as-needed-build.patch	2011-08-21 15:10:25 +0000
@@ -0,0 +1,46 @@
+Description: fix build with ld --as-needed
+ the CMakeLists.txt wrongly uses LINKFLAGS to register
+ libraries to link with. This leads to a wrong ordering on the
+ command line.
+ ld --as-needed requires the libraries after the objects needing
+ their symbols.
+ Additionally FindGTK2 is used instead of FindGTK which is for gtk1
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/termit/+bug/803204
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632718
+Author: Julian Taylor <[e-mail]>
+--- termit-2.6.0.orig/src/CMakeLists.txt
++++ termit-2.6.0/src/CMakeLists.txt
+@@ -15,7 +15,7 @@ SET(TARGET "termit")
+ 
+ INCLUDE_DIRECTORIES(${TERMIT_SOURCE_DIR})
+ 
+-INCLUDE (FindGTK)
++INCLUDE (FindGTK2)
+ 
+ INCLUDE (FindPkgConfig)
+ pkg_search_module(VTE REQUIRED libvte>=0.17.1 vte>=0.17.1)
+@@ -40,8 +40,6 @@ IF(DEBUG)
+   SET(TERMIT_CFLAGS "${TERMIT_CFLAGS} -g -D DEBUG -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE")
+ ENDIF(DEBUG)
+ 
+-set(TERMIT_LDFLAGS ${VTE_LDFLAGS} ${GTK_LDFLAGS})
+-
+ SET_SOURCE_FILES_PROPERTIES(${TERMIT_SRCS} PROPERTIES 
+   COMPILE_FLAGS "${TERMIT_CFLAGS}")
+ 
+@@ -51,13 +49,7 @@ ADD_EXECUTABLE(${TARGET} ${TERMIT_SRCS})
+ #  LINK_FLAGS ${TERMIT_LDFLAGS})
+ #set_target_properties(${TARGET} PROPERTIES LINK_FLAGS ${TERMIT_LDFLAGS})
+ 
+-SET(TERMIT_LDFLAGS "")
+-FOREACH(ldflag ${VTE_LDFLAGS} ${GTK_LDFLAGS})
+-  SET(TERMIT_LDFLAGS "${TERMIT_LDFLAGS} ${ldflag}")
+-ENDFOREACH(ldflag)
+-set_target_properties(${TARGET} PROPERTIES LINK_FLAGS "${TERMIT_LDFLAGS}")
+-
+-target_link_libraries(${TARGET} ${LUA_LIBRARIES})
++target_link_libraries(${TARGET} ${LUA_LIBRARIES} ${GTK2_LIBRARIES} ${VTE_LIBRARIES})
+ 
+ INSTALL(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ 
+

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-08-21 15:10:25 +0000
@@ -0,0 +1,1 @@
+fix-as-needed-build.patch