Merge lp:~barry/ubuntu/natty/libfsotransport/618809-ftbfs into lp:ubuntu/natty/libfsotransport

[Barry Warsaw]

Another libvala transition fix.

[Artur Rona (ari-tczew)]

Could you add DEP3 tags to patch?
https://wiki.ubuntu.com/PackagingGuide/PatchSystems#Patch%20Tagging%20Guidelines

review: Needs Fixing

[Barry Warsaw (barry)]

Done. Updated branch is pushed.

[lp:~barry/ubuntu/natty/libfsotransport/618809-ftbfs]

10. By Barry Warsaw on 2011-01-08

Add DEP3 patch headers

11. By Barry Warsaw on 2011-01-10

Update changelog

12. By Barry Warsaw on 2011-01-10

Update changelog.

[Artur Rona (ari-tczew)]

You are patching configure.c by 01-pkg-config-for-vala-0.10.patch, so please update debian/changelog:

  * 01-pkg-config-for-vala-0.10.patch, debian/control:
    - Transition from libvala-dev to libvala-0.10-dev. (LP: #618809)
  * debian/control:
    - Build-Depends on libtool since it's required for autoreconf.
  * debian/rules: Run autoreconf before building.
  * debian/patches/0002-update-autotools-files.patch:
    - Remove this patch since the files will get updated automatically
      by the new post-patches target in debian/rules.
      This latter is required for the libvala transition.

Please don't forget that sentence ends by dot.

You used wrong tag in patch and bad link:
Bug: https://bugs.launchpad.net/ubuntu/+source/libfsotransport/+bug/618809
should be:
Bug-Ubuntu: https://launchpad.net/bugs/618809

review: Needs Fixing

[lp:~barry/ubuntu/natty/libfsotransport/618809-ftbfs]

13. By Barry Warsaw on 2011-01-10

* 0003-pkg-config-for-vala-0.10.patch, debian/control:
* debian/control:
  - Build-Depends on libtool since it's required for autoreconf.
* debian/patches/0002-update-autotools-files.patch:
    by the new post-patches target in debian/rules.
    This latter is required for the libvala transition.

[Barry Warsaw (barry)]

> You are patching configure.c by 01-pkg-config-for-vala-0.10.patch, so please
> update debian/changelog:
>
> * 01-pkg-config-for-vala-0.10.patch, debian/control:
> - Transition from libvala-dev to libvala-0.10-dev. (LP: #618809)
> * debian/control:
> - Build-Depends on libtool since it's required for autoreconf.
> * debian/rules: Run autoreconf before building.
> * debian/patches/0002-update-autotools-files.patch:
> - Remove this patch since the files will get updated automatically
> by the new post-patches target in debian/rules.
> This latter is required for the libvala transition.
>
> Please don't forget that sentence ends by dot.
>
> You used wrong tag in patch and bad link:
> Bug: https://bugs.launchpad.net/ubuntu/+source/libfsotransport/+bug/618809
> should be:
> Bug-Ubuntu: https://launchpad.net/bugs/618809

Fixed and pushed.

[lp:~barry/ubuntu/natty/libfsotransport/618809-ftbfs]

14. By Barry Warsaw on 2011-01-10

Update bug tag.

[Artur Rona (ari-tczew)]

OK now looks good. I'll upload it tomorrow.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-11 22:56:52 +0000
+++ debian/changelog	2011-01-10 22:50:26 +0000
@@ -1,3 +1,17 @@
+libfsotransport (0.9.5.9+git20100507-2ubuntu2) natty; urgency=low
+
+  * 0003-pkg-config-for-vala-0.10.patch, debian/control:
+    - Transition from libvala-dev to libvala-0.10-dev. (LP: #618809)
+  * debian/control:
+    - Build-Depends on libtool since it's required for autoreconf.
+  * debian/rules: Run autoreconf before building.
+  * debian/patches/0002-update-autotools-files.patch:
+    - Remove this patch since the files will get updated automatically
+      by the new post-patches target in debian/rules.
+      This latter is required for the libvala transition.
+
+ -- Barry Warsaw <[e-mail]>  Mon, 10 Jan 2011 17:34:03 -0500
+
 libfsotransport (0.9.5.9+git20100507-2ubuntu1) maverick; urgency=low
 
   * Add build-depends on libtool to fix FTBFS

=== modified file 'debian/control'
--- debian/control	2010-09-11 22:56:52 +0000
+++ debian/control	2011-01-10 22:50:26 +0000
@@ -1,9 +1,10 @@
 Source: libfsotransport
 Priority: extra
-Maintainer: Debian FreeSmartphone.Org Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian FreeSmartphone.Org Team <[e-mail]>
 Uploaders: Heiko Stuebner <[e-mail]>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), cdbs, pkg-config, valac (>= 0.8.1), libvala-dev (>= 0.8.1), libglib2.0-dev, libfsobasics-dev (>= 0.9.0+git20100509), libgee-dev (>=0.5.0), libtool
+Build-Depends: debhelper (>= 7), cdbs, pkg-config, valac-0.10, libvala-0.10-dev, libglib2.0-dev, libfsobasics-dev (>= 0.9.0+git20100509), libgee-dev (>=0.5.0), libtool
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://freesmartphone.org/

=== removed file 'debian/patches/0002-update-autotools-files.patch'
--- debian/patches/0002-update-autotools-files.patch	2010-06-12 21:09:26 +0000
+++ debian/patches/0002-update-autotools-files.patch	1970-01-01 00:00:00 +0000
@@ -1,219 +0,0 @@
-From 6a45a53e982eabddf89643f17aa86e710e13aec0 Mon Sep 17 00:00:00 2001
-From: Heiko Stuebner <[e-mail]>
-Date: Sat, 12 Jun 2010 21:04:00 +0200
-Subject: [PATCH 2/2] update autotools files
-
----
- configure                |   67 ++++++++++++++++++++++++++++++++++++---------
- fsotransport/Makefile.in |    3 +-
- 2 files changed, 55 insertions(+), 15 deletions(-)
-
-diff --git a/configure b/configure
-index ca75747..4d7b0f1 100755
---- a/configure
-+++ b/configure
-@@ -747,6 +747,8 @@ ac_subst_vars='am__EXEEXT_FALSE
- am__EXEEXT_TRUE
- LTLIBOBJS
- LIBOBJS
-+FAST_BAUD_FALSE
-+FAST_BAUD_TRUE
- WANT_DEBUG_FALSE
- WANT_DEBUG_TRUE
- GLIB_LIBS
-@@ -874,6 +876,7 @@ enable_fast_install
- with_gnu_ld
- enable_libtool_lock
- enable_debug
-+enable_fast_baud
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1518,6 +1521,7 @@ Optional Features:
-                           optimize for fast installation [default=yes]
-   --disable-libtool-lock  avoid locking (might break parallel builds)
-   --enable-debug            Enable debug build (default=disabled)
-+  --disable-fast-baud     Disable fast baud rates
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -4959,13 +4963,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:4962: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:4966: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4965: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:4969: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4968: output\"" >&5)
-+  (eval echo "\"\$as_me:4972: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -6170,7 +6174,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6173 "configure"' > conftest.$ac_ext
-+  echo '#line 6177 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7428,11 +7432,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7431: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7435: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7435: \$? = $ac_status" >&5
-+   echo "$as_me:7439: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7767,11 +7771,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7770: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7774: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7774: \$? = $ac_status" >&5
-+   echo "$as_me:7778: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7872,11 +7876,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7875: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7879: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7879: \$? = $ac_status" >&5
-+   echo "$as_me:7883: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -7927,11 +7931,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7930: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7934: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7934: \$? = $ac_status" >&5
-+   echo "$as_me:7938: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10311,7 +10315,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10314 "configure"
-+#line 10318 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10407,7 +10411,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10410 "configure"
-+#line 10414 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11043,6 +11047,35 @@ else
- fi
- 
- 
-+# check for disabling of fast baud rates
-+# Check whether --enable-fast-baud was given.
-+if test "${enable_fast_baud+set}" = set; then :
-+  enableval=$enable_fast_baud; fastbaud="$enableval"
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+    #include <termios.h>
-+    int tspeed = B2500000 + B4000000;
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  fastbaud="yes"
-+else
-+  fastbaud="no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+ if test x"$fastbaud" = x"yes"; then
-+  FAST_BAUD_TRUE=
-+  FAST_BAUD_FALSE='#'
-+else
-+  FAST_BAUD_TRUE='#'
-+  FAST_BAUD_FALSE=
-+fi
-+
-+
- # git version
- GITV=`cat ../.git/refs/heads/master || echo "unknown"`
- 
-@@ -11172,6 +11205,10 @@ if test -z "${WANT_DEBUG_TRUE}" && test -z "${WANT_DEBUG_FALSE}"; then
-   as_fn_error "conditional \"WANT_DEBUG\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${FAST_BAUD_TRUE}" && test -z "${FAST_BAUD_FALSE}"; then
-+  as_fn_error "conditional \"FAST_BAUD\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_write_fail=0
-@@ -13396,6 +13433,8 @@ echo "Configuration Options:"
- echo
- echo "  debug build.............: $debug"
- echo
-+echo "  fast baud rates.........: $fastbaud"
-+echo
- echo "  prefix..................: $prefix"
- echo
- echo "------------------------------------------------------------------------"
-diff --git a/fsotransport/Makefile.in b/fsotransport/Makefile.in
-index b9d1a2b..aa95438 100644
---- a/fsotransport/Makefile.in
-+++ b/fsotransport/Makefile.in
-@@ -42,6 +42,7 @@ DIST_COMMON = $(dist_vapi_DATA) $(fsotransportinclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/Makefile.decl
- @WANT_DEBUG_TRUE@am__append_1 = -g -D DEBUG
-+@FAST_BAUD_TRUE@am__append_2 = -D FAST_BAUD
- subdir = fsotransport
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -255,7 +256,7 @@ AM_CPPFLAGS = \
- VALAC_ARGS = --basedir $(top_srcdir) --vapidir $(top_srcdir)/vapi \
- 	--pkg posix --pkg linux --pkg glib-2.0 --pkg gio-2.0 --pkg \
- 	gee-1.0 --pkg fsobasics-2.0 --header fsotransport.h --library \
--	fsotransport-2.0 $(am__append_1)
-+	fsotransport-2.0 $(am__append_1) $(am__append_2)
- @WANT_DEBUG_TRUE@AM_CFLAGS = -ggdb -O0
- BUILT_SOURCES = .vala.stamp
- lib_LTLIBRARIES = \
--- 
-1.7.1
-

=== added file 'debian/patches/0003-pkg-config-for-vala-0.10.patch'
--- debian/patches/0003-pkg-config-for-vala-0.10.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0003-pkg-config-for-vala-0.10.patch	2011-01-10 22:50:26 +0000
@@ -0,0 +1,15 @@
+From: Barry Warsaw <[e-mail]>
+Subject: Transition from libvala-dev to libvala-0.10-dev.
+Bug-Ubuntu: https://launchpad.net/bugs/618809
+diff -Nur -x '*.orig' -x '*~' 618809-ftbfs//configure.ac 618809-ftbfs.new//configure.ac
+--- 618809-ftbfs//configure.ac	2011-01-07 17:52:26.978142531 -0500
++++ 618809-ftbfs.new//configure.ac	2011-01-07 17:52:39.609021768 -0500
+@@ -25,7 +25,7 @@
+ AC_PATH_PROG(VALAC, valac, valac)
+ AC_SUBST(VALAC)
+ PKG_CHECK_MODULES(VALA,
+-  vala-1.0 >= $VALA_REQUIRED)
++  vala-0.10 >= $VALA_REQUIRED)
+ 
+ # glib and friends
+ PKG_CHECK_MODULES(GLIB,

=== modified file 'debian/rules'
--- debian/rules	2009-09-23 20:50:12 +0000
+++ debian/rules	2011-01-10 22:50:26 +0000
@@ -7,4 +7,7 @@
 DEB_DH_STRIP_ARGS := --dbg-package=libfsotransport-dbg
 DEB_DH_MAKESHLIBS_ARGS_libfsotransport0 := -V"libfsotransport0 (>= $(DEB_UPSTREAM_VERSION))"
 
-DEB_INSTALL_DOCS_ALL =
\ No newline at end of file
+DEB_INSTALL_DOCS_ALL =
+
+post-patches::
+	autoreconf -f -i -v