r28140 - in /desktop/experimental/gnome-user-share/debian: changelog control control.in patches/02_bluetooth_optional.patch patches/90_relibtoolize.patch patches/series preinst rules source/ source/format
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue May 31 21:21:36 UTC 2011
Author: joss
Date: Tue May 31 21:21:35 2011
New Revision: 28140
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28140
Log:
* New upstream release.
* Switch to 3.0 quilt format.
* Use dh-autoreconf.
* Drop 90_relibtoolize.patch accordingly.
* 02_bluetooth_optional.patch: updated for the new version.
* Update build dependencies.
* preinst: dropped, the fixed version is in stable.
Added:
desktop/experimental/gnome-user-share/debian/source/
desktop/experimental/gnome-user-share/debian/source/format
Removed:
desktop/experimental/gnome-user-share/debian/patches/90_relibtoolize.patch
desktop/experimental/gnome-user-share/debian/preinst
Modified:
desktop/experimental/gnome-user-share/debian/changelog
desktop/experimental/gnome-user-share/debian/control
desktop/experimental/gnome-user-share/debian/control.in
desktop/experimental/gnome-user-share/debian/patches/02_bluetooth_optional.patch
desktop/experimental/gnome-user-share/debian/patches/series
desktop/experimental/gnome-user-share/debian/rules
Modified: desktop/experimental/gnome-user-share/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-user-share/debian/changelog?rev=28140&op=diff
==============================================================================
--- desktop/experimental/gnome-user-share/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-user-share/debian/changelog [utf-8] Tue May 31 21:21:35 2011
@@ -1,3 +1,15 @@
+gnome-user-share (3.0.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Switch to 3.0 quilt format.
+ * Use dh-autoreconf.
+ * Drop 90_relibtoolize.patch accordingly.
+ * 02_bluetooth_optional.patch: updated for the new version.
+ * Update build dependencies.
+ * preinst: dropped, the fixed version is in stable.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 31 May 2011 23:21:38 +0200
+
gnome-user-share (2.30.1-1) unstable; urgency=low
* Drop type-handling usage. Closes: #587876.
Modified: desktop/experimental/gnome-user-share/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-user-share/debian/control?rev=28140&op=diff
==============================================================================
--- desktop/experimental/gnome-user-share/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-user-share/debian/control [utf-8] Tue May 31 21:21:35 2011
@@ -10,8 +10,8 @@
Uploaders: Andrea Veri <and at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>
Build-Depends: cdbs,
debhelper (>= 5),
+ dh-autoreconf,
gnome-pkg-tools,
- quilt,
intltool (>= 0.35.0),
gnome-doc-utils,
scrollkeeper,
@@ -19,15 +19,15 @@
pkg-config,
libdbus-1-dev (>= 1.1.1),
libglib2.0-dev (>= 2.15.2),
- libgtk2.0-dev (>= 2.12.0),
+ libgtk-3-dev,
libgconf2-dev,
libdbus-glib-1-dev,
libnotify-dev,
- libcanberra-gtk-dev,
+ libcanberra-gtk3-dev,
libselinux1-dev [linux-any],
- libgnome-bluetooth-dev (>= 2.27.7.2) [linux-any],
- libunique-dev,
- libnautilus-extension-dev
+ libgnome-bluetooth-dev (>= 2.91.5) [linux-any],
+ libunique-3.0-dev,
+ libnautilus-extension-dev (>= 2.91.7)
Standards-Version: 3.9.0
Package: gnome-user-share
Modified: desktop/experimental/gnome-user-share/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-user-share/debian/control.in?rev=28140&op=diff
==============================================================================
--- desktop/experimental/gnome-user-share/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-user-share/debian/control.in [utf-8] Tue May 31 21:21:35 2011
@@ -5,8 +5,8 @@
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
debhelper (>= 5),
+ dh-autoreconf,
gnome-pkg-tools,
- quilt,
intltool (>= 0.35.0),
gnome-doc-utils,
scrollkeeper,
@@ -14,15 +14,15 @@
pkg-config,
libdbus-1-dev (>= 1.1.1),
libglib2.0-dev (>= 2.15.2),
- libgtk2.0-dev (>= 2.12.0),
+ libgtk-3-dev,
libgconf2-dev,
libdbus-glib-1-dev,
libnotify-dev,
- libcanberra-gtk-dev,
+ libcanberra-gtk3-dev,
libselinux1-dev [linux-any],
- libgnome-bluetooth-dev (>= 2.27.7.2) [linux-any],
- libunique-dev,
- libnautilus-extension-dev
+ libgnome-bluetooth-dev (>= 2.91.5) [linux-any],
+ libunique-3.0-dev,
+ libnautilus-extension-dev (>= 2.91.7)
Standards-Version: 3.9.0
Package: gnome-user-share
Modified: desktop/experimental/gnome-user-share/debian/patches/02_bluetooth_optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-user-share/debian/patches/02_bluetooth_optional.patch?rev=28140&op=diff
==============================================================================
--- desktop/experimental/gnome-user-share/debian/patches/02_bluetooth_optional.patch [utf-8] (original)
+++ desktop/experimental/gnome-user-share/debian/patches/02_bluetooth_optional.patch [utf-8] Tue May 31 21:21:35 2011
@@ -1,17 +1,17 @@
-Index: gnome-user-share-2.30.0/configure.in
+Index: gnome-user-share-3.0.0/configure.in
===================================================================
---- gnome-user-share-2.30.0.orig/configure.in 2010-03-29 18:25:21.000000000 +0200
-+++ gnome-user-share-2.30.0/configure.in 2010-04-03 18:01:06.797715578 +0200
-@@ -56,10 +56,21 @@
+--- gnome-user-share-3.0.0.orig/configure.in 2011-04-04 15:14:32.000000000 +0200
++++ gnome-user-share-3.0.0/configure.in 2011-05-31 23:14:22.776318967 +0200
+@@ -56,10 +56,21 @@ if $have_dbus_1_1 ; then
AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
fi
--PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2)
-+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES)
+-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gtk+-3.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk3 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.91.5)
++PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gtk+-3.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk3 $DBUS_MODULES)
AC_SUBST(USER_SHARE_CFLAGS)
AC_SUBST(USER_SHARE_LIBS)
-+PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 2.27.7.2,
++PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 2.91.5,
+ have_bluetooth=true, have_bluetooth=false)
+AC_SUBST(BLUETOOTH_CFLAGS)
+AC_SUBST(BLUETOOTH_LIBS)
@@ -22,14 +22,14 @@
+fi
+AM_CONDITIONAL(USE_BLUETOOTH, [test "$have_bluetooth" = "true"])
+
- PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gtk+-2.0 >= 2.12.0 gconf-2.0 unique-1.0)
+ PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gtk+-3.0 >= 2.12.0 gconf-2.0 unique-3.0)
AC_SUBST(USER_SHARE_CONFIG_CFLAGS)
AC_SUBST(USER_SHARE_CONFIG_LIBS)
-Index: gnome-user-share-2.30.0/data/file-share-properties.ui
+Index: gnome-user-share-3.0.0/data/file-share-properties.ui
===================================================================
---- gnome-user-share-2.30.0.orig/data/file-share-properties.ui 2009-06-29 11:41:06.000000000 +0200
-+++ gnome-user-share-2.30.0/data/file-share-properties.ui 2010-04-03 18:01:06.801708047 +0200
-@@ -19,7 +19,7 @@
+--- gnome-user-share-3.0.0.orig/data/file-share-properties.ui 2011-04-04 15:13:53.000000000 +0200
++++ gnome-user-share-3.0.0/data/file-share-properties.ui 2011-05-31 23:12:46.171846466 +0200
+@@ -18,7 +18,7 @@
<property name="border_width">5</property>
<property name="spacing">18</property>
<child>
@@ -38,7 +38,7 @@
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
-@@ -130,8 +130,8 @@
+@@ -129,8 +129,8 @@
</packing>
</child>
<child>
@@ -49,7 +49,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label7">
-@@ -213,8 +213,8 @@
+@@ -212,8 +212,8 @@
</packing>
</child>
<child>
@@ -60,11 +60,11 @@
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label8">
-Index: gnome-user-share-2.30.0/src/Makefile.am
+Index: gnome-user-share-3.0.0/src/Makefile.am
===================================================================
---- gnome-user-share-2.30.0.orig/src/Makefile.am 2010-03-02 15:36:45.000000000 +0100
-+++ gnome-user-share-2.30.0/src/Makefile.am 2010-04-03 18:01:06.809707809 +0200
-@@ -31,6 +31,7 @@
+--- gnome-user-share-3.0.0.orig/src/Makefile.am 2010-03-02 15:36:45.000000000 +0100
++++ gnome-user-share-3.0.0/src/Makefile.am 2011-05-31 23:12:46.171846466 +0200
+@@ -31,6 +31,7 @@ INCLUDES= \
-I$(top_builddir) \
$(EXTENSION_CFLAGS) \
$(USER_SHARE_CFLAGS) \
@@ -72,7 +72,7 @@
$(USER_SHARE_CONFIG_CFLAGS) \
$(X_CFLAGS)
-@@ -41,10 +42,6 @@
+@@ -41,10 +42,6 @@ gnome_user_share_SOURCES = \
user_share-private.c \
http.c \
http.h \
@@ -83,7 +83,7 @@
$(MARSHALFILES)
gnome_user_share_LDADD = \
-@@ -53,6 +50,15 @@
+@@ -53,6 +50,15 @@ gnome_user_share_LDADD = \
$(SELINUX_LIBS) \
$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
@@ -99,11 +99,11 @@
gnome_file_share_properties_SOURCES = \
file-share-properties.c \
user_share-private.h \
-Index: gnome-user-share-2.30.0/src/file-share-properties.c
+Index: gnome-user-share-3.0.0/src/file-share-properties.c
===================================================================
---- gnome-user-share-2.30.0.orig/src/file-share-properties.c 2010-03-02 15:36:45.000000000 +0100
-+++ gnome-user-share-2.30.0/src/file-share-properties.c 2010-04-03 18:01:06.825701562 +0200
-@@ -86,26 +86,39 @@
+--- gnome-user-share-3.0.0.orig/src/file-share-properties.c 2010-03-02 15:36:45.000000000 +0100
++++ gnome-user-share-3.0.0/src/file-share-properties.c 2011-05-31 23:12:46.175846481 +0200
+@@ -86,26 +86,39 @@ static void
update_ui (void)
{
GConfClient *client;
@@ -144,7 +144,7 @@
bluetooth_enabled = gconf_client_get_bool (client,
FILE_SHARING_BLUETOOTH_ENABLED,
NULL);
-@@ -122,23 +135,24 @@
+@@ -122,23 +135,24 @@ update_ui (void)
FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY,
NULL);
@@ -173,7 +173,7 @@
/* Network */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), enabled);
-@@ -148,7 +162,9 @@
+@@ -148,7 +162,9 @@ update_ui (void)
gtk_combo_box_set_active (GTK_COMBO_BOX (password_combo),
password_setting);
@@ -183,7 +183,7 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bluetooth_check), bluetooth_enabled);
gtk_widget_set_sensitive (allow_write_bluetooth_check, bluetooth_enabled);
gtk_widget_set_sensitive (require_pairing_check, bluetooth_enabled);
-@@ -159,6 +175,7 @@
+@@ -159,6 +175,7 @@ update_ui (void)
require_pairing_enabled);
/* Bluetooth ObexPush */
@@ -191,7 +191,7 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_obexpush_check), bluetooth_obexpush_enabled);
gtk_widget_set_sensitive (accept_obexpush_combo, bluetooth_obexpush_enabled);
gtk_widget_set_sensitive (notify_received_obexpush_check, bluetooth_obexpush_enabled);
-@@ -168,6 +185,7 @@
+@@ -168,6 +185,7 @@ update_ui (void)
gtk_combo_box_set_active (GTK_COMBO_BOX (accept_obexpush_combo),
accept_setting);
@@ -199,7 +199,7 @@
g_object_unref (client);
}
-@@ -190,6 +208,7 @@
+@@ -190,6 +208,7 @@ password_required_changed (GConfClient*
update_ui ();
}
@@ -207,7 +207,7 @@
static void
file_sharing_bluetooth_enabled_changed (GConfClient* client,
guint cnxn_id,
-@@ -243,6 +262,7 @@
+@@ -243,6 +262,7 @@ file_sharing_bluetooth_obexpush_notify_c
{
update_ui ();
}
@@ -215,7 +215,7 @@
static void
password_combo_changed (GtkComboBox *combo_box)
-@@ -283,6 +303,7 @@
+@@ -283,6 +303,7 @@ launch_share (void)
}
}
@@ -223,7 +223,7 @@
static void
enable_bluetooth_check_toggled (GtkWidget *check)
{
-@@ -303,6 +324,7 @@
+@@ -303,6 +324,7 @@ enable_bluetooth_check_toggled (GtkWidge
if (enabled != FALSE)
launch_share ();
}
@@ -231,7 +231,7 @@
static void
enable_check_toggled (GtkWidget *check)
-@@ -333,6 +355,7 @@
+@@ -333,6 +355,7 @@ password_entry_changed (GtkEditable *edi
flush_password ();
}
@@ -239,7 +239,7 @@
static void
bluetooth_allow_write_check_toggled (GtkWidget *check)
{
-@@ -424,6 +447,7 @@
+@@ -424,6 +447,7 @@ notify_received_obexpush_check_toggled (
g_object_unref (client);
}
@@ -247,7 +247,7 @@
static GtkWidget *
error_dialog (const char *title,
-@@ -490,12 +514,14 @@
+@@ -490,12 +514,14 @@ main (int argc, char *argv[])
GtkWidget *check;
GtkWidget *password_combo;
GtkWidget *password_entry;
@@ -262,7 +262,7 @@
GtkWidget *window;
GtkListStore *store;
GtkCellRenderer *cell;
-@@ -544,12 +570,14 @@
+@@ -544,12 +570,14 @@ main (int argc, char *argv[])
check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_check"));
password_combo = GTK_WIDGET (gtk_builder_get_object (builder, "password_combo"));
password_entry = GTK_WIDGET (gtk_builder_get_object (builder, "password_entry"));
@@ -277,7 +277,7 @@
store = gtk_list_store_new (1, G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (password_combo),
-@@ -579,6 +607,7 @@
+@@ -579,6 +607,7 @@ main (int argc, char *argv[])
g_signal_connect (password_entry,
"changed", G_CALLBACK (password_entry_changed), NULL);
@@ -285,7 +285,7 @@
/* Accept files combo */
store = gtk_list_store_new (1, G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (accept_obexpush_combo),
-@@ -603,6 +632,7 @@
+@@ -603,6 +632,7 @@ main (int argc, char *argv[])
_("Ask"), -1);
#endif
g_object_unref (store);
@@ -293,7 +293,7 @@
update_ui ();
-@@ -610,6 +640,7 @@
+@@ -610,6 +640,7 @@ main (int argc, char *argv[])
"toggled", G_CALLBACK (enable_check_toggled), NULL);
g_signal_connect (password_combo,
"changed", G_CALLBACK (password_combo_changed), NULL);
@@ -301,7 +301,7 @@
g_signal_connect (bluetooth_check,
"toggled", G_CALLBACK (enable_bluetooth_check_toggled), NULL);
g_signal_connect (bluetooth_allow_write_check,
-@@ -622,6 +653,7 @@
+@@ -622,6 +653,7 @@ main (int argc, char *argv[])
"changed", G_CALLBACK (accept_obexpush_combo_changed), NULL);
g_signal_connect (notify_received_obexpush_check,
"toggled", G_CALLBACK (notify_received_obexpush_check_toggled), NULL);
@@ -309,7 +309,7 @@
g_signal_connect (GTK_WIDGET (gtk_builder_get_object (builder, "close_button")),
"clicked", G_CALLBACK (gtk_main_quit), NULL);
-@@ -641,6 +673,7 @@
+@@ -641,6 +673,7 @@ main (int argc, char *argv[])
NULL,
NULL,
NULL);
@@ -317,7 +317,7 @@
gconf_client_notify_add (client,
FILE_SHARING_BLUETOOTH_ENABLED,
file_sharing_bluetooth_enabled_changed,
-@@ -677,6 +710,7 @@
+@@ -677,6 +710,7 @@ main (int argc, char *argv[])
NULL,
NULL,
NULL);
@@ -325,10 +325,10 @@
g_object_unref (client);
-Index: gnome-user-share-2.30.0/src/user_share.c
+Index: gnome-user-share-3.0.0/src/user_share.c
===================================================================
---- gnome-user-share-2.30.0.orig/src/user_share.c 2010-03-02 15:36:45.000000000 +0100
-+++ gnome-user-share-2.30.0/src/user_share.c 2010-04-03 18:03:54.193706592 +0200
+--- gnome-user-share-3.0.0.orig/src/user_share.c 2010-03-02 15:36:45.000000000 +0100
++++ gnome-user-share-3.0.0/src/user_share.c 2011-05-31 23:12:46.175846481 +0200
@@ -26,18 +26,22 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
@@ -371,7 +371,7 @@
static gboolean has_console = TRUE;
static BluetoothClient *client = NULL;
-@@ -262,6 +268,7 @@
+@@ -262,6 +268,7 @@ bluez_init (void)
g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
G_CALLBACK (default_adapter_changed), NULL);
}
@@ -379,7 +379,7 @@
static void
migrate_old_configuration (void)
-@@ -297,9 +304,13 @@
+@@ -297,9 +304,13 @@ disabled_timeout_callback (gpointer user
GConfClient* client = (GConfClient *) user_data;
http_down ();
@@ -393,7 +393,7 @@
return FALSE;
}
-@@ -330,6 +341,7 @@
+@@ -330,6 +341,7 @@ file_sharing_enabled_changed (GConfClien
}
}
@@ -401,7 +401,7 @@
static void
file_sharing_bluetooth_allow_write_changed (GConfClient* client,
guint cnxn_id,
-@@ -414,13 +426,16 @@
+@@ -414,13 +426,16 @@ file_sharing_bluetooth_obexpush_notify_c
{
obexpush_set_notify (gconf_client_get_bool (client, FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY, NULL));
}
@@ -418,7 +418,7 @@
_exit (2);
}
-@@ -428,7 +443,9 @@
+@@ -428,7 +443,9 @@ static int
x_io_error_handler (Display *xdisplay)
{
http_down ();
@@ -428,7 +428,7 @@
_exit (2);
}
-@@ -485,20 +502,27 @@
+@@ -485,20 +502,27 @@ main (int argc, char **argv)
migrate_old_configuration ();
client = gconf_client_get_default ();
@@ -456,7 +456,7 @@
gconf_client_add_dir (client,
FILE_SHARING_DIR,
-@@ -517,6 +541,7 @@
+@@ -517,6 +541,7 @@ main (int argc, char **argv)
NULL,
NULL,
NULL);
@@ -464,7 +464,7 @@
gconf_client_notify_add (client,
FILE_SHARING_BLUETOOTH_ENABLED,
file_sharing_bluetooth_enabled_changed,
-@@ -553,18 +578,23 @@
+@@ -553,18 +578,23 @@ main (int argc, char **argv)
NULL,
NULL,
NULL);
Modified: desktop/experimental/gnome-user-share/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-user-share/debian/patches/series?rev=28140&op=diff
==============================================================================
--- desktop/experimental/gnome-user-share/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-user-share/debian/patches/series [utf-8] Tue May 31 21:21:35 2011
@@ -1,3 +1,2 @@
01_apache-config.patch
02_bluetooth_optional.patch
-90_relibtoolize.patch
Modified: desktop/experimental/gnome-user-share/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-user-share/debian/rules?rev=28140&op=diff
==============================================================================
--- desktop/experimental/gnome-user-share/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-user-share/debian/rules [utf-8] Tue May 31 21:21:35 2011
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
Added: desktop/experimental/gnome-user-share/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-user-share/debian/source/format?rev=28140&op=file
==============================================================================
--- desktop/experimental/gnome-user-share/debian/source/format (added)
+++ desktop/experimental/gnome-user-share/debian/source/format [utf-8] Tue May 31 21:21:35 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list