[pkg-kolab] r1554 - in kolabadmin/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2011-06-25 13:41:25 +0000 (Sat, 25 Jun 2011)
New Revision: 1554

Modified:
   kolabadmin/trunk/debian/changelog
   kolabadmin/trunk/debian/control
   kolabadmin/trunk/debian/patches/10_no-add-needed.diff
Log:
Fix FTBFS

Modified: kolabadmin/trunk/debian/changelog
===================================================================
--- kolabadmin/trunk/debian/changelog	2011-06-25 13:17:24 UTC (rev 1553)
+++ kolabadmin/trunk/debian/changelog	2011-06-25 13:41:25 UTC (rev 1554)
@@ -1,3 +1,10 @@
+kolabadmin (0.0.20080222-4) UNRELEASED; urgency=low
+
+  * Fix "FTBFS: g++: error: unrecognized option '--no-add-needed'"
+    thanks to Ilya Barygin on Ubuntu (Closes: #628260)
+
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 25 Jun 2011 15:40:09 +0200
+
 kolabadmin (0.0.20080222-3) unstable; urgency=low
 
   * Updated Standards-Version to 3.8.3: no changes

Modified: kolabadmin/trunk/debian/control
===================================================================
--- kolabadmin/trunk/debian/control	2011-06-25 13:17:24 UTC (rev 1553)
+++ kolabadmin/trunk/debian/control	2011-06-25 13:41:25 UTC (rev 1554)
@@ -4,7 +4,7 @@
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Mathieu Parent <sathieu at debian.org>
 Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), quilt, libqt4-dev, libldap2-dev, libssl-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Homepage: http://wgess16.dyndns.org/~tobias/qt/kolabadmin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolabadmin/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolabadmin/trunk/

Modified: kolabadmin/trunk/debian/patches/10_no-add-needed.diff
===================================================================
--- kolabadmin/trunk/debian/patches/10_no-add-needed.diff	2011-06-25 13:17:24 UTC (rev 1553)
+++ kolabadmin/trunk/debian/patches/10_no-add-needed.diff	2011-06-25 13:41:25 UTC (rev 1554)
@@ -11,12 +11,13 @@
 ===================================================================
 --- a/kolabadmin.pro
 +++ b/kolabadmin.pro
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,8 @@
  
  RESOURCES = application.qrc
  
 -LIBS += -lldap -lssl
-+LIBS += -Wl --no-add-needed -lldap -lssl -lcrypto
++QMAKE_LFLAGS += -Wl,--no-add-needed
++LIBS += -lldap -lssl -lcrypto
  
  DEFINES += LDAP_DEPRECATED