The following commit has been merged in the master branch:
commit 935d9c5238f61846445cc2a464f5503b8ea4045c
Author: Aron Xu <[email protected]>
Date: Sun Jun 26 12:47:22 2011 +0800
Fix FTBFS with binutils-gold (Closes: #554314).
diff --git a/debian/changelog b/debian/changelog
index b53ae27..b14f9c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,11 @@ earth3d (1.0.5-2) UNRELEASED; urgency=low
* debian/compact: Use 7 instead of ancient 4.
* debian/copyright: Reference to GPL-2 instead of obsolete GPL.
* debian/dirs: Removed, useless.
- * debian/earth3d.desktop: Fix typo (Closes: 550034)
+ * debian/earth3d.desktop: Fix typo (Closes: 550034).
+ * debian/patches/20_png_library.patch:
+ Fix FTBFS with binutils-gold by linking to libpng,
+ Thanks Ilya Barygin (Closes: #554314).
+ * Acknowledge NMU (Closes: #417173).
-- Aron Xu <[email protected]> Sun, 26 Jun 2011 12:29:58 +0800
diff --git a/debian/patches/20_png_library.patch
b/debian/patches/20_png_library.patch
new file mode 100644
index 0000000..9d2d2e7
--- /dev/null
+++ b/debian/patches/20_png_library.patch
@@ -0,0 +1,13 @@
+From: Ilya Barygin <[email protected]>
+Subject: Fix FTBFS with binutils-gold by linking to libpng
+Bug-Debian: 554314
+--- a/earth3d.pro
++++ b/earth3d.pro
+@@ -68,6 +68,7 @@
+ CONFIG += qt thread opengl warn_on release stl
+
+ # LIBS += -lglut
++LIBS += -lpng
+ # DEFINES += STATISTIC_NODECOUNT
+ INCLUDEPATH += /usr/include/libxml2/libxml /usr/include/libxml2
../../network/rubyAgents/c ../../dataserver /sw/include /usr/X11R6/include/
/sw/include/libxml2 geometry/ network/ draw/ tree/ ./
+
diff --git a/debian/patches/series b/debian/patches/series
index f44b8c1..257a208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
10_texture_compr.patch
+20_png_library.patch
--
earth3d for Debian
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
