r33965 - in /desktop/unstable/cheese/debian: ./ patches/

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Sun Apr 1 15:29:00 UTC 2012 

Author: jordi
Date: Sun Apr  1 15:28:59 2012
New Revision: 33965

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33965
Log:
* New upstream release.
* Add explicit build dependency on pkg-config.
* Replace gnome-doc-utils with yelp-tools, for Mallard docs.
* Recommend nautilus-sendto.
* Rename lib files due to soname bumps.
* Update to debhelper v9.
* Bump Standards-Version to 3.9.3.
* Install cheese.h and cheese-gtk.h.
* Install help data from usr/share/help.
* FIXME: dropped symbols in libcheese3.

Added:
    desktop/unstable/cheese/debian/libcheese-gtk21.install
      - copied unchanged from r33934, desktop/unstable/cheese/debian/libcheese-gtk20.install
    desktop/unstable/cheese/debian/libcheese-gtk21.symbols
      - copied, changed from r33934, desktop/unstable/cheese/debian/libcheese-gtk20.symbols
    desktop/unstable/cheese/debian/libcheese3.install
      - copied unchanged from r33934, desktop/unstable/cheese/debian/libcheese1.install
    desktop/unstable/cheese/debian/libcheese3.symbols
      - copied, changed from r33934, desktop/unstable/cheese/debian/libcheese1.symbols
Removed:
    desktop/unstable/cheese/debian/libcheese-gtk20.install
    desktop/unstable/cheese/debian/libcheese-gtk20.symbols
    desktop/unstable/cheese/debian/libcheese1.install
    desktop/unstable/cheese/debian/libcheese1.symbols
Modified:
    desktop/unstable/cheese/debian/changelog
    desktop/unstable/cheese/debian/cheese-common.install
    desktop/unstable/cheese/debian/compat
    desktop/unstable/cheese/debian/control
    desktop/unstable/cheese/debian/control.in
    desktop/unstable/cheese/debian/libcheese-dev.install
    desktop/unstable/cheese/debian/libcheese-gtk-dev.install
    desktop/unstable/cheese/debian/patches/99_ltmain_as-needed.patch
    desktop/unstable/cheese/debian/rules

Modified: desktop/unstable/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/changelog?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/changelog [utf-8] (original)
+++ desktop/unstable/cheese/debian/changelog [utf-8] Sun Apr  1 15:28:59 2012
@@ -1,3 +1,18 @@
+cheese (3.4.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Add explicit build dependency on pkg-config.
+  * Replace gnome-doc-utils with yelp-tools, for Mallard docs.
+  * Recommend nautilus-sendto.
+  * Rename lib files due to soname bumps.
+  * Update to debhelper v9.
+  * Bump Standards-Version to 3.9.3.
+  * Install cheese.h and cheese-gtk.h.
+  * Install help data from usr/share/help.
+  * FIXME: dropped symbols in libcheese3.
+
+ -- Jordi Mallach <jordi at debian.org>  Sun, 01 Apr 2012 13:31:01 +0200
+
 cheese (3.2.2-2) unstable; urgency=low
 
   * Change section of gir1.2-cheese-3.0 to introspection.

Modified: desktop/unstable/cheese/debian/cheese-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/cheese-common.install?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/cheese-common.install [utf-8] (original)
+++ desktop/unstable/cheese/debian/cheese-common.install [utf-8] Sun Apr  1 15:28:59 2012
@@ -1,5 +1,5 @@
 usr/share/cheese
 usr/share/glib-2.0/schemas
-usr/share/gnome
+usr/share/help
 usr/share/icons
 usr/share/locale

Modified: desktop/unstable/cheese/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/compat?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/compat [utf-8] (original)
+++ desktop/unstable/cheese/debian/compat [utf-8] Sun Apr  1 15:28:59 2012
@@ -1,1 +1,1 @@
-8
+9

Modified: desktop/unstable/cheese/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/control?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/control [utf-8] (original)
+++ desktop/unstable/cheese/debian/control [utf-8] Sun Apr  1 15:28:59 2012
@@ -7,16 +7,15 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
-Standards-Version: 3.9.2
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Standards-Version: 3.9.3
 Homepage: http://projects.gnome.org/cheese/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/cheese/
 Build-Depends: cdbs (>= 0.4.93~),
-               debhelper (>= 8.1.3~),
+               debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.40.0),
-               gnome-doc-utils,
                rarian-compat,
                valac-0.14 (>= 0.13.2),
                libglib2.0-dev (>= 2.28.0),
@@ -39,7 +38,9 @@
                gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.6),
                libxtst-dev,
-               libgudev-1.0-dev [linux-any]
+               libgudev-1.0-dev [linux-any],
+               pkg-config (>= 0.24),
+               yelp-tools
 
 Package: cheese
 Architecture: any
@@ -49,7 +50,8 @@
          gnome-video-effects
 Recommends: gvfs,
             gnome-icon-theme,
-            hicolor-icon-theme
+            hicolor-icon-theme,
+            nautilus-sendto
 Description: tool to take pictures and videos from your webcam
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -72,7 +74,7 @@
  .
  This package contains the common files and translations.
 
