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

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

5. By Barry Warsaw on 2011-01-08

Add DEP3 patch headers

[Artur Rona (ari-tczew)]

I noticed that there is no patch system. You can check it in source directory via command 'what-patch'. You should patch configure.ac directly. Automatically, there is no place to adding DEP3 tags. Sorry for that, I didn't check before whether patch system is used. Please also drop simple-patchsys.mk from d/rules.

However, would be nice to be more verbose in debian/changelog, I suggest:

* debian/control, configure.ac:
  - Transition from libvala-dev to libvala-0.10-dev. (LP: #618809)
* debian/rules: Run autoreconf due to touched configure.ac.

review: Needs Fixing

[Barry Warsaw (barry)]

As mentioned in the fso-misc-vapi merge proposal, I don't like editing upstream file in place, so I'd prefer to keep the patch. I did update the changelog. Thanks.

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

6. By Barry Warsaw on 2011-01-09

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

7. By Barry Warsaw on 2011-01-10

Don't introduce a patch system to fix LP: #618809.

8. By Barry Warsaw on 2011-01-10

Update changelog.

[Artur Rona (ari-tczew)]

In debian/changelog is mistake:
25 + * e

review: Needs Fixing

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

9. By Barry Warsaw on 2011-01-10

Update changelog.

[Barry Warsaw (barry)]

> In debian/changelog is mistake:
> 25 + * e

Fixed & pushed.

[Artur Rona (ari-tczew)]

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

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-05-18 21:05:49 +0000
+++ configure.ac	2011-01-10 22:43:17 +0000
@@ -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/changelog'
--- debian/changelog	2010-05-18 21:05:49 +0000
+++ debian/changelog	2011-01-10 22:43:17 +0000
@@ -1,3 +1,13 @@
+libfsoresource (0.1.1~git20100517-1ubuntu1) natty; urgency=low
+
+  * configure.ac, 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:40:32 -0500
+
 libfsoresource (0.1.1~git20100517-1) unstable; urgency=low
 
   * New upstream snapshot

=== modified file 'debian/control'
--- debian/control	2010-05-18 21:05:49 +0000
+++ debian/control	2011-01-10 22:43:17 +0000
@@ -1,6 +1,7 @@
 Source: libfsoresource
 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: cdbs,
@@ -9,9 +10,10 @@
                libfso-glib-dev (>= 2010.05.11.2),
                libfsobasics-dev (>= 0.9.0+git20100304),
                libfsoframework-dev (>= 0.2.4+git20100222),
-               libvala-dev (>= 0.7.10),
+               libvala-0.10-dev,
                pkg-config,
-               valac (>= 0.7.10)
+               valac-0.10,
+               libtool
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://wiki.freesmartphone.org/index.php/Implementations/libfsoresource

=== modified file 'debian/rules'
--- debian/rules	2010-05-18 21:05:49 +0000
+++ debian/rules	2011-01-10 22:43:17 +0000
@@ -7,3 +7,6 @@
 DEB_DH_MAKESHLIBS_ARGS_libfsoresource0 := -V"libfsoresource0 (>= $(DEB_UPSTREAM_VERSION))"
 
 DEB_INSTALL_DOCS_ALL =
+
+pre-build::
+	autoreconf -f -i -v