Package: quinn-diff
Version: 0.65.1
Severity: wishlist
Tags: patch
The attached patch allows to link quinn-diff against glib2 instead of
glib1 which is now in section oldlibs.
The patch also updates automake usage from 1.4 to 1.9.
(The new automake is called from debian/rules, just to make the diff
small.)
Martin
--- quinn-diff-0.65.1.orig/configure.in
+++ quinn-diff-0.65.1/configure.in
@@ -80,7 +80,8 @@
esac
dnl Checks for libraries.
-AC_CHECK_LIB(glib, g_hash_table_lookup)
+dnl AC_CHECK_LIB(glib, g_hash_table_lookup)
+AM_PATH_GLIB_2_0()
dnl Checks for header files.
AC_HEADER_STDC
--- quinn-diff-0.65.1.orig/debian/control
+++ quinn-diff-0.65.1/debian/control
@@ -2,7 +2,7 @@
Section: devel
Priority: extra
Maintainer: James Troup <[EMAIL PROTECTED]>
-Build-Depends: libglib1.2-dev, docbook-utils
+Build-Depends: libglib2.0-dev, docbook-utils, automake-1.9, autoconf
Standards-Version: 3.5.10.0
Package: quinn-diff
--- quinn-diff-0.65.1.orig/debian/rules
+++ quinn-diff-0.65.1/debian/rules
@@ -16,7 +16,12 @@
build:
$(checkdir)
- ./configure --prefix=/usr --sysconfdir=/etc
+ rm -f scripts/* acconfig.h
+ aclocal-1.9
+ autoconf
+ autoheader
+ automake-1.9 --copy --add-missing
+ ./configure --prefix=/usr --sysconfdir=/etc
$(MAKE)
touch build
--- quinn-diff-0.65.1.orig/src/Makefile.am
+++ quinn-diff-0.65.1/src/Makefile.am
@@ -1,4 +1,4 @@
bin_PROGRAMS = quinn-diff
quinn_diff_SOURCES = error.c nfmalloc.c xmalloc.c getopt.c getopt1.c init.c
list.c arch_specific.c vercmp.c output.c utils.c parse_sources.c
parse_packages.c main.c arch_specific.h common.h error.h getopt.h init.h list.h
nfmalloc.h output.h parse_sources.h parse_packages.h utils.h vercmp.h xmalloc.h
globals.h
-quinn_diff_LDADD = @EFENCE@ @CCMALLOC@
-CPPFLAGS = $(shell glib-config --cflags)
+quinn_diff_LDADD = @EFENCE@ @CCMALLOC@ @GLIB_LIBS@
+AM_CFLAGS = @GLIB_CFLAGS@
