Merge lp:~jfi/ubuntu/trusty/psensor/fix-LP1304108 into lp:ubuntu/trusty/psensor

[Jean-Philippe Orsini]

Added debian/patch/remove_gtk_deprecation_warnings.patch to remove GTK deprecation warnings to avoid build failure due to deprecation of GtkAction. (Closes LP: 1304180).

Since recent GTK releases, GtkActionEntry and other related stuff are deprecated.
This patch remove the compilation flag -DGTK_DISABLE_DEPRECATED to avoid GTK deprecation warnings which are considered as errors by psensor build leading to a FTBFS on Trusty.

[lp:~jfi/ubuntu/trusty/psensor/fix-LP1304108]

23. By Jean-Philippe Orsini on 2014-04-09

fixed changelog syntax

24. By Jean-Philippe Orsini on 2014-04-09

Fixed changelog

[Martin Pitt (pitti)]

Uploaded, without the "Merge..." bits from changelog. Sorry for the FTBFS emails from your other upload (icon size fix), I didn't see this branch before.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-27 21:44:21 +0000
+++ debian/changelog	2014-04-09 07:47:33 +0000
@@ -1,3 +1,14 @@
+psensor (0.8.0.3-1ubuntu2) trusty; urgency=medium
+
+  * Merge from Debian unstable, remaining Ubuntu changes:
+   - Build depend on nvidia-settings build-dep on i386 and amd64.
+   - Build depend on libunity-dev and libappindicator3-dev for Unity support.
+  * Add remove_gtk_deprecation_warnings.patch: removed GTK deprecation
+    warnings to avoid build failure due to deprecation of GtkAction.
+    (LP: #1304108).
+
+ -- Jean-Philippe Orsini <[e-mail]>  Tue, 08 Apr 2014 02:29:27 +0200
+
 psensor (0.8.0.3-1ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable, remaining Ubuntu changes:

=== added directory 'debian/patches'
=== added file 'debian/patches/remove_gtk_deprecation_warnings.patch'
--- debian/patches/remove_gtk_deprecation_warnings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/remove_gtk_deprecation_warnings.patch	2014-04-09 07:47:33 +0000
@@ -0,0 +1,13 @@
+Index: psensor-0.8.0.3/configure.ac
+===================================================================
+--- psensor-0.8.0.3.orig/configure.ac	2013-05-27 08:44:26.000000000 +0200
++++ psensor-0.8.0.3/configure.ac	2014-04-08 02:28:49.939966436 +0200
+@@ -70,7 +70,7 @@
+ GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
+ # ensure that no gtk deprecated symbols are used
+ GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED "
+-GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
++# GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
+ # ensure use of accessors
+ GTK_CFLAGS+=" -DGSEAL_ENABLE "
+ AC_SUBST(GTK_CFLAGS)

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-04-09 07:47:33 +0000
@@ -0,0 +1,1 @@
+remove_gtk_deprecation_warnings.patch