tags 622067 + patch tags 622067 + pending thanks Dear maintainer,
I've prepared an NMU for gnome-alsamixer (versioned as 0.9.7~cvs.20060916.ds.1-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Tom Waits: Hold On
diff -u gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/rules gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/rules --- gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/rules +++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/rules @@ -11,7 +11,7 @@ # DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -DEB_MAKE_ENVVARS := CFLAGS="-UG_DISABLE_DEPRECATED -UGDK_DISABLE_DEPRECATED -UGTK_DISABLE_DEPRECATED -UGNOME_DISABLE_DEPRECATED" +# DEB_MAKE_ENVVARS := CFLAGS="-UG_DISABLE_DEPRECATED -UGDK_DISABLE_DEPRECATED -UGTK_DISABLE_DEPRECATED -UGNOME_DISABLE_DEPRECATED" cleanbuilddir/gnome-alsamixer:: rm -f po/*.gmo diff -u gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/changelog gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/changelog --- gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/changelog +++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/changelog @@ -1,3 +1,18 @@ +gnome-alsamixer (0.9.7~cvs.20060916.ds.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: gnome-app-helper.h:620:2: error: expected specifier- + qualifier-list before 'GtkCallbackMarshal'": add patches from Ubuntu / + Julien Lavergne: + + debian/patches: + - 05-remove-G_CONST_RETURN.patch: Remove usage of G_CONST_RETURN. + - 06-use-libgnome-headers.patch: Use correct headers. + + debian/rules: + - Remove deprecated flags. + Closes: #622067, LP: #749291 + + -- gregor herrmann <[email protected]> Fri, 21 Oct 2011 15:42:12 +0200 + gnome-alsamixer (0.9.7~cvs.20060916.ds.1-2) unstable; urgency=low * Bump Standards-Version to 3.8.0 and debhelper compat to 7. diff -u gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/patches/series gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/patches/series --- gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/patches/series +++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/patches/series @@ -4,0 +5,2 @@ +05-remove-G_CONST_RETURN.patch +06-use-libgnome-headers.patch only in patch2: unchanged: --- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/debian/patches/05-remove-G_CONST_RETURN.patch +++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/patches/05-remove-G_CONST_RETURN.patch @@ -0,0 +1,111 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.c 2011-09-12 21:01:20.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c 2011-09-12 21:02:41.000000000 +0200 +@@ -439,7 +439,7 @@ + NULL); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_mixer_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +@@ -451,7 +451,7 @@ + return priv->mixer_name; + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_config_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.h 2011-09-12 21:01:43.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h 2011-09-12 21:03:36.000000000 +0200 +@@ -57,8 +57,8 @@ + GType gam_mixer_get_type (void) G_GNUC_CONST; + GtkWidget *gam_mixer_new (GamApp *gam_app, + const gchar *card_id); +-G_CONST_RETURN gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); +-G_CONST_RETURN gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); + gchar *gam_mixer_get_display_name (GamMixer *gam_mixer); + void gam_mixer_set_display_name (GamMixer *gam_mixer, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.c 2011-09-12 21:01:49.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c 2011-09-12 21:03:47.000000000 +0200 +@@ -440,7 +440,7 @@ + g_signal_emit (gam_slider, signals[REFRESH], 0); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +@@ -452,7 +452,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_config_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.h 2011-09-12 21:01:28.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h 2011-09-12 21:03:13.000000000 +0200 +@@ -58,8 +58,8 @@ + #include "gam-mixer.h" + + GType gam_slider_get_type (void) G_GNUC_CONST; +-G_CONST_RETURN gchar *gam_slider_get_name (GamSlider *gam_slider); +-G_CONST_RETURN gchar *gam_slider_get_config_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_config_name (GamSlider *gam_slider); + gchar *gam_slider_get_display_name (GamSlider *gam_slider); + void gam_slider_set_display_name (GamSlider *gam_slider, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.c 2011-09-12 21:01:36.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c 2011-09-12 21:03:26.000000000 +0200 +@@ -371,7 +371,7 @@ + internal_state); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +@@ -383,7 +383,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_config_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.h 2011-09-12 21:01:55.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h 2011-09-12 21:04:00.000000000 +0200 +@@ -55,8 +55,8 @@ + gboolean gam_toggle_get_state (GamToggle *gam_toggle); + void gam_toggle_set_state (GamToggle *gam_toggle, + gboolean state); +-G_CONST_RETURN gchar *gam_toggle_get_name (GamToggle *gam_toggle); +-G_CONST_RETURN gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); + gchar *gam_toggle_get_display_name (GamToggle *gam_toggle); + void gam_toggle_set_display_name (GamToggle *gam_toggle, + const gchar *name); only in patch2: unchanged: --- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/debian/patches/06-use-libgnome-headers.patch +++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/debian/patches/06-use-libgnome-headers.patch @@ -0,0 +1,35 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-main.c 2011-09-12 21:53:35.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c 2011-09-12 21:53:38.000000000 +0200 +@@ -22,7 +22,7 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <libgnome/libgnome.h> + #include <glib/gi18n.h> + + #include "gam-app.h" +@@ -39,7 +39,7 @@ + textdomain (GETTEXT_PACKAGE); + #endif + +- prog = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, ++ prog = gnome_program_init (PACKAGE, VERSION, LIBGNOME_MODULE, + argc, argv, + GNOME_PARAM_HUMAN_READABLE_NAME, _("GNOME ALSA Mixer"), + GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR, +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.c 2011-09-12 21:53:45.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c 2011-09-12 21:57:15.000000000 +0200 +@@ -27,7 +27,7 @@ + #include <gtk/gtkmenuitem.h> + #include <glib/gi18n.h> + #include <libgnomeui/gnome-about.h> +-#include <libgnomeui/gnome-app-helper.h> ++/*#include <libgnomeui/gnome-app-helper.h>*/ + #include <libgnomeui/gnome-stock-icons.h> + + #include "gam-app.h"
signature.asc
Description: Digital signature
