r22890 - in /packages/unstable/gwget2/debian: changelog control control.in patches/fix_epiphany_2.29.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Jan 27 21:39:49 UTC 2010 

Author: joss
Date: Wed Jan 27 21:39:49 2010
New Revision: 22890

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22890
Log:
* Non-maintainer upload
* Fix FTBFS in gwget2 by adjusting configure.ac and debian/rules
  (Closes: #565287) Thanks to Peter Green

Added:
    packages/unstable/gwget2/debian/patches/fix_epiphany_2.29.patch
Modified:
    packages/unstable/gwget2/debian/changelog
    packages/unstable/gwget2/debian/control
    packages/unstable/gwget2/debian/control.in
    packages/unstable/gwget2/debian/patches/series
    packages/unstable/gwget2/debian/rules

Modified: packages/unstable/gwget2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/changelog?rev=22890&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/changelog [utf-8] (original)
+++ packages/unstable/gwget2/debian/changelog [utf-8] Wed Jan 27 21:39:49 2010
@@ -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 <white at debian.org>  Fri, 22 Jan 2010 21:39:05 +0100
+
 gwget2 (1.0.4-1) unstable; urgency=low
 
   * New upstream release. Closes: #533658, #552715.

Modified: packages/unstable/gwget2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/control?rev=22890&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/control [utf-8] (original)
+++ packages/unstable/gwget2/debian/control [utf-8] Wed Jan 27 21:39:49 2010
@@ -1,9 +1,13 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: gwget2
 Section: gnome
 Priority: optional
 Maintainer: Arnaud Fontaine <arnau at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>,
-	   Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
 Build-Depends: cdbs (>= 0.4.23-1.1),
                debhelper (>= 5),
                pkg-config,
@@ -18,8 +22,9 @@
                epiphany-browser-dev (>= 2.29),
                epiphany-browser-dev (<< 2.30),
                gnome-pkg-tools,
-               intltool (>= 0.35.0),
-               quilt
+	       intltool (>= 0.35.0),
+               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

Modified: packages/unstable/gwget2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/control.in?rev=22890&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/control.in [utf-8] (original)
+++ packages/unstable/gwget2/debian/control.in [utf-8] Wed Jan 27 21:39:49 2010
@@ -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

Added: packages/unstable/gwget2/debian/patches/fix_epiphany_2.29.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/patches/fix_epiphany_2.29.patch?rev=22890&op=file
==============================================================================
--- packages/unstable/gwget2/debian/patches/fix_epiphany_2.29.patch (added)
+++ packages/unstable/gwget2/debian/patches/fix_epiphany_2.29.patch [utf-8] Wed Jan 27 21:39:49 2010
@@ -1,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

Modified: packages/unstable/gwget2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/patches/series?rev=22890&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/patches/series [utf-8] (original)
+++ packages/unstable/gwget2/debian/patches/series [utf-8] Wed Jan 27 21:39:49 2010
@@ -1,1 +1,2 @@
 fix_glib_error_reporting.patch
+fix_epiphany_2.29.patch

Modified: packages/unstable/gwget2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/rules?rev=22890&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/rules [utf-8] (original)
+++ packages/unstable/gwget2/debian/rules [utf-8] Wed Jan 27 21:39:49 2010
@@ -1,6 +1,15 @@
 #!/usr/bin/make -f
 
 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::
@@ -8,6 +17,17 @@
 	-$(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

More information about the pkg-gnome-commits mailing list