Dear maintainer,
I've prepared an NMU for vdk2 (versioned as 2.4.0-5.3) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
it fixes FTBFS with vdkxdb2 (#652169) and vdkbuilder2 (#652173).
patch suggested by Julien Cristau jcris...@debian.org (#656548).
--
Regards,
dai
GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E
diff -u vdk2-2.4.0/vdk-config-2.in vdk2-2.4.0/vdk-config-2.in
--- vdk2-2.4.0/vdk-config-2.in
+++ vdk2-2.4.0/vdk-config-2.in
@@ -15,9 +15,9 @@
CFLAGS=-I@includedir@/vdk2
LIBDIRS=-L@libdir@
-vdk_libs=$LIBDIRS -lvdk2 @GNOME_VDK@ @GTK_LIBS@\
+vdk_libs=$LIBDIRS -lvdk2 @GNOME_VDK@\
@SIGC_LIBS@ @GNOME_LIBS@
-vdk_cflags=$CFLAGS @GTK_CFLAGS@ @SIGC_CFLAGS@\
+vdk_cflags=$CFLAGS @SIGC_CFLAGS@\
@GNOME_CFLAGS@ @SIGCDEFINE@ @GNOMEDEFINE@
usage()
@@ -96,8 +96,10 @@
# default to VDK for backward compatibility
# (should be removed some time in the future)
if test x$any = xno; then
- the_libs=$the_libs $vdk_libs
- the_flags=$the_flags $vdk_cflags
+ gtk_libs=`pkg-config --libs gtk+-x11-2.0`
+ the_libs=$the_libs $vdk_libs $gtk_libs
+ gtk_flags=`pkg-config --cflags gtk+-x11-2.0`
+ the_flags=$the_flags $vdk_cflags $gtk_flags
fi
if $cflags; then
diff -u vdk2-2.4.0/doc/doxy/Makefile vdk2-2.4.0/doc/doxy/Makefile
--- vdk2-2.4.0/doc/doxy/Makefile
+++ vdk2-2.4.0/doc/doxy/Makefile
@@ -44,7 +44,7 @@
AUTOCONF = autoconf
AUTOHEADER = autoheader
AUTOMAKE = automake-1.7
-AWK = mawk
+AWK = gawk
CC = x86_64-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
@@ -64,7 +64,7 @@
ECHO_T =
EGREP = grep -E
EXEEXT =
-F77 =
+F77 = x86_64-linux-gnu-gfortran
FFLAGS = -g -O2
GENERATE_HTML = YES
GENERATE_LATEX = NO
@@ -73,9 +73,9 @@
GNOME_CFLAGS =
GNOME_LIBS =
GNOME_VDK =
-GTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/cairo -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+GTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/cairo
GTK_LIBS = -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
-INCLUDES = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/cairo -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+INCLUDES = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/cairo
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
@@ -106,7 +106,7 @@
PKG_CONFIG = /usr/bin/pkg-config
RANLIB = ranlib
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SIGCDEFINE =
SIGC_CFLAGS =
SIGC_LIBS = -lpthread
@@ -148,7 +148,7 @@
host_vendor = pc
includedir = ${prefix}/include
infodir = ${prefix}/info
-install_sh = /home/regis/Debian/qa/vdk2/vdk2-2.4.0/install-sh
+install_sh = /usr/src/deb/BSP/vdk2/vdk2-2.4.0/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
diff -u vdk2-2.4.0/debian/changelog vdk2-2.4.0/debian/changelog
--- vdk2-2.4.0/debian/changelog
+++ vdk2-2.4.0/debian/changelog
@@ -1,3 +1,12 @@
+vdk2 (2.4.0-5.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * vdk2-2.4.0/vdk-config-2.in: use pkg-config to get the glib path
+- Thanks Julien Cristau jcris...@debian.org for suggestion.
+ (Closes: #656408)
+
+ -- HIGUCHI Daisuke (VDR dai) d...@debian.org Tue, 31 Jan 2012 12:03:05 +0900
+
vdk2 (2.4.0-5.2) unstable; urgency=low
* Non-maintainer upload.
signature.asc
Description: Digital signature
