Hi,

I uploaded an NMU of your package.

Please see this as help to get the package into a releaseable condition again.

Please find the used diff below.


Cheers,
Andi


diff -u ulogd-1.24/debian/control ulogd-1.24/debian/control
--- ulogd-1.24/debian/control
+++ ulogd-1.24/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Achilleas Kotsis <achi...@kotsis.net>
 Uploaders: Faidon Liambotis <parav...@debian.org>
-Build-Depends: debhelper (>= 5), libmysqlclient15-dev | libmysqlclient-dev, 
libpq-dev, libpcap-dev, libsqlite3-dev, cdbs, autotools-dev
+Build-Depends: debhelper (>= 5), libmysqlclient-dev, libpq-dev, libpcap-dev, 
libsqlite3-dev, cdbs, autotools-dev
 Standards-Version: 3.7.3
 Homepage: http://www.netfilter.org/projects/ulogd/
 
diff -u ulogd-1.24/debian/changelog ulogd-1.24/debian/changelog
--- ulogd-1.24/debian/changelog
+++ ulogd-1.24/debian/changelog
@@ -1,3 +1,13 @@
+ulogd (1.24-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Drop -rdynamic to fix FTBFS by ignoring it from mysql_config. Another
+    solution would be to use gcc for linking, not ld directly. Closes: #527534
+  * Add LFS support, thanks to Rudolph Pereira for the fix. Closes: #472251
+  * replace libmysqlclient15-dev by libmysqlclient-dev.
+
+ -- Andreas Barth <a...@not.so.argh.org>  Fri, 28 Aug 2009 07:08:10 +0200
+
 ulogd (1.24-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- ulogd-1.24.orig/Rules.make.in
+++ ulogd-1.24/Rules.make.in
@@ -19,7 +19,7 @@
 insta...@install@
 
 cfla...@cflags@ @CPPFLAGS@ -Wall
-CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"
+CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\" -D_FILE_OFFSET_BITS=64
 # doesn't work for subdirs
 #CFLAGS+=$(INCIPULOG) $(INCCONFFILE)
 CFLAGS+=-I/lib/modules/`uname -r`/build/include
only in patch2:
unchanged:
--- ulogd-1.24.orig/configure
+++ ulogd-1.24/configure
@@ -1728,7 +1728,7 @@
 EOF
 
         MYSQLINCLUDES=`$d/mysql_config --include`
-        MYSQLLIBS=`$d/mysql_config --libs`
+        MYSQLLIBS=`$d/mysql_config --libs | sed 's/-rdynamic//'`
 
        DATABASE_DIR="${DATABASE_DIR} mysql"
 
only in patch2:
unchanged:
--- ulogd-1.24.orig/Makefile.in
+++ ulogd-1.24/Makefile.in
@@ -63,7 +63,7 @@
        @for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done
 
 ulogd: ulogd.c $(LIBIPULOG) include/ulogd/ulogd.h conffile/conffile.o 
$(LIBIPULOG)/libipulog.a ulogd.conf
-       $(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o 
$(LIBIPULOG)/libipulog.a -o $@ $(LIBS)
+       $(CC) $(CFLAGS) $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ 
$(LIBS)
 
 edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g'
 
only in patch2:
unchanged:
--- ulogd-1.24.orig/configure.in
+++ ulogd-1.24/configure.in
@@ -60,7 +60,8 @@
 else
         AC_DEFINE(HAVE_MYSQL)
         MYSQLINCLUDES=`$d/mysql_config --include`
-        MYSQLLIBS=`$d/mysql_config --libs`
+       # #527534, other solution would be to use gcc for linking
+        MYSQLLIBS=`$d/mysql_config --libs | sed 's/-rdynamic//'`
 
        DATABASE_DIR="${DATABASE_DIR} mysql"
 



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to