Hi
Please find the NMU attached.
Cheers
Steffen
diff -u gwget2-1.0.4/debian/changelog gwget2-1.0.4/debian/changelog
--- gwget2-1.0.4/debian/changelog
+++ gwget2-1.0.4/debian/changelog
@@ -1,3 +1,11 @@
+gwget2 (1.0.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Fix FTBFS in gwget2 by adjusting configure.ac and debian/rules
+ (Closes: #565287) Thanks to Peter Green
+
+ -- Steffen Joeris <wh...@debian.org> Fri, 22 Jan 2010 21:39:05 +0100
+
gwget2 (1.0.4-1) unstable; urgency=low
* New upstream release. Closes: #533658, #552715.
diff -u gwget2-1.0.4/debian/rules gwget2-1.0.4/debian/rules
--- gwget2-1.0.4/debian/rules
+++ gwget2-1.0.4/debian/rules
@@ -2,12 +2,32 @@
include /usr/share/cdbs/1/rules/debhelper.mk
+#run autoreconf to generate configure stuff
+makebuilddir::
+ aclocal
+ libtoolize
+ autoconf
+ autoheader
+ automake
+
+
# Workaround which runs ``make distclean'' before unapplying patches
cleanbuilddir::
# Invoke distclean
-$(DEB_MAKE_INVOKE) -k distclean
rm -f data/GNOME_Gwget.server.in data/GNOME_Gwget.server \
data/gwget.schemas
+ # cleanup generated autoconf files (now we want them regenerated)
+ rm -f config.h.in
+ rm -f configure
+ rm -f libtool
+ rm -f ltmain.sh
+ rm -f aclocal.m4
+ rm -f data/Makefile.in
+ rm -f epiphany-extension/Makefile.in
+ rm -f Makefile.in
+ rm -f pixmaps/Makefile.in
+ rm -f src/Makefile.in
LDFLAGS := -Wl,--as-needed
@@ -21,7 +41,7 @@
DEB_MAKE_CLEAN_TARGET :=
DEB_CONFIGURE_EXTRA_FLAGS += --enable-epiphany-extension \
- --with-epiphany-version=2.28 --disable-static
+ --with-epiphany-version=2.29 --disable-static
binary-post-install/epiphany-extension-gwget::
rm -f debian/epiphany-extension-gwget/usr/lib/epiphany-*/*/*/*.la
diff -u gwget2-1.0.4/debian/control.in gwget2-1.0.4/debian/control.in
--- gwget2-1.0.4/debian/control.in
+++ gwget2-1.0.4/debian/control.in
@@ -18,7 +18,8 @@
epiphany-browser-dev (<< 2.30),
gnome-pkg-tools,
intltool (>= 0.35.0),
- quilt
+ quilt,
+ libtool
Homepage: http://gnome.org/projects/gwget/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gwget2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/?op=log
diff -u gwget2-1.0.4/debian/control gwget2-1.0.4/debian/control
--- gwget2-1.0.4/debian/control
+++ gwget2-1.0.4/debian/control
@@ -23,7 +23,8 @@
epiphany-browser-dev (<< 2.30),
gnome-pkg-tools,
intltool (>= 0.35.0),
- quilt
+ quilt,
+ libtool
Homepage: http://gnome.org/projects/gwget/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gwget2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/?op=log
diff -u gwget2-1.0.4/debian/patches/series gwget2-1.0.4/debian/patches/series
--- gwget2-1.0.4/debian/patches/series
+++ gwget2-1.0.4/debian/patches/series
@@ -1,0 +2 @@
+fix_epiphany_2.29.patch
only in patch2:
unchanged:
--- gwget2-1.0.4.orig/debian/patches/fix_epiphany_2.29.patch
+++ gwget2-1.0.4/debian/patches/fix_epiphany_2.29.patch
@@ -0,0 +1,15 @@
+Index: gwget2-1.0.4/configure.ac
+===================================================================
+--- gwget2-1.0.4.orig/configure.ac 2010-01-15 23:36:04.000000000 +0000
++++ gwget2-1.0.4/configure.ac 2010-01-15 23:37:25.000000000 +0000
+@@ -229,6 +229,10 @@
+ EPIPHANY_PKGCONFIG=epiphany-2.28
+ EPIPHANY_REQUIRED=2.28
+ EPIPHANY_SHORTVER=228
++elif test "x$EPHY_VER" = "x2.29"; then
++ EPIPHANY_PKGCONFIG=epiphany-2.29
++ EPIPHANY_REQUIRED=2.29
++ EPIPHANY_SHORTVER=229
+ else
+ AC_MSG_RESULT([no epiphany installed])
+ fi
