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

[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/libfsoframework/618809-ftbfs]

10. By Barry Warsaw on 2011-01-08

Add DEP3 patch headers

[Artur Rona (ari-tczew)]

Would be nice to be more verbose in debian/changelog, I suggest:
* Transition from libvala-dev to libvala-0.10-dev. (LP: #618809)
* debian/rules: Run autoreconf due to touched configure.ac.

Please use also short URL in tag Bug-Ubuntu instead Bug, e.g.:
Bug-Ubuntu: https://launchpad.net/bugs/618809

I'd like to see also tag 'Fowarded' to get clear whether patch needs to be forwarded or not.

review: Needs Fixing

[Barry Warsaw (barry)]

Done.

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

11. By Barry Warsaw on 2011-01-09

debian/rules: Run autoreconf after patching configure.ac.

12. By Barry Warsaw on 2011-01-10

Update changelog

13. 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.

Please don't forget that sentence ends by dot.

You used wrong tag in patch:
Bug: https://launchpad.net/bugs/618809
should be:
Bug-Ubuntu: https://launchpad.net/bugs/618809

review: Needs Fixing

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

14. By Barry Warsaw on 2011-01-10

Update changelog.

15. By Barry Warsaw on 2011-01-10

update patch

[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.
>
> Please don't forget that sentence ends by dot.
>
> You used wrong tag in patch:
> Bug: https://launchpad.net/bugs/618809
> should be:
> Bug-Ubuntu: https://launchpad.net/bugs/618809

Fixed & pushed.

[Artur Rona (ari-tczew)]

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

review: Approve

[Barry Warsaw (barry)]

Thanks Artur!

[Colin Watson (cjwatson)]

Barry wants to get these off his list :-), so I'll double-check this and the other related merges myself and deal with the uploads.

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-16 21:45:33 +0000
+++ debian/changelog	2011-01-10 22:48:21 +0000
@@ -1,3 +1,13 @@
+libfsoframework (0.2.4+git20100501-1ubuntu1) natty; urgency=low
+
+  * 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.
+
+ -- Barry Warsaw <[e-mail]>  Mon, 10 Jan 2011 17:42:12 -0500
+
 libfsoframework (0.2.4+git20100501-1) unstable; urgency=low
 
   * new upstream snapshot
 
=== modified file 'debian/control'
--- debian/control	2010-05-16 21:45:33 +0000
+++ debian/control	2011-01-10 22:48:21 +0000
@@ -1,9 +1,10 @@
 Source: libfsoframework
 Priority: extra
-Maintainer: Debian FreeSmartphone.Org Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian FreeSmartphone.Org Team <[e-mail]>
 DM-Upload-Allowed: yes
 Uploaders: Heiko Stuebner <[e-mail]>
-Build-Depends: debhelper (>= 7), cdbs, pkg-config, valac (>= 0.8.1), libvala-dev (>= 0.8.1), libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libfsobasics-dev (>= 0.9.0+git20100509), libasound2-dev
+Build-Depends: debhelper (>= 7), cdbs, pkg-config, valac-0.10, libvala-0.10-dev, libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libfsobasics-dev (>= 0.9.0+git20100509), libasound2-dev, libtool
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://freesmartphone.org/
 
=== added directory 'debian/patches'
=== added file 'debian/patches/01-pkg-config-for-vala-0.10.patch'
--- debian/patches/01-pkg-config-for-vala-0.10.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-pkg-config-for-vala-0.10.patch	2011-01-10 22:48:21 +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:36:05.784379000 -0500
++++ 618809-ftbfs.new//configure.ac	2011-01-07 17:37:02.103782822 -0500
+@@ -26,7 +26,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-04 09:00:23 +0000
+++ debian/rules	2011-01-10 22:48:21 +0000
@@ -8,3 +8,6 @@
 DEB_DH_MAKESHLIBS_ARGS_libfsoframework0 := -V"libfsoframework0 (>= $(DEB_UPSTREAM_VERSION))"
 
 DEB_INSTALL_DOCS_ALL =
+
+post-patches::
+	autoreconf -f -i -v