r28780 - in /desktop/experimental/cheese/debian: changelog control patches/0002-fix-linking.patch patches/series watch

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Fri Jul 8 08:47:43 UTC 2011 

Author: bigon
Date: Fri Jul  8 08:47:42 2011
New Revision: 28780

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28780
Log:
* debian/patches/0002-fix-linking.patch: Add missing library to fix linking
* debian/watch:
  - Switch to .bz2 tarballs.
  - Bump version to 3

Added:
    desktop/experimental/cheese/debian/patches/0002-fix-linking.patch
Modified:
    desktop/experimental/cheese/debian/changelog
    desktop/experimental/cheese/debian/control
    desktop/experimental/cheese/debian/patches/series
    desktop/experimental/cheese/debian/watch

Modified: desktop/experimental/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/changelog?rev=28780&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/changelog [utf-8] (original)
+++ desktop/experimental/cheese/debian/changelog [utf-8] Fri Jul  8 08:47:42 2011
@@ -2,8 +2,12 @@
 
   * debian/control:
     - Change gir1.2-cheese-3.0 Section to libs
-
- -- Laurent Bigonville <bigon at debian.org>  Sat, 25 Jun 2011 17:19:41 +0200
+  * debian/patches/0002-fix-linking.patch: Add missing library to fix linking
+  * debian/watch:
+    - Switch to .bz2 tarballs.
+    - Bump version to 3
+
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 08 Jul 2011 10:22:23 +0200
 
 cheese (3.0.1-1) experimental; urgency=low
 

Modified: desktop/experimental/cheese/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/control?rev=28780&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/control [utf-8] (original)
+++ desktop/experimental/cheese/debian/control [utf-8] Fri Jul  8 08:47:42 2011
@@ -145,7 +145,7 @@
 
 Package: gir1.2-cheese-3.0
 Architecture: any
-Section: libdevel
+Section: libs
 Depends: ${misc:Depends},
          ${gir:Depends}
 Description: tool to take pictures and videos from your webcam - gir bindings

