Merge lp:~cyphermox/ubuntu/natty/lunar-applet/lp708721 into lp:ubuntu/natty/lunar-applet

[Mathieu Trudel-Lapierre]

[Artur Rona (ari-tczew)]

Thank you for your time and efforts making Ubuntu better! However, there are some issues:

1) You can use target UNRELEASED when you want to merge into branch hosted in Vcs-Bzr field from debian/control, but lunar-applet is not hosted on lp:ubuntu/lunar-applet so please update target to natty.

2) Please improve tag Forwarded:
Forwarded: yes, http://code.google.com/p/lunar-applet/issues/detail?id=9

3) Please forward your patch to Debian and add tag to patch:
Bug-Debian: http://bugs.debian.org/XXXXXX
and in debian/changelog use: (LP: #708721, Closes: #XXXXXX)

review: Needs Fixing

[lp:~cyphermox/ubuntu/natty/lunar-applet/lp708721]

10. By Mathieu Trudel-Lapierre on 2011-01-28

Address Artur Rona's comments on merge req. 47680

[Mathieu Trudel-Lapierre (cyphermox)]

Hi Artur,

Thanks for the quick review!

I addressed most of your concerns:
 - Forwarded is updated in patch tags
 - Bug is forwarded to Debian and the relevant tag was added.

I also changed the target to natty as requested.

However, I did not add the Closes: tag to changelog, because I believe it will be added by the Debian maintainer once a fix is uploaded in Debian -- this will avoid having the entry twice in changelog, plus these entries will likely be lost in a future sync once the bug is corrected in Debian -- not to mention how this would not cause the bug to be closed in the Debian tracker anyway.

What do you think?

[Artur Rona (ari-tczew)]

1) We preffer to use short URLs in DEP3 tags, so please use:
Bug-Debian: http://bugs.debian.org/611327

2) Adding Closes: # to changelog in Ubuntu is new method to quick say that change has been forwarded in Debian. It's useful during merge from Debian to quick check both changelogs. If merger sees the same Closes in Debian, it's a quick symbol to know that change could be dropped.

3) Please run update-maintainer script from ubuntu-dev-tools package.
https://wiki.ubuntu.com/DebianMaintainerField

review: Needs Fixing

[lp:~cyphermox/ubuntu/natty/lunar-applet/lp708721]

11. By Mathieu Trudel-Lapierre on 2011-01-28

Further fixes to packaging for merge 47680.

[Mathieu Trudel-Lapierre (cyphermox)]

Updated, thanks!

For my personal knowledge, could you please give me links to where the preference for short urls is documented, as well as for adding Closes: # ?

[Artur Rona (ari-tczew)]

On DEP3 tags page you can find an example of Bug-Debian on paragraph "Sample DEP-3 compliant headers". I have to add some examples or short URLs on https://wiki.ubuntu.com/PackagingGuide/PatchSystems#Patch%20Tagging%20Guidelines

Closes: # in debian/changelog is not yet documented on wiki, but will be.

Now looks good. Thank you for your contribution!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-26 12:03:15 +0000
+++ debian/changelog	2011-01-28 13:11:48 +0000
@@ -1,3 +1,12 @@
+lunar-applet (2.0-2ubuntu1) natty; urgency=low
+
+  * debian/patches/e-source-get-color-replacement.patch: fix FTBFS against new
+    evolution library API: replace the call to e_source_get_color() with a
+    simpler e_source_peek_color_spec() which does the same thing.
+    (LP: #708721, Closes: #611327)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 27 Jan 2011 23:36:16 -0500
+
 lunar-applet (2.0-2build2) natty; urgency=low
 
   * No-change upload to build against current evolution library ABI.

=== modified file 'debian/control'
--- debian/control	2010-05-12 22:47:40 +0000
+++ debian/control	2011-01-28 13:11:48 +0000
@@ -1,7 +1,8 @@
 Source: lunar-applet
 Section: gnome
 Priority: optional
-Maintainer: LI Daobing <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: LI Daobing <[e-mail]>
 Uploaders: Anthony Fok <[e-mail]>
 Build-Depends: cdbs, debhelper (>= 5.0.51~), autotools-dev, intltool (>= 0.35.0),
  libpanel-applet2-dev, libecal1.2-dev, libedataserverui1.2-dev, 

=== added file 'debian/patches/e-source-get-color-replacement.patch'
--- debian/patches/e-source-get-color-replacement.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/e-source-get-color-replacement.patch	2011-01-28 13:11:48 +0000
@@ -0,0 +1,34 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Replace the use of deprecated e_source_get_color().
+Bug-Ubuntu: http://launchpad.net/bugs/708721
+Bug-Debian: http://bugs.debian.org/611327
+Forwarded: yes, http://code.google.com/p/lunar-applet/issues/detail?id=9
+
+The e_source_get_color() call causes a FTBFS with evolution > 2.32, because
+it has been deprecated and then removed from the API. A simpler method for
+retrieving the hex color spec already existed and already returns NULL if there
+is no color set, so replacing most of the work done in get_source_color to
+just directly return a copy of what e_source_peak_color_spec returns makes
+sense.
+
+g_strdup kept to avoid unnecessary changes elsewhere in lunar-applet code. It
+will return NULL if e_source_peak_color_spec() returns NULL.
+
+Index: lunar-applet/src/calendar-client.c
+===================================================================
+--- lunar-applet.orig/src/calendar-client.c	2011-01-27 10:37:04.711822754 -0500
++++ lunar-applet/src/calendar-client.c	2011-01-27 10:42:00.467822754 -0500
+@@ -672,11 +672,8 @@
+   g_return_val_if_fail (E_IS_CAL (esource), NULL);
+ 
+   source = e_cal_get_source (esource);
+-  if (e_source_get_color (source, &color)) {
+-    return g_strdup_printf ("%06x", color);
+-  }
+-  
+-  return NULL;
++
++  return g_strdup (e_source_peek_color_spec (source));
+ }
+ 
+ static inline int

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-05-12 22:47:40 +0000
+++ debian/patches/series	2011-01-28 13:11:48 +0000
@@ -1,1 +1,2 @@
 debian-changes-2.0-2
+e-source-get-color-replacement.patch