tags 615707 + patch
user ubuntu-de...@lists.ubuntu.com
usertags 615707 + origin-ubuntu oneiric ubuntu-patch
thanks

in ubuntu attached patch was applied to fix the issue

diff -Nru desktopnova-0.8/debian/changelog desktopnova-0.8/debian/changelog
--- desktopnova-0.8/debian/changelog    2010-06-19 13:08:02.000000000 +0200
+++ desktopnova-0.8/debian/changelog    2011-01-09 16:48:20.000000000 +0100
@@ -1,3 +1,16 @@
+desktopnova (0.8-2ubuntu2) natty; urgency=low
+
+  * Move -ldl from LDFLAGS to CMakeLists.txt to ensure correct order of 
+    linking parameters. Fixes FTBFS.
+
+ -- Ilya Barygin <bary...@gmail.com>  Sun, 09 Jan 2011 18:47:32 +0300
+
+desktopnova (0.8-2ubuntu1) natty; urgency=low
+
+  * link against -ldl to fix FTBFS
+
+ -- Bhavani Shankar <bh...@ubuntu.com>  Tue, 26 Oct 2010 18:41:01 +0530
+
 desktopnova (0.8-2) unstable; urgency=low
 
   * Avoid circular dependencies. (Closes: #583756)
@@ -9,4 +22,4 @@
 
   * Initial Release (Closes: #562532)
 
- -- Stefan Haller <hali...@googlemail.com>  Mon, 24 May 2010 11:02:17 +0200
\ No newline at end of file
+ -- Stefan Haller <hali...@googlemail.com>  Mon, 24 May 2010 11:02:17 +0200
diff -Nru desktopnova-0.8/debian/control desktopnova-0.8/debian/control
--- desktopnova-0.8/debian/control      2010-06-19 13:06:51.000000000 +0200
+++ desktopnova-0.8/debian/control      2010-10-26 15:10:48.000000000 +0200
@@ -1,7 +1,8 @@
 Source: desktopnova
 Section: misc
 Priority: optional
-Maintainer: Stefan Haller <hali...@googlemail.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Stefan Haller <hali...@googlemail.com>
 Build-Depends: debhelper (>= 7), cmake, libglib2.0-dev, libgconf2-dev, 
libgtk2.0-dev, intltool, libxml2-dev, libdbus-glib-1-dev, libxfconf-0-dev
 Standards-Version: 3.8.4
 Homepage: http://launchpad.net/desktopnova
diff -Nru desktopnova-0.8/debian/patches/missing-libdl 
desktopnova-0.8/debian/patches/missing-libdl
--- desktopnova-0.8/debian/patches/missing-libdl        1970-01-01 
01:00:00.000000000 +0100
+++ desktopnova-0.8/debian/patches/missing-libdl        2011-01-09 
16:50:36.000000000 +0100
@@ -0,0 +1,26 @@
+Description: This is a minimal patch to fix FTBFS with
+ --no-add-needed, adding necessary linking flags.
+Author: Ilya Barygin <bary...@gmail.com>
+
+--- desktopnova-0.8.orig/src/desktopnova/CMakeLists.txt
++++ desktopnova-0.8/src/desktopnova/CMakeLists.txt
+@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+ 
+ ADD_EXECUTABLE(desktopnova desktopnova.c desktopnova-profiles.c)
+ TARGET_LINK_LIBRARIES(desktopnova ${GTK2_LIBRARIES} ${GLIB2_LIBRARIES}
+-                      desktopnova-general desktopnova-xml desktopnova-module)
++                      desktopnova-general desktopnova-xml desktopnova-module 
-ldl)
+ 
+ INSTALL(TARGETS desktopnova
+         DESTINATION ${DIRS_BINDIR})
+--- desktopnova-0.8.orig/src/desktopnova-daemon/CMakeLists.txt
++++ desktopnova-0.8/src/desktopnova-daemon/CMakeLists.txt
+@@ -7,7 +7,7 @@ ADD_EXECUTABLE(desktopnova-daemon deskto
+ 
+ TARGET_LINK_LIBRARIES(desktopnova-daemon ${GLIB2_LIBRARIES}
+                       ${DBUS_LIBRARIES} ${GTHREAD2_LIBRARIES}
+-                      desktopnova-general desktopnova-xml desktopnova-module)
++                      desktopnova-general desktopnova-xml desktopnova-module 
-ldl)
+ 
+ IF(ENABLE_DBUS)
+       TARGET_LINK_LIBRARIES(desktopnova-daemon desktopnova-dbus)
diff -Nru desktopnova-0.8/debian/patches/series 
desktopnova-0.8/debian/patches/series
--- desktopnova-0.8/debian/patches/series       1970-01-01 01:00:00.000000000 
+0100
+++ desktopnova-0.8/debian/patches/series       2011-01-09 16:47:23.000000000 
+0100
@@ -0,0 +1 @@
+missing-libdl
diff -Nru desktopnova-0.8/debian/rules desktopnova-0.8/debian/rules
--- desktopnova-0.8/debian/rules        2010-05-24 14:03:38.000000000 +0200
+++ desktopnova-0.8/debian/rules        2011-01-09 16:30:25.000000000 +0100
@@ -5,4 +5,5 @@
 #export DH_VERBOSE=1
 
 %:
-       dh  $@
\ No newline at end of file
+       dh  $@
+

Reply via email to