Added: desktop/experimental/cheese/debian/patches/0002-fix-linking.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/patches/0002-fix-linking.patch?rev=28780&op=file
==============================================================================
--- desktop/experimental/cheese/debian/patches/0002-fix-linking.patch (added)
+++ desktop/experimental/cheese/debian/patches/0002-fix-linking.patch [utf-8] Fri Jul  8 08:47:42 2011
@@ -1,0 +1,100 @@
+From 3fd67a0a6221020beec1fb04048d8d36aba347c5 Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold <thomasbechtold at jpberlin.de>
+Date: Sun, 15 May 2011 16:18:51 +0000
+Subject: add gio-2.0 and x11 to PKG_CHECK_MODULES
+
+---
+--- a/configure.ac
++++ b/configure.ac
+@@ -137,6 +137,8 @@
+ 
+ PKG_CHECK_MODULES(CHEESE, \ 
+   glib-2.0 >= $GLIB_REQUIRED \
++  gio-2.0 >= $GIO_REQUIRED \
++  x11 \
+   gobject-2.0 >= $GOBJECT_REQUIRED \
+   gdk-pixbuf-2.0 \
+   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
+--- a/configure
++++ b/configure
+@@ -15145,6 +15145,8 @@
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
+   glib-2.0 >= \$GLIB_REQUIRED \\
++  gio-2.0 >= \$GIO_REQUIRED \\
++  x11 \\
+   gobject-2.0 >= \$GOBJECT_REQUIRED \\
+   gdk-pixbuf-2.0 \\
+   gstreamer-0.10 >= \$GSTREAMER_REQUIRED \\
+@@ -15158,6 +15160,8 @@
+   \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "\
+   glib-2.0 >= $GLIB_REQUIRED \
++  gio-2.0 >= $GIO_REQUIRED \
++  x11 \
+   gobject-2.0 >= $GOBJECT_REQUIRED \
+   gdk-pixbuf-2.0 \
+   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
+@@ -15174,6 +15178,8 @@
+   test $ac_status = 0; }; then
+   pkg_cv_CHEESE_CFLAGS=`$PKG_CONFIG --cflags "\
+   glib-2.0 >= $GLIB_REQUIRED \
++  gio-2.0 >= $GIO_REQUIRED \
++  x11 \
+   gobject-2.0 >= $GOBJECT_REQUIRED \
+   gdk-pixbuf-2.0 \
+   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
+@@ -15197,6 +15203,8 @@
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
+   glib-2.0 >= \$GLIB_REQUIRED \\
++  gio-2.0 >= \$GIO_REQUIRED \\
++  x11 \\
+   gobject-2.0 >= \$GOBJECT_REQUIRED \\
+   gdk-pixbuf-2.0 \\
+   gstreamer-0.10 >= \$GSTREAMER_REQUIRED \\
+@@ -15210,6 +15218,8 @@
+   \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "\
+   glib-2.0 >= $GLIB_REQUIRED \
++  gio-2.0 >= $GIO_REQUIRED \
++  x11 \
+   gobject-2.0 >= $GOBJECT_REQUIRED \
+   gdk-pixbuf-2.0 \
+   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
+@@ -15226,6 +15236,8 @@
+   test $ac_status = 0; }; then
+   pkg_cv_CHEESE_LIBS=`$PKG_CONFIG --libs "\
+   glib-2.0 >= $GLIB_REQUIRED \
++  gio-2.0 >= $GIO_REQUIRED \
++  x11 \
+   gobject-2.0 >= $GOBJECT_REQUIRED \
+   gdk-pixbuf-2.0 \
+   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
+@@ -15258,6 +15270,8 @@
+         if test $_pkg_short_errors_supported = yes; then
+ 	        CHEESE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
+   glib-2.0 >= $GLIB_REQUIRED \
++  gio-2.0 >= $GIO_REQUIRED \
++  x11 \
+   gobject-2.0 >= $GOBJECT_REQUIRED \
+   gdk-pixbuf-2.0 \
+   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
+@@ -15272,6 +15286,8 @@
+         else
+ 	        CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
+   glib-2.0 >= $GLIB_REQUIRED \
++  gio-2.0 >= $GIO_REQUIRED \
++  x11 \
+   gobject-2.0 >= $GOBJECT_REQUIRED \
+   gdk-pixbuf-2.0 \
+   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
+@@ -15289,6 +15305,8 @@
+ 
+ 	as_fn_error $? "Package requirements (\
+   glib-2.0 >= $GLIB_REQUIRED \
++  gio-2.0 >= $GIO_REQUIRED \
++  x11 \
+   gobject-2.0 >= $GOBJECT_REQUIRED \
+   gdk-pixbuf-2.0 \
+   gstreamer-0.10 >= $GSTREAMER_REQUIRED \

Modified: desktop/experimental/cheese/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/patches/series?rev=28780&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/patches/series [utf-8] (original)
+++ desktop/experimental/cheese/debian/patches/series [utf-8] Fri Jul  8 08:47:42 2011
@@ -1,2 +1,3 @@
 0001-fix-pc-file.patch
+0002-fix-linking.patch
 99_ltmain_as-needed.patch

Modified: desktop/experimental/cheese/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/watch?rev=28780&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/watch [utf-8] (original)
+++ desktop/experimental/cheese/debian/watch [utf-8] Fri Jul  8 08:47:42 2011
@@ -1,2 +1,2 @@
-version=2
-http://ftp.gnome.org/pub/gnome/sources/cheese/([\d\.]+)[02468]/cheese-([\d\.]+)\.tar\.gz
+version=3
+http://ftp.gnome.org/pub/gnome/sources/cheese/([\d\.]+)[02468]/cheese-([\d\.]+)\.tar\.bz2

More information about the pkg-gnome-commits mailing list