r43152 - in /desktop/experimental/cheese/debian: changelog patches/ patches/revert-appstream-usage.patch patches/series patches/using-fmod-link-libm.patch

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Sep 24 15:36:33 2014
New Revision: 43152

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43152
Log:
* New upstream release.
* Add debian/patches/revert-appstream-usage.patch
  - we don't have appstream-glib in Debian yet...
* Add debian/patches/using-fmod-link-libm.patch
  - libcheese-gtk now uses fmod and needs to link with libm
* Upload to unstable.

Added:
    desktop/experimental/cheese/debian/patches/
    desktop/experimental/cheese/debian/patches/revert-appstream-usage.patch
    desktop/experimental/cheese/debian/patches/series
    desktop/experimental/cheese/debian/patches/using-fmod-link-libm.patch
Modified:
    desktop/experimental/cheese/debian/changelog

Modified: desktop/experimental/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/changelog?rev=43152&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/changelog	[utf-8] (original)
+++ desktop/experimental/cheese/debian/changelog	[utf-8] Wed Sep 24 15:36:33 2014
@@ -1,3 +1,14 @@
+cheese (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add debian/patches/revert-appstream-usage.patch
+    - we don't have appstream-glib in Debian yet...
+  * Add debian/patches/using-fmod-link-libm.patch
+    - libcheese-gtk now uses fmod and needs to link with libm
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 24 Sep 2014 16:50:11 +0200
+
 cheese (3.13.90.1-1) experimental; urgency=medium
 
   * New upstream release

Added: desktop/experimental/cheese/debian/patches/revert-appstream-usage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/patches/revert-appstream-usage.patch?rev=43152&op=file
==============================================================================
--- desktop/experimental/cheese/debian/patches/revert-appstream-usage.patch	(added)
+++ desktop/experimental/cheese/debian/patches/revert-appstream-usage.patch	[utf-8] Wed Sep 24 15:36:33 2014
@@ -0,0 +1,43 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Revert back to using appdata
+
+This reverts upstream commit
+"Use APPSTREAM_XML instead of APPDATA_XML"
+
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -361,10 +361,10 @@ desktopdir = $(datadir)/applications
+ desktop_in_files = data/org.gnome.Cheese.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ 
+- at APPSTREAM_XML_RULES@
++ at APPDATA_XML_RULES@
+ @INTLTOOL_XML_RULE@
+-appstream_in_files = data/org.gnome.Cheese.appdata.xml.in
+-appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
++appdata_in_files = data/org.gnome.Cheese.appdata.xml.in
++appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
+ 
+ servicedir = $(datadir)/dbus-1/services
+ service_DATA = \
+@@ -537,7 +537,7 @@ dist_noinst_DATA = \
+ 	$(gsettings_SCHEMAS) \
+ 	$(noinst_gnome_camera_service_headers) \
+ 	$(noinst_resource_files) \
+-	$(appstream_in_files) \
++	$(appdata_in_files) \
+ 	data/org.gnome.Cheese.gresource.xml \
+ 	data/org.gnome.Camera.xml \
+ 	build-aux/test-driver \
+--- a/configure.ac
++++ b/configure.ac
+@@ -200,7 +200,7 @@ AM_CONDITIONAL([ENABLE_MAN], [test "x$have_manutils" = "xyes"])
+ YELP_HELP_INIT
+ 
+ # AppData
+-APPSTREAM_XML
++APPDATA_XML
+ 
+ GLIB_GSETTINGS
+ #*******************************************************************************

Added: desktop/experimental/cheese/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/patches/series?rev=43152&op=file
==============================================================================
--- desktop/experimental/cheese/debian/patches/series	(added)
+++ desktop/experimental/cheese/debian/patches/series	[utf-8] Wed Sep 24 15:36:33 2014
@@ -0,0 +1,2 @@
+using-fmod-link-libm.patch
+revert-appstream-usage.patch

Added: desktop/experimental/cheese/debian/patches/using-fmod-link-libm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/patches/using-fmod-link-libm.patch?rev=43152&op=file
==============================================================================
--- desktop/experimental/cheese/debian/patches/using-fmod-link-libm.patch	(added)
+++ desktop/experimental/cheese/debian/patches/using-fmod-link-libm.patch	[utf-8] Wed Sep 24 15:36:33 2014
@@ -0,0 +1,29 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Use LT_LIB_M to find the math library
+
+libcheese-gtk (sometimes?) needs to link with -lm
+to find the fmod function.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -87,6 +87,7 @@
+ 
+ libcheese_gtk_la_LIBADD = \
+ 	libcheese.la \
++	$(LIBM) \
+ 	$(CHEESE_LIBS) \
+ 	$(CHEESE_GTK_LIBS)
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,10 @@
+ LT_PREREQ([2.2])
+ LT_INIT([disable-static])
+ 
++# Find an appropriate libm, for fmod()
++LT_LIB_M
++AC_SUBST(LIBM)
++
+ PKG_PROG_PKG_CONFIG([0.24])
+ 
+ AC_SUBST([CHEESE_WFLAGS], ["-Wall -DGSEAL_ENABLE"])