-Package: libcheese-gtk20
+Package: libcheese-gtk21
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -92,7 +94,7 @@
 Package: libcheese-gtk-dev
 Architecture: any
 Section: libdevel
-Depends: libcheese-gtk20 (= ${binary:Version}),
+Depends: libcheese-gtk21 (= ${binary:Version}),
          libcheese-dev (= ${binary:Version}),
          libglib2.0-dev (>= 2.28.0),
          libgtk-3-dev (>= 2.99.4),
@@ -111,7 +113,7 @@
  .
  This package contains the GTK+ development headers.
 
-Package: libcheese1
+Package: libcheese3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -135,7 +137,7 @@
 Package: libcheese-dev
 Architecture: any
 Section: libdevel
-Depends: libcheese1 (= ${binary:Version}),
+Depends: libcheese3 (= ${binary:Version}),
          gir1.2-cheese-3.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.28.0),
          libclutter-1.0-dev (>= 1.6.1),

Modified: desktop/unstable/cheese/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/control.in?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/control.in [utf-8] (original)
+++ desktop/unstable/cheese/debian/control.in [utf-8] Sun Apr  1 15:28:59 2012
@@ -3,15 +3,14 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://projects.gnome.org/cheese/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/cheese/
 Build-Depends: cdbs (>= 0.4.93~),
-               debhelper (>= 8.1.3~),
+               debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.40.0),
-               gnome-doc-utils,
                rarian-compat,
                valac-0.14 (>= 0.13.2),
                libglib2.0-dev (>= 2.28.0),
@@ -34,7 +33,9 @@
                gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.6),
                libxtst-dev,
-               libgudev-1.0-dev [linux-any]
+               libgudev-1.0-dev [linux-any],
+               pkg-config (>= 0.24),
+               yelp-tools
 
 Package: cheese
 Architecture: any
@@ -44,7 +45,8 @@
          gnome-video-effects
 Recommends: gvfs,
             gnome-icon-theme,
-            hicolor-icon-theme
+            hicolor-icon-theme,
+            nautilus-sendto
 Description: tool to take pictures and videos from your webcam
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -67,7 +69,7 @@
  .
  This package contains the common files and translations.
 
-Package: libcheese-gtk20
+Package: libcheese-gtk21
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -87,7 +89,7 @@
 Package: libcheese-gtk-dev
 Architecture: any
 Section: libdevel
-Depends: libcheese-gtk20 (= ${binary:Version}),
+Depends: libcheese-gtk21 (= ${binary:Version}),
          libcheese-dev (= ${binary:Version}),
          libglib2.0-dev (>= 2.28.0),
          libgtk-3-dev (>= 2.99.4),
@@ -106,7 +108,7 @@
  .
  This package contains the GTK+ development headers.
 
-Package: libcheese1
+Package: libcheese3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -130,7 +132,7 @@
 Package: libcheese-dev
 Architecture: any
 Section: libdevel
-Depends: libcheese1 (= ${binary:Version}),
+Depends: libcheese3 (= ${binary:Version}),
          gir1.2-cheese-3.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.28.0),
          libclutter-1.0-dev (>= 1.6.1),

Modified: desktop/unstable/cheese/debian/libcheese-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/libcheese-dev.install?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/libcheese-dev.install [utf-8] (original)
+++ desktop/unstable/cheese/debian/libcheese-dev.install [utf-8] Sun Apr  1 15:28:59 2012
@@ -1,5 +1,6 @@
 usr/lib/*/pkgconfig/cheese.pc
 usr/lib/*/libcheese.so
+usr/include/cheese/cheese.h
 usr/include/cheese/cheese-camera-device.h
 usr/include/cheese/cheese-camera-device-monitor.h
 usr/include/cheese/cheese-camera.h

Modified: desktop/unstable/cheese/debian/libcheese-gtk-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/libcheese-gtk-dev.install?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/libcheese-gtk-dev.install [utf-8] (original)
+++ desktop/unstable/cheese/debian/libcheese-gtk-dev.install [utf-8] Sun Apr  1 15:28:59 2012
@@ -1,4 +1,5 @@
 usr/lib/*/pkgconfig/cheese-gtk.pc
 usr/lib/*/libcheese-gtk.so
+usr/include/cheese/cheese-gtk.h
 usr/include/cheese/cheese-widget.h
 usr/include/cheese/cheese-avatar-chooser.h

Copied: desktop/unstable/cheese/debian/libcheese-gtk21.symbols (from r33934, desktop/unstable/cheese/debian/libcheese-gtk20.symbols)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/libcheese-gtk21.symbols?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/libcheese-gtk20.symbols [utf-8] (original)
+++ desktop/unstable/cheese/debian/libcheese-gtk21.symbols [utf-8] Sun Apr  1 15:28:59 2012
@@ -1,10 +1,11 @@
-libcheese-gtk.so.20 libcheese-gtk20 #MINVER#
+libcheese-gtk.so.21 libcheese-gtk21 #MINVER#
  cheese_avatar_chooser_get_picture at Base 3.0.1
  cheese_avatar_chooser_get_type at Base 3.0.1
  cheese_avatar_chooser_new at Base 3.0.1
  cheese_flash_fire at Base 3.0.1
  cheese_flash_get_type at Base 3.0.1
  cheese_flash_new at Base 3.0.1
+ cheese_gtk_init at Base 3.4.0
  cheese_widget_get_camera at Base 3.0.1
  cheese_widget_get_error at Base 3.0.1
  cheese_widget_get_type at Base 3.0.1

Copied: desktop/unstable/cheese/debian/libcheese3.symbols (from r33934, desktop/unstable/cheese/debian/libcheese1.symbols)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/libcheese3.symbols?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/libcheese1.symbols [utf-8] (original)
+++ desktop/unstable/cheese/debian/libcheese3.symbols [utf-8] Sun Apr  1 15:28:59 2012
@@ -1,4 +1,4 @@
-libcheese.so.1 libcheese1 #MINVER#
+libcheese.so.3 libcheese3 #MINVER#
  _cheese_marshal_VOID__STRING_STRING_STRING_INT at Base 3.0.1
  cheese_camera_cat at Base 3.0.1
  cheese_camera_connect_effect_texture at Base 3.0.1
@@ -7,15 +7,18 @@
  cheese_camera_device_get_best_format at Base 3.0.1
  cheese_camera_device_get_caps_for_format at Base 3.0.1
  cheese_camera_device_get_device_file at Base 3.0.1
+ cheese_camera_device_get_device_node at Base 3.4.0
  cheese_camera_device_get_format_list at Base 3.0.1
  cheese_camera_device_get_id at Base 3.0.1
  cheese_camera_device_get_name at Base 3.0.1
  cheese_camera_device_get_src at Base 3.0.1
  cheese_camera_device_get_type at Base 3.0.1
+ cheese_camera_device_get_uuid at Base 3.4.0
  cheese_camera_device_monitor_coldplug at Base 3.0.1
  cheese_camera_device_monitor_error_quark at Base 3.0.1
  cheese_camera_device_monitor_get_type at Base 3.0.1
  cheese_camera_device_monitor_new at Base 3.0.1
+ cheese_camera_device_monitor_set_up_device at Base 3.4.0
  cheese_camera_device_new at Base 3.0.1
  cheese_camera_error_quark at Base 3.0.1
  cheese_camera_get_balance_property_range at Base 3.0.1
@@ -28,6 +31,7 @@
  cheese_camera_play at Base 3.0.1
  cheese_camera_set_balance_property at Base 3.0.1
  cheese_camera_set_device_by_dev_file at Base 3.0.1
+ cheese_camera_set_device_by_device_node at Base 3.4.0
  cheese_camera_set_effect at Base 3.0.1
  cheese_camera_set_video_format at Base 3.0.1
  cheese_camera_setup at Base 3.0.1
@@ -41,6 +45,8 @@
  cheese_device_monitor_cat at Base 3.0.1
  cheese_effect_disable_preview at Base 3.0.1
  cheese_effect_enable_preview at Base 3.0.1
+ cheese_effect_get_name at Base 3.4.0
+ cheese_effect_get_pipeline_desc at Base 3.4.0
  cheese_effect_get_type at Base 3.0.1
  cheese_effect_is_preview_connected at Base 3.0.1
  cheese_effect_load_effects at Base 3.2.0
@@ -53,5 +59,6 @@
  cheese_fileutil_get_video_path at Base 3.0.1
  cheese_fileutil_new at Base 3.0.1
  cheese_fileutil_reset_burst at Base 3.0.1
+ cheese_init at Base 3.4.0
  cheese_video_format_get_type at Base 3.0.1
  cheese_widget_state_get_type at Base 3.0.1

Modified: desktop/unstable/cheese/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/patches/99_ltmain_as-needed.patch?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/cheese/debian/patches/99_ltmain_as-needed.patch [utf-8] Sun Apr  1 15:28:59 2012
@@ -1,7 +1,7 @@
-Index: cheese-3.2.1/ltmain.sh
+Index: cheese-3.2.1/build-aux/ltmain.sh
 ===================================================================
---- cheese-3.2.1.orig/ltmain.sh	2011-10-17 22:20:56.000000000 +0200
-+++ cheese-3.2.1/ltmain.sh	2011-11-13 14:07:28.230942270 +0100
+--- cheese-3.2.1/build-aux/ltmain.sh	2011-10-17 22:20:56.000000000 +0200
++++ cheese-3.2.1/build-aux/ltmain.sh	2011-11-13 14:07:28.230942270 +0100
 @@ -5787,6 +5787,11 @@
  	arg=$func_stripname_result
  	;;

Modified: desktop/unstable/cheese/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/rules?rev=33965&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/rules [utf-8] (original)
+++ desktop/unstable/cheese/debian/rules [utf-8] Sun Apr  1 15:28:59 2012
@@ -13,5 +13,5 @@
                              --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libcheese1 += -V -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcheese-gtk20 += -V -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libcheese3 += -V -- -c0
+#DEB_DH_MAKESHLIBS_ARGS_libcheese-gtk21 += -V -- -c4

More information about the pkg-gnome-commits mailing list