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

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

5. By Barry Warsaw on 2011-01-08

Add DEP3 patch headers

[Artur Rona (ari-tczew)]

Please drop simple-patchsys.mk from d/rules since mdbus uses quilt. You can check patch system via command 'what-patch' in source directory.

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

[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

[Artur Rona (ari-tczew)]

Sorry, my 2nd comment was done wrong. It's caused reviewing your several patches and late time.

[Barry Warsaw (barry)]

patch converted to quilt. as mentioned in fso-misc-vapi I don't like editing upstream files in place. changelog updated. Thanks!

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

6. By Barry Warsaw on 2011-01-09

Patch system is quilt.

7. By Barry Warsaw on 2011-01-09

patch-sys is quilt.

8. By Barry Warsaw on 2011-01-09

debian/rules: Run autoreconf after patching configure.ac

9. By Barry Warsaw on 2011-01-10

Update changelog

10. By Barry Warsaw on 2011-01-10

Update changelog.

[Artur Rona (ari-tczew)]

Eveything looks OK, beside tag 'Bug' which should be 'Bug-Ubuntu'. However, it's not major issue so I'm accepting your changes.
Thank you for your contribution!

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-01-10 21:14:16 +0000
@@ -0,0 +1,1 @@
+.pc

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-01 01:40:51 +0000
+++ debian/changelog	2011-01-10 21:14:16 +0000
@@ -1,3 +1,11 @@
+mdbus (2.0.2-1ubuntu1) natty; urgency=low
+
+  * configure.ac, debian/control:
+    - Transition from libvala-dev to libvala-0.10-dev. (LP: #618809)
+  * debian/rules: Run autoreconf before building.
+
+ -- Barry Warsaw <[e-mail]>  Mon, 10 Jan 2011 16:10:01 -0500
+
 mdbus (2.0.2-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-08-01 01:40:51 +0000
+++ debian/control	2011-01-10 21:14:16 +0000
@@ -1,7 +1,8 @@
 Source: mdbus
 Section: misc
 Priority: extra
-Maintainer: Debian FreeSmartphone.Org Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian FreeSmartphone.Org Team <[e-mail]>
 Uploaders: Sebastian Reichel <[e-mail]>
 DM-Upload-Allowed: yes
 Build-Depends: autoconf,
@@ -14,8 +15,8 @@
                libglib2.0-dev (>= 2.18.0),
                libtool,
                libreadline-dev,
-               libvala-dev (>= 0.8),
-               valac (>= 0.8)
+               libvala-0.10-dev,
+               valac-0.10
 Standards-Version: 3.9.1
 Homepage: http://www.freesmartphone.org
 Vcs-Git: git://git.debian.org/pkg-fso/mdbus.git

=== added directory 'debian/patches'
=== added file 'debian/patches/pkg-config-for-vala-0.10.patch'
--- debian/patches/pkg-config-for-vala-0.10.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/pkg-config-for-vala-0.10.patch	2011-01-10 21:14:16 +0000
@@ -0,0 +1,14 @@
+From: Barry Warsaw <[e-mail]>
+Subject: Transition from libvala-dev to libvala-0.10-dev.
+Bug: https://launchpad.net/bugs/618809
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@
+ 
+ # vala
+ PKG_CHECK_MODULES(VALA,
+-  vala-1.0 >= $VALA_REQUIRED)
++  vala-0.10 >= $VALA_REQUIRED)
+ 
+ # glib and friends
+ PKG_CHECK_MODULES(GLIB,

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-01-10 21:14:16 +0000
@@ -0,0 +1,1 @@
+pkg-config-for-vala-0.10.patch

=== modified file 'debian/rules'
--- debian/rules	2010-05-29 03:17:37 +0000
+++ debian/rules	2011-01-10 21:14:16 +0000
@@ -17,3 +17,6 @@
 binary-install/mdbus2::
 	# remove empty changelog
 	rm -f debian/mdbus2/usr/share/doc/mdbus2/changelog
+
+post-patches::
+	autoreconf -f -i -v