tags 673812 + pending
thanks

Dear maintainer,

I've prepared an NMU for openfetion (versioned as 2.2.1-3.2) and
uploaded it without delay as discussed earlier.

Regards
Evgeni
diff -Nru openfetion-2.2.1/debian/changelog openfetion-2.2.1/debian/changelog
--- openfetion-2.2.1/debian/changelog	2012-02-26 09:51:34.000000000 +0100
+++ openfetion-2.2.1/debian/changelog	2012-05-21 22:12:43.000000000 +0200
@@ -1,3 +1,13 @@
+openfetion (2.2.1-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update 02-indicate-gtk-0.6.patch for libindicate-gtk-0.7.
+    Rename it to 02-indicate-gtk-0.7.patch
+    Closes: #673812
+  * Tighten libindicate-gtk-dev Build-Dep to >= 0.6.90.
+
+ -- Evgeni Golov <evg...@debian.org>  Tue, 15 May 2012 17:59:59 +0200
+
 openfetion (2.2.1-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru openfetion-2.2.1/debian/control openfetion-2.2.1/debian/control
--- openfetion-2.2.1/debian/control	2011-11-18 16:08:52.000000000 +0100
+++ openfetion-2.2.1/debian/control	2012-05-21 22:12:07.000000000 +0200
@@ -4,7 +4,7 @@
 Maintainer: Aron Xu <a...@debian.org>
 Uploaders: Anthony Fok <f...@debian.org>, Asias He <asias.he...@gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), cmake, pkg-config, libofetion-dev (>= 2.2.0), libgtk2.0-dev, libnotify-dev, libgstreamer0.10-dev, libxss-dev, libnm-glib-dev [linux-any], intltool (>= 0.40.0), gettext, libssl-dev, libxml2-dev, libsqlite3-dev, libindicate-gtk-dev, libindicator-dev
+Build-Depends: debhelper (>= 7.0.50~), cmake, pkg-config, libofetion-dev (>= 2.2.0), libgtk2.0-dev, libnotify-dev, libgstreamer0.10-dev, libxss-dev, libnm-glib-dev [linux-any], intltool (>= 0.40.0), gettext, libssl-dev, libxml2-dev, libsqlite3-dev, libindicate-gtk-dev (>= 0.6.90), libindicator-dev
 Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/ofetion/
 
diff -Nru openfetion-2.2.1/debian/patches/02-indicate-gtk-0.6.patch openfetion-2.2.1/debian/patches/02-indicate-gtk-0.6.patch
--- openfetion-2.2.1/debian/patches/02-indicate-gtk-0.6.patch	2012-02-26 09:57:48.000000000 +0100
+++ openfetion-2.2.1/debian/patches/02-indicate-gtk-0.6.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-From: Evgeni Golov <evg...@debian.org>
-Debian-Bug: http://bugs.debian.org/660773
-Last-Update: 2012-02-26
-Subject: port openfetion to new libindicate-gtk 0.6
- * change the module to check via pkg-config to libinficate-gtk-0.6
- * use indicate_gtk_indicator_set_property_icon instead of
-   indicate_indicator_set_property_icon
-
-Index: openfetion-2.2.1/CMakeLists.txt
-===================================================================
---- openfetion-2.2.1.orig/CMakeLists.txt	2011-05-09 10:14:28.000000000 +0200
-+++ openfetion-2.2.1/CMakeLists.txt	2012-02-20 23:25:04.025643825 +0100
-@@ -82,7 +82,7 @@
- if(WITH_INDICATE)
- 	pkg_check_modules(INDICATE indicate)
- 	pkg_check_modules(INDICATE_GTK indicate-gtk)
--	pkg_check_modules(INDICATE_GTK_NEW indicate-gtk-0.5)
-+	pkg_check_modules(INDICATE_GTK_NEW indicate-gtk-0.6)
- endif(WITH_INDICATE)
- 
- ##########################################################################
-Index: openfetion-2.2.1/src/fx_main.c
-===================================================================
---- openfetion-2.2.1.orig/src/fx_main.c	2011-05-09 10:14:28.000000000 +0200
-+++ openfetion-2.2.1/src/fx_main.c	2012-02-20 23:33:23.165322890 +0100
-@@ -692,7 +692,7 @@
- 	/* set icon */
- 	snprintf(portrait, sizeof(portrait) - 1, "%s/%s.jpg", fxmain->user->config->iconPath, sid);
- 	pixbuf = gdk_pixbuf_new_from_file(portrait, NULL);
--	indicate_indicator_set_property_icon(indicator, INDICATE_INDICATOR_MESSAGES_PROP_ICON, pixbuf);
-+	indicate_gtk_indicator_set_property_icon(indicator, INDICATE_INDICATOR_MESSAGES_PROP_ICON, pixbuf);
- 	g_object_unref(pixbuf);
- 
- 	g_signal_connect(G_OBJECT(indicator), INDICATE_INDICATOR_SIGNAL_DISPLAY,
diff -Nru openfetion-2.2.1/debian/patches/02-indicate-gtk-0.7.patch openfetion-2.2.1/debian/patches/02-indicate-gtk-0.7.patch
--- openfetion-2.2.1/debian/patches/02-indicate-gtk-0.7.patch	1970-01-01 01:00:00.000000000 +0100
+++ openfetion-2.2.1/debian/patches/02-indicate-gtk-0.7.patch	2012-05-21 22:13:18.000000000 +0200
@@ -0,0 +1,34 @@
+From: Evgeni Golov <evg...@debian.org>
+Debian-Bug: http://bugs.debian.org/673812
+Last-Update: 2012-05-21
+Subject: port openfetion to new libindicate-gtk 0.7
+ * change the module to check via pkg-config to libindicate-gtk-0.7
+ * use indicate_gtk_indicator_set_property_icon instead of
+   indicate_indicator_set_property_icon
+
+Index: openfetion-2.2.1/CMakeLists.txt
+===================================================================
+--- openfetion-2.2.1.orig/CMakeLists.txt	2011-05-09 10:14:28.000000000 +0200
++++ openfetion-2.2.1/CMakeLists.txt	2012-05-15 17:59:09.000000000 +0200
+@@ -82,7 +82,7 @@
+ if(WITH_INDICATE)
+ 	pkg_check_modules(INDICATE indicate)
+ 	pkg_check_modules(INDICATE_GTK indicate-gtk)
+-	pkg_check_modules(INDICATE_GTK_NEW indicate-gtk-0.5)
++	pkg_check_modules(INDICATE_GTK_NEW indicate-gtk-0.7)
+ endif(WITH_INDICATE)
+ 
+ ##########################################################################
+Index: openfetion-2.2.1/src/fx_main.c
+===================================================================
+--- openfetion-2.2.1.orig/src/fx_main.c	2011-05-09 10:14:28.000000000 +0200
++++ openfetion-2.2.1/src/fx_main.c	2012-05-15 17:59:09.000000000 +0200
+@@ -692,7 +692,7 @@
+ 	/* set icon */
+ 	snprintf(portrait, sizeof(portrait) - 1, "%s/%s.jpg", fxmain->user->config->iconPath, sid);
+ 	pixbuf = gdk_pixbuf_new_from_file(portrait, NULL);
+-	indicate_indicator_set_property_icon(indicator, INDICATE_INDICATOR_MESSAGES_PROP_ICON, pixbuf);
++	indicate_gtk_indicator_set_property_icon(indicator, INDICATE_INDICATOR_MESSAGES_PROP_ICON, pixbuf);
+ 	g_object_unref(pixbuf);
+ 
+ 	g_signal_connect(G_OBJECT(indicator), INDICATE_INDICATOR_SIGNAL_DISPLAY,
diff -Nru openfetion-2.2.1/debian/patches/series openfetion-2.2.1/debian/patches/series
--- openfetion-2.2.1/debian/patches/series	2012-02-26 09:50:18.000000000 +0100
+++ openfetion-2.2.1/debian/patches/series	2012-05-21 19:00:19.000000000 +0200
@@ -1,2 +1,2 @@
 01-arrow_key_scroll.patch
-02-indicate-gtk-0.6.patch
+02-indicate-gtk-0.7.patch

Reply via email to