Merge lp:~barry/ubuntu/natty/fso-misc-vapi/618809-ftbfs into lp:ubuntu/natty/fso-misc-vapi

[Barry Warsaw]

I think I'm getting the hang of this. Another fix for the libvala transition.

[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/fso-misc-vapi/618809-ftbfs]

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

[lp:~barry/ubuntu/natty/fso-misc-vapi/618809-ftbfs]

7. By Barry Warsaw on 2011-01-09

* Transition from libvala-dev to libvala-0.10-dev via patch to
  configure.ac (LP: #618809)
* debian/rules: Run autoreconf after patching configure.ac.

[Barry Warsaw (barry)]

Hi Artur,

I don't particularly like editing configure.ac in place since that comes from upstream. Isn't it better to use a patch system to change upstream files instead? I did however make the changelog entry a bit more descriptive. Thanks.

[lp:~barry/ubuntu/natty/fso-misc-vapi/618809-ftbfs]

8. By Barry Warsaw on 2011-01-09

Use short url for bug.

[Barry Warsaw (barry)]

Hi Artur. I chatted with Colin about it and I get the rationale for not wanting to introduce a patch system when there isn't one previously. I'll update this and the other related branches to edit configure.ac in place. Thanks. Please watch for branch updates.

[lp:~barry/ubuntu/natty/fso-misc-vapi/618809-ftbfs]

9. By Barry Warsaw on 2011-01-10

Do not introduce a patch system to complete the vala transition.
 * Edit configure.ac in place.
 * Still run autoreconf before building.

10. By Barry Warsaw on 2011-01-10

Update changelog.

[Barry Warsaw (barry)]

Branch updated.

[Artur Rona (ari-tczew)]

Comment to all your branches since don't have enough time to comment at all:

We should describe in debian/changelog in detail, so I suggest:

 * 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 to run autoreconf.
 * debian/rules: Run autoreconf before building.

Adjust it to all and I'll sponsor.

review: Needs Fixing

[lp:~barry/ubuntu/natty/fso-misc-vapi/618809-ftbfs]

11. By Barry Warsaw on 2011-01-10

Updated changelog.

12. By Barry Warsaw on 2011-01-10

Do not add debian/patches/

[Barry Warsaw (barry)]

I've removed the patchsys from all packages that didn't have them previously (though mdbus and libfsotransport did, so I preserved these changes as patches).

All packages have gotten an updated changelog. All branches have been pushed. Ready to go:

* fso-misc-vapi
* libfsoframework
* fso-glib
* libfsoresource
* libfsotransport
* mdbus
* fso-usaged

Thanks for your patience, help, and sponsorship! This should finally close bug 618809 :)

[lp:~barry/ubuntu/natty/fso-misc-vapi/618809-ftbfs]

13. By Barry Warsaw on 2011-01-10

Update changelog.

[Artur Rona (ari-tczew)]

Now looks good.
Thank you for your contribution!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2009-09-19 19:59:10 +0000
+++ configure.ac	2011-01-10 21:12:46 +0000
@@ -24,7 +24,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	2009-09-19 19:59:10 +0000
+++ debian/changelog	2011-01-10 21:12:46 +0000
@@ -1,3 +1,13 @@
+fso-misc-vapi (0.5.0-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 16:06:58 -0500
+
 fso-misc-vapi (0.5.0-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2009-09-19 19:59:10 +0000
+++ debian/control	2011-01-10 21:12:46 +0000
@@ -1,10 +1,11 @@
 Source: fso-misc-vapi
 Section: libdevel
 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, autotools-dev, valac (>= 0.7.6), libvala-dev, libasound2-dev, libglib2.0-dev
+Build-Depends: debhelper (>= 7), cdbs, autotools-dev, libtool, valac-0.10, libvala-0.10-dev, libasound2-dev, libglib2.0-dev
 Standards-Version: 3.8.3
 Homepage: http://freesmartphone.org/
 Vcs-Git: git://git.debian.org/git/pkg-fso/fso-misc-vapi.git

=== modified file 'debian/rules'
--- debian/rules	2009-08-20 19:59:10 +0000
+++ debian/rules	2011-01-10 21:12:46 +0000
@@ -4,3 +4,6 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_INSTALL_DOCS_ALL =
+
+pre-build::
+	autoreconf -f -i -v