Bug#322973: NMU patch
Blars Blarson
blarson at blars.org
Sat Sep 3 06:01:44 UTC 2005
NMU diff attached.
--
Blars Blarson blarson at blars.org
http://www.blars.org/blars.html
With Microsoft, failure is not an option. It is a standard feature.
-------------- next part --------------
diff -ruN ../orig/nautilus-cd-burner-2.10.2/debian/changelog nautilus-cd-burner-2.10.2/debian/changelog
--- ../orig/nautilus-cd-burner-2.10.2/debian/changelog 2005-09-03 05:45:17.000000000 +0000
+++ nautilus-cd-burner-2.10.2/debian/changelog 2005-09-03 05:51:22.000000000 +0000
@@ -1,3 +1,10 @@
+nautilus-cd-burner (2.10.2-1.1) unstable; urgency=low
+
+ * 0 day NMU durring BSP
+ * remove -Wl,--as-needed (closes: #322973)
+
+ -- Blars Blarson <blarson at blars.org> Sat, 3 Sep 2005 05:50:14 +0000
+
nautilus-cd-burner (2.10.2-1) unstable; urgency=low
* Sebastien Bacher:
diff -ruN ../orig/nautilus-cd-burner-2.10.2/debian/control nautilus-cd-burner-2.10.2/debian/control
--- ../orig/nautilus-cd-burner-2.10.2/debian/control 2005-09-03 05:45:17.000000000 +0000
+++ nautilus-cd-burner-2.10.2/debian/control 2005-09-03 05:57:30.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ross Burton <ross at debian.org>
Build-Depends: debhelper (>= 4.1.87), cdbs, gnome-pkg-tools, intltool, autotools-dev, libgnomeui-dev, libnautilus-extension-dev (>= 2.9.0), libhal-dev (>= 0.2.98), libgtk2.0-dev (>= 2.6.0)
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Akira TAGOH <tagoh at debian.org>, Andreas Rottmann <rotty at debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Carlos Perell?? Mar??n <carlos at pemas.net>, Ed Boraas <ed at debian.org>, Edd Dumbill <ejad at debian.org>, Emil Soleyman-Zomalan <emil at nishra.com>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Joe Drew <drew at debian.org>, Johannes Rohr <j.rohr at comlink.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Ond??ej Sur?? <ondrej at debian.org>, Rob Bradford <rob at debianplanet.org>, Robert McQueen <robot101 at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Akira TAGOH <tagoh at debian.org>, Andreas Rottmann <rotty at debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Carlos Perell?? Mar??n <carlos at pemas.net>, Cl??ment Stenac <zorglub at debian.org>, Ed Boraas <ed at debian.org>, Edd Dumbill <ejad at debian.org>, Emil Soleyman-Zomalan <emil at nishra.com>, Guilherme de S. Pastore <guilherme.pastore at terra.com.br>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Joe Drew <drew at debian.org>, Johannes Rohr <jr.debian at rohr.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Ond??ej Sur?? <ondrej at debian.org>, Rob Bradford <rob at debianplanet.org>, Robert McQueen <robot101 at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at debian.org>
Standards-Version: 3.6.1
Package: nautilus-cd-burner
diff -ruN ../orig/nautilus-cd-burner-2.10.2/debian/rules nautilus-cd-burner-2.10.2/debian/rules
--- ../orig/nautilus-cd-burner-2.10.2/debian/rules 2005-09-03 05:45:17.000000000 +0000
+++ nautilus-cd-burner-2.10.2/debian/rules 2005-09-03 05:50:08.000000000 +0000
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 "
DEB_DH_MAKESHLIBS_ARGS_libnautilus-burn1 := -V 'libnautilus-burn1 (>= 2.10.0)'
diff -ruN ../orig/nautilus-cd-burner-2.10.2/nautilus-burn-recorder-marshal.c nautilus-cd-burner-2.10.2/nautilus-burn-recorder-marshal.c
--- ../orig/nautilus-cd-burner-2.10.2/nautilus-burn-recorder-marshal.c 2005-06-22 16:03:05.000000000 +0000
+++ nautilus-cd-burner-2.10.2/nautilus-burn-recorder-marshal.c 1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-
-#ifndef __nautilus_burn_recorder_marshal_MARSHAL_H__
-#define __nautilus_burn_recorder_marshal_MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v) g_value_get_int (v)
-#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
-#define g_marshal_value_peek_long(v) g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
-#define g_marshal_value_peek_float(v) g_value_get_float (v)
-#define g_marshal_value_peek_double(v) g_value_get_double (v)
-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v) g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v) g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- * Do not access GValues directly in your code. Instead, use the
- * g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
-#define g_marshal_value_peek_char(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v) (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v) (v)->data[0].v_float
-#define g_marshal_value_peek_double(v) (v)->data[0].v_double
-#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN (./cdrecorder-marshal.list:1) */
-extern void nautilus_burn_recorder_marshal_BOOLEAN__BOOLEAN_BOOLEAN_BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-nautilus_burn_recorder_marshal_BOOLEAN__BOOLEAN_BOOLEAN_BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_BOOLEAN_BOOLEAN) (gpointer data1,
- gboolean arg_1,
- gboolean arg_2,
- gboolean arg_3,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__BOOLEAN_BOOLEAN_BOOLEAN callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 4);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_boolean (param_values + 1),
- g_marshal_value_peek_boolean (param_values + 2),
- g_marshal_value_peek_boolean (param_values + 3),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-/* VOID:INT,INT (./cdrecorder-marshal.list:2) */
-extern void nautilus_burn_recorder_marshal_VOID__INT_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-nautilus_burn_recorder_marshal_VOID__INT_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
- gint arg_1,
- gint arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__INT_INT callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 3);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_int (param_values + 1),
- g_marshal_value_peek_int (param_values + 2),
- data2);
-}
-
-/* BOOLEAN:VOID (./cdrecorder-marshal.list:3) */
-extern void nautilus_burn_recorder_marshal_BOOLEAN__VOID (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-nautilus_burn_recorder_marshal_BOOLEAN__VOID (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__VOID callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 1);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-G_END_DECLS
-
-#endif /* __nautilus_burn_recorder_marshal_MARSHAL_H__ */
-
diff -ruN ../orig/nautilus-cd-burner-2.10.2/nautilus-burn-recorder-marshal.h nautilus-cd-burner-2.10.2/nautilus-burn-recorder-marshal.h
--- ../orig/nautilus-cd-burner-2.10.2/nautilus-burn-recorder-marshal.h 2005-06-22 16:03:04.000000000 +0000
+++ nautilus-cd-burner-2.10.2/nautilus-burn-recorder-marshal.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-
-#ifndef __nautilus_burn_recorder_marshal_MARSHAL_H__
-#define __nautilus_burn_recorder_marshal_MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN (./cdrecorder-marshal.list:1) */
-extern void nautilus_burn_recorder_marshal_BOOLEAN__BOOLEAN_BOOLEAN_BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-/* VOID:INT,INT (./cdrecorder-marshal.list:2) */
-extern void nautilus_burn_recorder_marshal_VOID__INT_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-/* BOOLEAN:VOID (./cdrecorder-marshal.list:3) */
-extern void nautilus_burn_recorder_marshal_BOOLEAN__VOID (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-G_END_DECLS
-
-#endif /* __nautilus_burn_recorder_marshal_MARSHAL_H__ */
-
More information about the Pkg-gnome-maintainers
mailing list