tags 641871 + pending
tags 650226 + patch
tags 650226 + pending
thanks
Dear maintainer,
I've prepared an NMU for ethos (versioned as 0.2.2-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru ethos-0.2.2/debian/changelog ethos-0.2.2/debian/changelog
--- ethos-0.2.2/debian/changelog 2011-07-29 23:21:22.000000000 +0200
+++ ethos-0.2.2/debian/changelog 2011-12-25 12:53:57.000000000 +0100
@@ -1,3 +1,12 @@
+ethos (0.2.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace deprecated "G_CONST_RETURN" with "const". (Closes: #650226)
+ + new patch: 650226-G_CONST_RETURN.diff
+ * Add dependency on python-gtk2 to python-ethos. (Closes: #641871)
+
+ -- Ansgar Burchardt <ans...@debian.org> Sun, 25 Dec 2011 12:53:54 +0100
+
ethos (0.2.2-2) unstable; urgency=low
* Acknowledge NMUs.
diff -Nru ethos-0.2.2/debian/control ethos-0.2.2/debian/control
--- ethos-0.2.2/debian/control 2011-07-29 23:21:22.000000000 +0200
+++ ethos-0.2.2/debian/control 2011-12-25 12:52:51.000000000 +0100
@@ -92,7 +92,8 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- ${python:Depends}
+ ${python:Depends},
+ python-gtk2
Provides: ${python:Provides}
Description: GObject library for application plugins - Python bindings
Ethos is a library providing a standard system of reusable extensions. The
diff -Nru ethos-0.2.2/debian/patches/650226-G_CONST_RETURN.diff
ethos-0.2.2/debian/patches/650226-G_CONST_RETURN.diff
--- ethos-0.2.2/debian/patches/650226-G_CONST_RETURN.diff 1970-01-01
01:00:00.000000000 +0100
+++ ethos-0.2.2/debian/patches/650226-G_CONST_RETURN.diff 2011-12-25
12:48:41.000000000 +0100
@@ -0,0 +1,249 @@
+From: Ansgar Burchardt <ans...@debian.org>
+Bug-Debian: http://bugs.debian.org/650226
+Origin: vendor
+Subject: Replace deprecated "G_CONST_RETURN" with "const"
+
+--- ethos.orig/ethos/ethos-manager.c
++++ ethos/ethos/ethos-manager.c
+@@ -888,11 +888,11 @@
+ * Return value: a %NULL terminated list of strings containing directories
that will be
+ * traversed to locate plugins. This reslut should never be modified or
freed.
+ */
+-G_CONST_RETURN gchar**
++const gchar**
+ ethos_manager_get_plugin_dirs (EthosManager *manager)
+ {
+ g_return_val_if_fail (ETHOS_IS_MANAGER (manager), NULL);
+- return (G_CONST_RETURN gchar**)manager->priv->plugin_dirs;
++ return (const gchar**)manager->priv->plugin_dirs;
+ }
+
+ /**
+@@ -924,7 +924,7 @@
+ *
+ * Return value: the configured app name used for plugins or %NULL
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_manager_get_app_name (EthosManager *manager)
+ {
+ g_return_val_if_fail (ETHOS_IS_MANAGER (manager), NULL);
+--- ethos.orig/ethos/ethos-manager.h
++++ ethos/ethos/ethos-manager.h
+@@ -89,10 +89,10 @@
+ EthosPlugin* ethos_manager_get_plugin (EthosManager
*manager,
+ EthosPluginInfo
*plugin_info);
+ GList* ethos_manager_get_plugin_loaders (EthosManager
*manager);
+-G_CONST_RETURN gchar** ethos_manager_get_plugin_dirs (EthosManager
*manager);
++const gchar** ethos_manager_get_plugin_dirs (EthosManager *manager);
+ void ethos_manager_set_plugin_dirs (EthosManager
*manager,
+ gchar
**plugin_dirs);
+-G_CONST_RETURN gchar* ethos_manager_get_app_name (EthosManager
*manager);
++const gchar* ethos_manager_get_app_name (EthosManager *manager);
+ void ethos_manager_set_app_name (EthosManager
*manager,
+ const gchar
*app_name);
+
+--- ethos.orig/ethos/ethos-plugin-info.c
++++ ethos/ethos/ethos-plugin-info.c
+@@ -620,7 +620,7 @@
+ *
+ * Return value: The unique id of the plugin which should not be modified or
freed.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_id (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -640,7 +640,7 @@
+ *
+ * Return value: The name of the plugin. This value should not be freed or
modified.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_name (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -661,7 +661,7 @@
+ * Return value: The module of the plugin. This value should not be
+ * modified or freed.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_module (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -682,7 +682,7 @@
+ * Return value: The loader to use to load the plugin. This value should
+ * not be modified or freed.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_loader (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -724,7 +724,7 @@
+ * Return value: A string containing the description. The string
+ * should not be modified or freed.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_description (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -745,7 +745,7 @@
+ * Return value: A string containing the copyright. The string
+ * should not be modified or freed.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_copyright (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -766,7 +766,7 @@
+ * Return value: A string containing the website. The string
+ * should not be modified or freed.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_website (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -814,7 +814,7 @@
+ *
+ * Return value: A string containing the dependencies or %NULL.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_dependencies (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -880,7 +880,7 @@
+ *
+ * Return value: A string or %NULL
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_filename (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+@@ -921,7 +921,7 @@
+ *
+ * Return value: the version of the plugin
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_version (EthosPluginInfo *plugin_info)
+ {
+ g_return_val_if_fail (ETHOS_IS_PLUGIN_INFO (plugin_info), 0);
+@@ -958,7 +958,7 @@
+ * Return value: A string containing the icon name or %NULL. This value
+ * should not be modified or freed.
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_info_get_icon_name (EthosPluginInfo *plugin_info)
+ {
+ EthosPluginInfoPrivate *priv;
+--- ethos.orig/ethos/ethos-plugin-info.h
++++ ethos/ethos/ethos-plugin-info.h
+@@ -71,23 +71,23 @@
+ gsize
length,
+ GError
**error);
+
+-G_CONST_RETURN gchar* ethos_plugin_info_get_id (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_id (EthosPluginInfo
*plugin_info);
+ void ethos_plugin_info_set_id (EthosPluginInfo
*plugin_info,
+ const gchar
*id);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_filename (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_filename (EthosPluginInfo
*plugin_info);
+ void ethos_plugin_info_set_filename (EthosPluginInfo
*plugin_info,
+ const gchar
*filename);
+
+-G_CONST_RETURN gchar* ethos_plugin_info_get_name (EthosPluginInfo
*plugin_info);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_module (EthosPluginInfo
*plugin_info);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_loader (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_name (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_module (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_loader (EthosPluginInfo
*plugin_info);
+ gchar** ethos_plugin_info_get_authors (EthosPluginInfo
*plugin_info);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_description (EthosPluginInfo
*plugin_info);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_copyright (EthosPluginInfo
*plugin_info);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_website (EthosPluginInfo
*plugin_info);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_version (EthosPluginInfo
*plugin_info);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_dependencies (EthosPluginInfo
*plugin_info);
+-G_CONST_RETURN gchar* ethos_plugin_info_get_icon_name (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_description (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_copyright (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_website (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_version (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_dependencies (EthosPluginInfo
*plugin_info);
++const gchar* ethos_plugin_info_get_icon_name (EthosPluginInfo
*plugin_info);
+ gboolean ethos_plugin_info_get_active (EthosPluginInfo
*plugin_info);
+ void ethos_plugin_info_set_active (EthosPluginInfo
*plugin_info,
+ gboolean
active);
+--- ethos.orig/ethos/ethos-plugin-loader.c
++++ ethos/ethos/ethos-plugin-loader.c
+@@ -80,7 +80,7 @@
+ *
+ * Return value: The name of the plugin loader or %NULL
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ ethos_plugin_loader_get_name (EthosPluginLoader *plugin_loader)
+ {
+ return ETHOS_PLUGIN_LOADER_GET_INTERFACE (plugin_loader)->
+--- ethos.orig/ethos/ethos-plugin-loader.h
++++ ethos/ethos/ethos-plugin-loader.h
+@@ -59,7 +59,7 @@
+ };
+
+ GType ethos_plugin_loader_get_type (void) G_GNUC_CONST;
+-G_CONST_RETURN gchar* ethos_plugin_loader_get_name (EthosPluginLoader
*plugin_loader);
++const gchar* ethos_plugin_loader_get_name (EthosPluginLoader
*plugin_loader);
+ void ethos_plugin_loader_initialize (EthosPluginLoader
*plugin_loader,
+ EthosManager
*manager);
+ void ethos_plugin_loader_unload (EthosPluginLoader
*plugin_loader);
+--- ethos.orig/plugin-loaders/c/ethos-c-plugin-loader.c
++++ ethos/plugin-loaders/c/ethos-c-plugin-loader.c
+@@ -31,7 +31,7 @@
+ gpointer dummy;
+ };
+
+-static G_CONST_RETURN gchar*
++static const gchar*
+ get_name (EthosPluginLoader *plugin_loader)
+ {
+ /* NULL is for default loader */
+--- ethos.orig/plugin-loaders/js/ethos-js-plugin-loader.c
++++ ethos/plugin-loaders/js/ethos-js-plugin-loader.c
+@@ -34,7 +34,7 @@
+ EthosPlugin *created_plugin;
+ };
+
+-static G_CONST_RETURN gchar*
++static const gchar*
+ get_name (EthosPluginLoader *plugin_loader)
+ {
+ return "js";
+--- ethos.orig/plugin-loaders/mono/ethos-mono-plugin-loader.c
++++ ethos/plugin-loaders/mono/ethos-mono-plugin-loader.c
+@@ -35,7 +35,7 @@
+ gboolean initialized;
+ };
+
+-static G_CONST_RETURN gchar*
++static const gchar*
+ ethos_mono_plugin_loader_get_name (EthosPluginLoader *plugin_loader)
+ {
+ return "mono";
+--- ethos.orig/plugin-loaders/python/ethos-python-plugin-loader.c
++++ ethos/plugin-loaders/python/ethos-python-plugin-loader.c
+@@ -38,7 +38,7 @@
+ gboolean init_failed;
+ };
+
+-static G_CONST_RETURN gchar*
++static const gchar*
+ ethos_python_plugin_loader_get_name (EthosPluginLoader *plugin_loader)
+ {
+ return "python";
diff -Nru ethos-0.2.2/debian/patches/series ethos-0.2.2/debian/patches/series
--- ethos-0.2.2/debian/patches/series 2011-07-29 23:21:22.000000000 +0200
+++ ethos-0.2.2/debian/patches/series 2011-12-25 12:45:58.000000000 +0100
@@ -2,3 +2,4 @@
02-pkg-config-for-vala-0.10.patch
vala_bindings_enh_1812cbc.patch
tests-new-api.patch
+650226-G_CONST_RETURN.diff
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
