r35951 - in /desktop/experimental/gnome-bluetooth/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Oct 14 18:42:32 UTC 2012
Author: sjoerd
Date: Sun Oct 14 18:42:32 2012
New Revision: 35951
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35951
Log:
* New upstream release
* Sync with Ubuntu:
+ debian/patches/02_gettext_macros.patch
Added, Don't mix gettext and intltool macros
+ Soname bump libgnome-bluetooth10 -> libgnome-bluetooth11
+ debian/control: Update build-depends
Added:
desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.install
desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols
desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch
Removed:
desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth10.install
desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth10.symbols
Modified:
desktop/experimental/gnome-bluetooth/debian/changelog
desktop/experimental/gnome-bluetooth/debian/control
desktop/experimental/gnome-bluetooth/debian/control.in
desktop/experimental/gnome-bluetooth/debian/gnome-bluetooth.install
desktop/experimental/gnome-bluetooth/debian/patches/series
desktop/experimental/gnome-bluetooth/debian/rules
Modified: desktop/experimental/gnome-bluetooth/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/changelog?rev=35951&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/changelog [utf-8] Sun Oct 14 18:42:32 2012
@@ -1,3 +1,14 @@
+gnome-bluetooth (3.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Sync with Ubuntu:
+ + debian/patches/02_gettext_macros.patch
+ Added, Don't mix gettext and intltool macros
+ + Soname bump libgnome-bluetooth10 -> libgnome-bluetooth11
+ + debian/control: Update build-depends
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 14 Oct 2012 20:38:55 +0200
+
gnome-bluetooth (3.4.2-1) unstable; urgency=low
[ Andreas Henriksson ]
Modified: desktop/experimental/gnome-bluetooth/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/control?rev=35951&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/control [utf-8] Sun Oct 14 18:42:32 2012
@@ -7,9 +7,10 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 8.1.0~),
cdbs (>= 0.4.93),
+ gnome-common,
gnome-pkg-tools,
libnotify-dev (>= 0.7),
libglib2.0-dev (>= 2.29.90),
@@ -20,11 +21,10 @@
libxml2-utils,
gtk-doc-tools,
nautilus-sendto (>= 2.29.0),
- gnome-doc-utils (>= 0.3.2),
- gobject-introspection (>= 0.10.7-1~),
+ yelp-tools,
+ gobject-introspection (>= 0.10.2-1~),
libgirepository1.0-dev (>= 0.9.5),
libatk1.0-dev (>= 1.32.0-2~)
-Build-Conflicts: nautilus-sendto (>> 3.1.0)
Standards-Version: 3.9.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-bluetooth
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-bluetooth/
@@ -40,7 +40,8 @@
udev (>= 154),
consolekit,
obex-data-server
-Recommends: gvfs-backends
+Recommends: gvfs-backends,
+ gnome-control-center
Suggests: nautilus-sendto, gnome-user-share
Replaces: nautilus-sendto (<< 2.28.4-2)
Breaks: nautilus-sendto (<< 3.0),
@@ -58,7 +59,7 @@
bluetooth-sendto is also included for sending files to Bluetooth devices via
OBEX.
-Package: libgnome-bluetooth10
+Package: libgnome-bluetooth11
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -71,7 +72,7 @@
Package: libgnome-bluetooth-dev
Section: libdevel
-Depends: libgnome-bluetooth10 (= ${binary:Version}),
+Depends: libgnome-bluetooth11 (= ${binary:Version}),
gir1.2-gnomebluetooth-1.0 (= ${binary:Version}),
${misc:Depends},
libgtk-3-dev,
Modified: desktop/experimental/gnome-bluetooth/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/control.in?rev=35951&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/control.in [utf-8] Sun Oct 14 18:42:32 2012
@@ -5,6 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8.1.0~),
cdbs (>= 0.4.93),
+ gnome-common,
gnome-pkg-tools,
libnotify-dev (>= 0.7),
libglib2.0-dev (>= 2.29.90),
@@ -15,11 +16,10 @@
libxml2-utils,
gtk-doc-tools,
nautilus-sendto (>= 2.29.0),
- gnome-doc-utils (>= 0.3.2),
- gobject-introspection (>= 0.10.7-1~),
+ yelp-tools,
+ gobject-introspection (>= 0.10.2-1~),
libgirepository1.0-dev (>= 0.9.5),
libatk1.0-dev (>= 1.32.0-2~)
-Build-Conflicts: nautilus-sendto (>> 3.1.0)
Standards-Version: 3.9.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-bluetooth
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-bluetooth/
@@ -35,7 +35,8 @@
udev (>= 154),
consolekit,
obex-data-server
-Recommends: gvfs-backends
+Recommends: gvfs-backends,
+ gnome-control-center
Suggests: nautilus-sendto, gnome-user-share
Replaces: nautilus-sendto (<< 2.28.4-2)
Breaks: nautilus-sendto (<< 3.0),
@@ -53,7 +54,7 @@
bluetooth-sendto is also included for sending files to Bluetooth devices via
OBEX.
-Package: libgnome-bluetooth10
+Package: libgnome-bluetooth11
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -66,7 +67,7 @@
Package: libgnome-bluetooth-dev
Section: libdevel
-Depends: libgnome-bluetooth10 (= ${binary:Version}),
+Depends: libgnome-bluetooth11 (= ${binary:Version}),
gir1.2-gnomebluetooth-1.0 (= ${binary:Version}),
${misc:Depends},
libgtk-3-dev,
Modified: desktop/experimental/gnome-bluetooth/debian/gnome-bluetooth.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/gnome-bluetooth.install?rev=35951&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/gnome-bluetooth.install [utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/gnome-bluetooth.install [utf-8] Sun Oct 14 18:42:32 2012
@@ -1,8 +1,7 @@
-usr/share/gnome
+usr/share/help
usr/share/locale
usr/share/man/man1
usr/share/applications
-usr/share/omf
usr/share/icons
usr/share/gnome-bluetooth
usr/bin
Added: desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.install?rev=35951&op=file
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.install (added)
+++ desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.install [utf-8] Sun Oct 14 18:42:32 2012
@@ -1,0 +1,1 @@
+usr/lib/lib*.so.*
Added: desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols?rev=35951&op=file
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols (added)
+++ desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols [utf-8] Sun Oct 14 18:42:32 2012
@@ -1,0 +1,67 @@
+libgnome-bluetooth.so.11 libgnome-bluetooth11 #MINVER#
+ bluetooth_agent_error_quark at Base 3.4.0
+ bluetooth_agent_new at Base 3.4.0
+ bluetooth_agent_register at Base 3.4.0
+ bluetooth_agent_set_authorize_func at Base 3.4.0
+ bluetooth_agent_set_cancel_func at Base 3.4.0
+ bluetooth_agent_set_confirm_func at Base 3.4.0
+ bluetooth_agent_set_display_func at Base 3.4.0
+ bluetooth_agent_set_passkey_func at Base 3.4.0
+ bluetooth_agent_set_pincode_func at Base 3.4.0
+ bluetooth_agent_setup at Base 3.4.0
+ bluetooth_agent_unregister at Base 3.4.0
+ bluetooth_browse_address at Base 3.1.3
+ bluetooth_browse_address_finish at Base 3.1.3
+ bluetooth_category_get_type at Base 2.91.2
+ bluetooth_chooser_button_available at Base 2.91.2
+ bluetooth_chooser_button_get_type at Base 2.91.2
+ bluetooth_chooser_button_new at Base 2.91.2
+ bluetooth_chooser_combo_get_type at Base 2.91.2
+ bluetooth_chooser_combo_new at Base 2.91.2
+ bluetooth_chooser_dump_selected_device at Base 3.4.0
+ bluetooth_chooser_get_model at Base 2.91.2
+ bluetooth_chooser_get_scrolled_window at Base 2.91.92
+ bluetooth_chooser_get_selected_device at Base 2.91.2
+ bluetooth_chooser_get_selected_device_icon at Base 2.91.2
+ bluetooth_chooser_get_selected_device_info at Base 2.91.2
+ bluetooth_chooser_get_selected_device_is_connected at Base 2.91.2
+ bluetooth_chooser_get_selected_device_name at Base 2.91.2
+ bluetooth_chooser_get_selected_device_type at Base 2.91.2
+ bluetooth_chooser_get_treeview at Base 2.91.2
+ bluetooth_chooser_get_type at Base 2.91.2
+ bluetooth_chooser_new at Base 2.91.2
+ bluetooth_chooser_start_discovery at Base 2.91.2
+ bluetooth_chooser_stop_discovery at Base 2.91.2
+ bluetooth_class_to_type at Base 3.1.3
+ bluetooth_client_connect_service at Base 3.4.0
+ bluetooth_client_connect_service_finish at Base 3.4.0
+ bluetooth_client_create_device at Base 3.4.0
+ bluetooth_client_dump_device at Base 3.4.0
+ bluetooth_client_get_adapter_model at Base 2.91.2
+ bluetooth_client_get_device_model at Base 2.91.2
+ bluetooth_client_get_filter_model at Base 2.91.2
+ bluetooth_client_get_model at Base 2.91.2
+ bluetooth_client_get_type at Base 2.91.2
+ bluetooth_client_new at Base 2.91.2
+ bluetooth_client_set_trusted at Base 3.4.0
+ bluetooth_column_get_type at Base 2.91.2
+ bluetooth_filter_widget_bind_filter at Base 2.91.2
+ bluetooth_filter_widget_get_type at Base 2.91.2
+ bluetooth_filter_widget_new at Base 2.91.2
+ bluetooth_filter_widget_set_title at Base 2.91.2
+ bluetooth_killswitch_get_state at Base 3.4.0
+ bluetooth_killswitch_get_type at Base 3.4.0
+ bluetooth_killswitch_has_killswitches at Base 3.4.0
+ bluetooth_killswitch_new at Base 3.4.0
+ bluetooth_killswitch_set_state at Base 3.4.0
+ bluetooth_killswitch_state_to_string at Base 3.4.0
+ bluetooth_plugin_manager_cleanup at Base 3.4.0
+ bluetooth_plugin_manager_device_deleted at Base 3.4.0
+ bluetooth_plugin_manager_get_widgets at Base 3.4.0
+ bluetooth_plugin_manager_init at Base 3.4.0
+ bluetooth_send_to_address at Base 3.1.3
+ bluetooth_status_get_type at Base 3.2.1
+ bluetooth_type_get_type at Base 2.91.2
+ bluetooth_type_to_string at Base 2.91.2
+ bluetooth_uuid_to_string at Base 2.91.2
+ bluetooth_verify_address at Base 2.91.2
Added: desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch?rev=35951&op=file
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch (added)
+++ desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch [utf-8] Sun Oct 14 18:42:32 2012
@@ -1,0 +1,14 @@
+Index: gnome-bluetooth-3.0.0/configure.ac
+===================================================================
+--- gnome-bluetooth-3.0.0.orig/configure.ac 2011-05-24 11:45:22.573543108 -0400
++++ gnome-bluetooth-3.0.0/configure.ac 2011-05-24 11:45:33.643543107 -0400
+@@ -41,9 +41,6 @@
+ # i18n stuff
+ IT_PROG_INTLTOOL([0.40.0])
+
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-
+ GETTEXT_PACKAGE=gnome-bluetooth2
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
Modified: desktop/experimental/gnome-bluetooth/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/patches/series?rev=35951&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/patches/series [utf-8] Sun Oct 14 18:42:32 2012
@@ -1,1 +1,2 @@
01_autostart_path.patch
+02_gettext_macros.patch
Modified: desktop/experimental/gnome-bluetooth/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/rules?rev=35951&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/rules [utf-8] Sun Oct 14 18:42:32 2012
@@ -19,4 +19,4 @@
DEB_DH_MAKESHLIBS_ARGS_gnome-bluetooth = --no-act
DEB_DH_GIREPOSITORY_ARGS_gnome-bluetooth := -l$(CURDIR)/applet /usr/lib/gnome-bluetooth/
-DEB_DH_MAKESHLIBS_ARGS_libgnome-bluetooth10 += -V -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libgnome-bluetooth11 += -V -- -c4
More information about the pkg-gnome-commits
mailing list