tag 527786 patch
thanks

Lucas Nussbaum <lu...@lucas-nussbaum.net> (08/05/2009):
> Package: apertium-dbus
> Version: 0.1-1
> Severity: serious
> User: debian...@lists.debian.org
> Usertags: qa-ftbfs-20090508 qa-ftbfs
> Justification: FTBFS on amd64

Here's the patch for my NMU.

I'd like to add that I'm impressed by such a coordination!

Mraw,
KiBi.
diff -u apertium-dbus-0.1/debian/control apertium-dbus-0.1/debian/control
--- apertium-dbus-0.1/debian/control
+++ apertium-dbus-0.1/debian/control
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Francis Tyers <fty...@prompsit.com>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libdbus-1-3 ( >= 0.34 ), libdbus-1-dev (>= 0.34 ), python-dbus ( >= 0.82 ), libapertium3-3.0-0-dev ( >= 3.0.2 ), pkg-config (>= 0.21), python (>= 2.4.0)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libdbus-1-3 ( >= 0.34 ), libdbus-1-dev (>= 0.34 ), python-dbus ( >= 0.82 ), libapertium3-3.1-0-dev ( >= 3.0.2 ), pkg-config (>= 0.21), python (>= 2.4.0)
 Standards-Version: 3.7.3
 Homepage: http://www.apertium.org
 
diff -u apertium-dbus-0.1/debian/changelog apertium-dbus-0.1/debian/changelog
--- apertium-dbus-0.1/debian/changelog
+++ apertium-dbus-0.1/debian/changelog
@@ -1,3 +1,14 @@
+apertium-dbus (0.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update Build-Depends, switching from libapertium3-3.1-0-dev to
+    libapertium3-3.0-0-dev (Closes: #527786). Yay for coordination.
+  * Set urgency to “medium”, this bug affects testing too.
+  * Additionally adapt configure{,.in} to search for apertium-3.1
+    instead of apertium-3.0.
+
+ -- Cyril Brulebois <k...@debian.org>  Sun, 19 Jul 2009 15:35:38 +0200
+
 apertium-dbus (0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #464570)
only in patch2:
unchanged:
--- apertium-dbus-0.1.orig/configure.in
+++ apertium-dbus-0.1/configure.in
@@ -4,7 +4,7 @@
 AM_MAINTAINER_MODE
 AM_PATH_PYTHON
 
-PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0, APERTIUM="yes", AC_MSG_ERROR([*** unable to locate apertium! Run: apt-get install apertium ***]))
+PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.0.0, APERTIUM="yes", AC_MSG_ERROR([*** unable to locate apertium! Run: apt-get install apertium ***]))
 
 PKG_CHECK_MODULES(DBUS,  dbus-1 >= 0.34, DBUS="yes", AC_MSG_ERROR([*** unable to locate dbus library! Run: apt-get install dbus libdbus-1-dev  ***]))
 
only in patch2:
unchanged:
--- apertium-dbus-0.1.orig/configure
+++ apertium-dbus-0.1/configure
@@ -2433,12 +2433,12 @@
         pkg_cv_APERTIUM_CFLAGS="$APERTIUM_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"apertium-3.0 >= 3.0.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "apertium-3.0 >= 3.0.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"apertium-3.1 >= 3.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "apertium-3.1 >= 3.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_APERTIUM_CFLAGS=`$PKG_CONFIG --cflags "apertium-3.0 >= 3.0.0" 2>/dev/null`
+  pkg_cv_APERTIUM_CFLAGS=`$PKG_CONFIG --cflags "apertium-3.1 >= 3.0.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -2451,12 +2451,12 @@
         pkg_cv_APERTIUM_LIBS="$APERTIUM_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"apertium-3.0 >= 3.0.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "apertium-3.0 >= 3.0.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"apertium-3.1 >= 3.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "apertium-3.1 >= 3.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_APERTIUM_LIBS=`$PKG_CONFIG --libs "apertium-3.0 >= 3.0.0" 2>/dev/null`
+  pkg_cv_APERTIUM_LIBS=`$PKG_CONFIG --libs "apertium-3.1 >= 3.0.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -2475,9 +2475,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        APERTIUM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "apertium-3.0 >= 3.0.0"`
+	        APERTIUM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "apertium-3.1 >= 3.0.0"`
         else
-	        APERTIUM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "apertium-3.0 >= 3.0.0"`
+	        APERTIUM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "apertium-3.1 >= 3.0.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$APERTIUM_PKG_ERRORS" >&5

Attachment: signature.asc
Description: Digital signature

Reply via email to