[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#683367: unblock: ffgtk/0.8.1-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception

Please unblock package ffgtk 0.8.1-2 which fixes an FTBFS induced by
changes in libcapi20-dev upstream.  I've also taken the liberty to
update the watch file to make it work again despite upstream blocking
straight access to directories now.  Debdiff is attached for your
kind review.
diff --git a/debian/changelog b/debian/changelog
index 047070f..0825a42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ffgtk (0.8.1-2) unstable; urgency=low
+
+  * add patch to compile ffgtk against libcapi v3.25. Closes: #680813
+  * unbreak the watch file, upstream disallows direct directory access now
+
+ -- Rolf Leggewie <foss@rolf.leggewie.biz>  Fri, 20 Jul 2012 14:57:12 +0800
+
 ffgtk (0.8.1-1) unstable; urgency=low
 
   * initial release. Closes: #602723, LP: #522644.
diff --git a/debian/control b/debian/control
index d3dde38..9e31ba5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Rolf Leggewie <foss@rolf.leggewie.biz>
 Uploaders: Jan-Michael Brummer <jan.brummer@tabos.org>
 Build-Depends: debhelper (>= 7.0.50~), libxml2-dev, libcurl4-gnutls-dev,
- libspandsp-dev, intltool, libtool, libsndfile-dev, libcapi20-dev (>= 3.22),
+ libspandsp-dev, intltool, libtool, libsndfile-dev, libcapi20-dev (>= 1:3.24),
  libdbus-glib-1-dev, libebook1.2-dev, libgnome-keyring-dev, libasound2-dev,
  libspeex-dev, libspeexdsp-dev, libpulse-dev, libnotify-dev, dh-autoreconf,
  libgtk-3-dev | libgtk2.0-dev
diff --git a/debian/patches/build-with-i4l-v3.25.patch b/debian/patches/build-with-i4l-v3.25.patch
new file mode 100644
index 0000000..5f8525b
--- /dev/null
+++ b/debian/patches/build-with-i4l-v3.25.patch
@@ -0,0 +1,20 @@
+Description: build successfully against version 3.25 of isdnutils
+Author: Jan-Michael Brummer
+Bug-Debian: http://bugs.debian.org/680813
+Forwarded: not-needed, latest ffgtk upstream does not need this anymore
+Last-Update: 2012-07-20
+
+--- ffgtk-0.8.1.orig/ffgtk/faxophone/faxophone.c
++++ ffgtk-0.8.1/ffgtk/faxophone/faxophone.c
+@@ -1538,7 +1538,10 @@ struct sSession *faxophoneInit( struct s
+ 
+ 	if ( psSession == NULL ) {
+ 		if ( pnHost != NULL ) {
+-			setHostName( pnHost );
++			capi20ext_set_driver( "fritzbox" );
++			capi20ext_set_host( ( char * ) pnHost );
++			capi20ext_set_port( 5031 );
++			capi20ext_set_tracelevel( 0 );
+ 		}
+ 
+ 		nApplId = capiInit( nController );
diff --git a/debian/patches/series b/debian/patches/series
index 26c8ab4..cba2577 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 po-files.patch
+build-with-i4l-v3.25.patch
diff --git a/debian/watch b/debian/watch
index 9a83286..de64fbc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://www.tabos.org/ffgtk/download/ffgtk-(.*)\.tar\.bz2
+http://www.tabos.org/ffgtk/download.php .*/ffgtk-(.*)\.tar\.bz2

Reply to: