r36001 - in /desktop/experimental/cheese/debian: ./ patches/

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sat Oct 20 15:48:52 UTC 2012


Author: sjoerd
Date: Sat Oct 20 15:48:51 2012
New Revision: 36001

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36001
Log:
* Bump versioned build-dependencies on GLib, Gtk and gnome-desktop3
  to force use of the versions in experimental
* New upstream release (LP: #1045549, LP: #1034615)
  - uses GStreamer 1.0
  - no longer uses libmx
  - new SONAMEs for libraries
  - packaging loosely based on Ubuntu's 3.6.0-0ubuntu1; thanks to Jeremy
    Bicha, Robert Ancell, Rico Tzschichholz, Martin Pitt,
    Andrew Starr-Bochicchio
* Upload to Debian (Closes: #690852)

Added:
    desktop/experimental/cheese/debian/libcheese-gtk23.install
    desktop/experimental/cheese/debian/libcheese-gtk23.symbols
    desktop/experimental/cheese/debian/libcheese7.install
    desktop/experimental/cheese/debian/libcheese7.symbols
Removed:
    desktop/experimental/cheese/debian/libcheese-gtk21.install
    desktop/experimental/cheese/debian/libcheese-gtk21.symbols
    desktop/experimental/cheese/debian/libcheese3.install
    desktop/experimental/cheese/debian/libcheese3.symbols
Modified:
    desktop/experimental/cheese/debian/changelog
    desktop/experimental/cheese/debian/control
    desktop/experimental/cheese/debian/control.in
    desktop/experimental/cheese/debian/patches/99_ltmain_as-needed.patch
    desktop/experimental/cheese/debian/rules

Modified: desktop/experimental/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/changelog?rev=36001&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/changelog [utf-8] (original)
+++ desktop/experimental/cheese/debian/changelog [utf-8] Sat Oct 20 15:48:51 2012
@@ -1,3 +1,21 @@
+cheese (3.6.1-1) experimental; urgency=low
+
+  [ Simon McVittie ]
+  * Bump versioned build-dependencies on GLib, Gtk and gnome-desktop3
+    to force use of the versions in experimental
+  * New upstream release (LP: #1045549, LP: #1034615)
+    - uses GStreamer 1.0
+    - no longer uses libmx
+    - new SONAMEs for libraries
+    - packaging loosely based on Ubuntu's 3.6.0-0ubuntu1; thanks to Jeremy
+      Bicha, Robert Ancell, Rico Tzschichholz, Martin Pitt,
+      Andrew Starr-Bochicchio
+
+  [ Sjoerd Simons ]
+  * Upload to Debian (Closes: #690852)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 20 Oct 2012 16:38:21 +0200
+
 cheese (3.4.2-2) unstable; urgency=low
 
   [ Jeremy Bicha ]

Modified: desktop/experimental/cheese/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/control?rev=36001&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/control [utf-8] (original)
+++ desktop/experimental/cheese/debian/control [utf-8] Sat Oct 20 15:48:51 2012
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd 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/
@@ -15,25 +15,26 @@
 Build-Depends: cdbs (>= 0.4.93~),
                debhelper (>= 9),
                dh-autoreconf,
+               docbook-xsl,
                gnome-common,
                gnome-pkg-tools (>= 0.10),
                gtk-doc-tools (>= 1.14),
-               intltool (>= 0.40.0),
+               intltool (>= 0.50.0),
                rarian-compat,
-               valac (>= 0.14.0),
-               libglib2.0-dev (>= 2.28.0),
+               valac (>= 0.18) | valac-0.18,
+               libglib2.0-dev (>= 2.34.0),
                libgdk-pixbuf2.0-dev,
-               libgtk-3-dev (>= 2.99.4),
-               libgnome-desktop-3-dev (>= 2.91.6),
-               libgstreamer0.10-dev (>= 0.10.32),
-               libgstreamer-plugins-base0.10-dev (>= 0.10.32),
+               libgtk-3-dev (>= 3.6),
+               libgnome-desktop-3-dev (>= 3.6),
+               libgstreamer1.0-dev (>= 0.11.0),
+               libgstreamer-plugins-base1.0-dev (>= 0.11.0),
+               libgstreamer-plugins-bad1.0-dev (>= 0.11.0),
                libcairo2-dev (>= 1.10.0),
                libpango1.0-dev (>= 1.28.0),
                librsvg2-dev (>= 2.32.0),
-               libclutter-1.0-dev (>= 1.6.1),
+               libclutter-1.0-dev (>= 1.10.0),
                libclutter-gtk-1.0-dev (>= 0.91.8),
-               libclutter-gst-dev (>= 1.0.0),
-               libmx-dev,
+               libclutter-gst-2.0-dev (>= 1.9.0),
                libgee-dev (>= 0.6.0),
                x11proto-core-dev,
                libcanberra-gtk3-dev (>= 0.26),
@@ -78,7 +79,7 @@
  .
  This package contains the common files and translations.
 
-Package: libcheese-gtk21
+Package: libcheese-gtk23
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -98,12 +99,12 @@
 Package: libcheese-gtk-dev
 Architecture: any
 Section: libdevel
-Depends: libcheese-gtk21 (= ${binary:Version}),
+Depends: libcheese-gtk23 (= ${binary:Version}),
          libcheese-dev (= ${binary:Version}),
          libglib2.0-dev (>= 2.28.0),
-         libgtk-3-dev (>= 2.99.4),
-         libgstreamer0.10-dev (>= 0.10.32),
-         libgstreamer-plugins-base0.10-dev (>= 0.10.32),
+         libgtk-3-dev (>= 3.4.4),
+         libgstreamer1.0-dev (>= 0.11.0),
+         libgstreamer-plugins-base1.0-dev (>= 0.11.0),
          libclutter-gtk-1.0-dev (>= 0.91.8),
          libcanberra-gtk3-dev (>= 0.26),
          ${misc:Depends}
@@ -117,16 +118,16 @@
  .
  This package contains the GTK+ development headers.
 
-Package: libcheese3
+Package: libcheese7
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          cheese-common (= ${source:Version}),
-         gstreamer0.10-plugins-base (>= 0.10.23),
-         gstreamer0.10-plugins-good (>= 0.10.23),
-         gstreamer0.10-plugins-bad,
-         gstreamer0.10-x
+         gstreamer1.0-plugins-base (>= 0.11.0),
+         gstreamer1.0-plugins-good (>= 0.11.0),
+         gstreamer1.0-plugins-bad,
+         gstreamer1.0-x
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: tool to take pictures and videos from your webcam - base library
@@ -141,13 +142,13 @@
 Package: libcheese-dev
 Architecture: any
 Section: libdevel
-Depends: libcheese3 (= ${binary:Version}),
+Depends: libcheese7 (= ${binary:Version}),
          gir1.2-cheese-3.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.28.0),
-         libclutter-1.0-dev (>= 1.6.1),
-         libgstreamer0.10-dev (>= 0.10.32),
-         libgstreamer-plugins-base0.10-dev (>= 0.10.32),
-         libclutter-gst-dev (>= 1.0.0),
+         libclutter-1.0-dev (>= 1.10.0),
+         libgstreamer1.0-dev (>= 0.11.0),
+         libgstreamer-plugins-base1.0-dev (>= 0.11.0),
+         libclutter-gst-2.0-dev (>= 1.9.0),
          libgdk-pixbuf2.0-dev,
          ${misc:Depends}
 Suggests: libcheese-doc

Modified: desktop/experimental/cheese/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/control.in?rev=36001&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/control.in [utf-8] (original)
+++ desktop/experimental/cheese/debian/control.in [utf-8] Sat Oct 20 15:48:51 2012
@@ -10,25 +10,26 @@
 Build-Depends: cdbs (>= 0.4.93~),
                debhelper (>= 9),
                dh-autoreconf,
+               docbook-xsl,
                gnome-common,
                gnome-pkg-tools (>= 0.10),
                gtk-doc-tools (>= 1.14),
-               intltool (>= 0.40.0),
+               intltool (>= 0.50.0),
                rarian-compat,
-               valac (>= 0.14.0),
-               libglib2.0-dev (>= 2.28.0),
+               valac (>= 0.18) | valac-0.18,
+               libglib2.0-dev (>= 2.34.0),
                libgdk-pixbuf2.0-dev,
-               libgtk-3-dev (>= 2.99.4),
-               libgnome-desktop-3-dev (>= 2.91.6),
-               libgstreamer0.10-dev (>= 0.10.32),
-               libgstreamer-plugins-base0.10-dev (>= 0.10.32),
+               libgtk-3-dev (>= 3.6),
+               libgnome-desktop-3-dev (>= 3.6),
+               libgstreamer1.0-dev (>= 0.11.0),
+               libgstreamer-plugins-base1.0-dev (>= 0.11.0),
+               libgstreamer-plugins-bad1.0-dev (>= 0.11.0),
                libcairo2-dev (>= 1.10.0),
                libpango1.0-dev (>= 1.28.0),
                librsvg2-dev (>= 2.32.0),
-               libclutter-1.0-dev (>= 1.6.1),
+               libclutter-1.0-dev (>= 1.10.0),
                libclutter-gtk-1.0-dev (>= 0.91.8),
-               libclutter-gst-dev (>= 1.0.0),
-               libmx-dev,
+               libclutter-gst-2.0-dev (>= 1.9.0),
                libgee-dev (>= 0.6.0),
                x11proto-core-dev,
                libcanberra-gtk3-dev (>= 0.26),
@@ -73,7 +74,7 @@
  .
  This package contains the common files and translations.
 
-Package: libcheese-gtk21
+Package: libcheese-gtk23
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -93,12 +94,12 @@
 Package: libcheese-gtk-dev
 Architecture: any
 Section: libdevel
-Depends: libcheese-gtk21 (= ${binary:Version}),
+Depends: libcheese-gtk23 (= ${binary:Version}),
          libcheese-dev (= ${binary:Version}),
          libglib2.0-dev (>= 2.28.0),
-         libgtk-3-dev (>= 2.99.4),
-         libgstreamer0.10-dev (>= 0.10.32),
-         libgstreamer-plugins-base0.10-dev (>= 0.10.32),
+         libgtk-3-dev (>= 3.4.4),
+         libgstreamer1.0-dev (>= 0.11.0),
+         libgstreamer-plugins-base1.0-dev (>= 0.11.0),
          libclutter-gtk-1.0-dev (>= 0.91.8),
          libcanberra-gtk3-dev (>= 0.26),
          ${misc:Depends}
@@ -112,16 +113,16 @@
  .
  This package contains the GTK+ development headers.
 
-Package: libcheese3
+Package: libcheese7
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          cheese-common (= ${source:Version}),
-         gstreamer0.10-plugins-base (>= 0.10.23),
-         gstreamer0.10-plugins-good (>= 0.10.23),
-         gstreamer0.10-plugins-bad,
-         gstreamer0.10-x
+         gstreamer1.0-plugins-base (>= 0.11.0),
+         gstreamer1.0-plugins-good (>= 0.11.0),
+         gstreamer1.0-plugins-bad,
+         gstreamer1.0-x
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: tool to take pictures and videos from your webcam - base library
@@ -136,13 +137,13 @@
 Package: libcheese-dev
 Architecture: any
 Section: libdevel
-Depends: libcheese3 (= ${binary:Version}),
+Depends: libcheese7 (= ${binary:Version}),
          gir1.2-cheese-3.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.28.0),
-         libclutter-1.0-dev (>= 1.6.1),
-         libgstreamer0.10-dev (>= 0.10.32),
-         libgstreamer-plugins-base0.10-dev (>= 0.10.32),
-         libclutter-gst-dev (>= 1.0.0),
+         libclutter-1.0-dev (>= 1.10.0),
+         libgstreamer1.0-dev (>= 0.11.0),
+         libgstreamer-plugins-base1.0-dev (>= 0.11.0),
+         libclutter-gst-2.0-dev (>= 1.9.0),
          libgdk-pixbuf2.0-dev,
          ${misc:Depends}
 Suggests: libcheese-doc

Added: desktop/experimental/cheese/debian/libcheese-gtk23.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/libcheese-gtk23.install?rev=36001&op=file
==============================================================================
--- desktop/experimental/cheese/debian/libcheese-gtk23.install (added)
+++ desktop/experimental/cheese/debian/libcheese-gtk23.install [utf-8] Sat Oct 20 15:48:51 2012
@@ -1,0 +1,1 @@
+usr/lib/*/libcheese-gtk.so.*

Added: desktop/experimental/cheese/debian/libcheese-gtk23.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/libcheese-gtk23.symbols?rev=36001&op=file
==============================================================================
--- desktop/experimental/cheese/debian/libcheese-gtk23.symbols (added)
+++ desktop/experimental/cheese/debian/libcheese-gtk23.symbols [utf-8] Sat Oct 20 15:48:51 2012
@@ -1,0 +1,14 @@
+libcheese-gtk.so.23 libcheese-gtk23 #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
+ cheese_widget_get_video_area at Base 3.0.1
+ cheese_widget_new at Base 3.0.1
+ um_crop_area_get_type at Base 3.0.1

Added: desktop/experimental/cheese/debian/libcheese7.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/libcheese7.install?rev=36001&op=file
==============================================================================
--- desktop/experimental/cheese/debian/libcheese7.install (added)
+++ desktop/experimental/cheese/debian/libcheese7.install [utf-8] Sat Oct 20 15:48:51 2012
@@ -1,0 +1,1 @@
+usr/lib/*/libcheese.so.*

Added: desktop/experimental/cheese/debian/libcheese7.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/libcheese7.symbols?rev=36001&op=file
==============================================================================
--- desktop/experimental/cheese/debian/libcheese7.symbols (added)
+++ desktop/experimental/cheese/debian/libcheese7.symbols [utf-8] Sat Oct 20 15:48:51 2012
@@ -1,0 +1,60 @@
+libcheese.so.7 libcheese7 #MINVER#
+ cheese_camera_cat at Base 3.0.1
+ cheese_camera_connect_effect_texture at Base 3.0.1
+ cheese_camera_device_cat at Base 3.0.1
+ cheese_camera_device_error_quark at Base 3.0.1
+ 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_node at Base 3.4.0
+ cheese_camera_device_get_format_list 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
+ (arch=linux-any)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
+ cheese_camera_get_camera_devices at Base 3.0.1
+ cheese_camera_get_current_video_format at Base 3.0.1
+ cheese_camera_get_recorded_time at Base 3.5.1
+ cheese_camera_get_selected_device at Base 3.0.1
+ cheese_camera_get_type at Base 3.0.1
+ cheese_camera_get_video_formats at Base 3.0.1
+ cheese_camera_new at Base 3.0.1
+ cheese_camera_play at Base 3.0.1
+ cheese_camera_set_balance_property 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
+ cheese_camera_start_video_recording at Base 3.0.1
+ cheese_camera_stop at Base 3.0.1
+ cheese_camera_stop_video_recording at Base 3.0.1
+ cheese_camera_switch_camera_device at Base 3.0.1
+ cheese_camera_take_photo at Base 3.0.1
+ cheese_camera_take_photo_pixbuf at Base 3.0.1
+ cheese_camera_toggle_effects_pipeline at Base 3.0.1
+ 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
+ cheese_effect_load_from_file at Base 3.2.0
+ cheese_effect_new at Base 3.0.1
+ cheese_fileutil_get_new_media_filename at Base 3.0.1
+ cheese_fileutil_get_photo_path at Base 3.0.1
+ cheese_fileutil_get_type at Base 3.0.1
+ 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/experimental/cheese/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/patches/99_ltmain_as-needed.patch?rev=36001&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/cheese/debian/patches/99_ltmain_as-needed.patch [utf-8] Sat Oct 20 15:48:51 2012
@@ -1,7 +1,7 @@
-Index: cheese-3.2.1/build-aux/ltmain.sh
+Index: cheese-3.2.1/ltmain.sh
 ===================================================================
---- 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
+--- 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
 @@ -5787,6 +5787,11 @@
  	arg=$func_stripname_result
  	;;

Modified: desktop/experimental/cheese/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cheese/debian/rules?rev=36001&op=diff
==============================================================================
--- desktop/experimental/cheese/debian/rules [utf-8] (original)
+++ desktop/experimental/cheese/debian/rules [utf-8] Sat Oct 20 15:48:51 2012
@@ -16,5 +16,9 @@
                              --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libcheese3 += -V -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcheese-gtk21 += -V -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libcheese7 += -V -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libcheese-gtk23 += -V -- -c4
+
+clean::
+	rm -rf *vala.stamp
+	rm -rf src/*.c




More information about the pkg-gnome-commits mailing list