Bug#376260: NMU uploaded

[dann frazier]

NMU uploaded; here's the debdiff.  The debian/docs & debian/control
differences are just due to their regeneration - I made no changes
to them myself.

diff -u glib2.0-2.10.3/debian/docs glib2.0-2.10.3/debian/docs
--- glib2.0-2.10.3/debian/docs
+++ glib2.0-2.10.3/debian/docs
@@ -1,6 +1,6 @@
-build-tree/glib-2.6.1/NEWS
-build-tree/glib-2.6.1/NEWS.pre-1-3
-build-tree/glib-2.6.1/README
-build-tree/glib-2.6.1/ChangeLog.pre-1-2
-build-tree/glib-2.6.1/ChangeLog.pre-2-0
-build-tree/glib-2.6.1/ChangeLog.pre-2-2
+build-tree/glib-2.10.3/NEWS
+build-tree/glib-2.10.3/NEWS.pre-1-3
+build-tree/glib-2.10.3/README
+build-tree/glib-2.10.3/ChangeLog.pre-1-2
+build-tree/glib-2.10.3/ChangeLog.pre-2-0
+build-tree/glib-2.10.3/ChangeLog.pre-2-2
diff -u glib2.0-2.10.3/debian/control glib2.0-2.10.3/debian/control
--- glib2.0-2.10.3/debian/control
+++ glib2.0-2.10.3/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 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 debi=
an.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Cl=81=C3=81=A9ment =
Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme d=
e S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, =
Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debi=
an.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo=
@debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.=
org>, Marc HE Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.=
com>, Ond=81=C5=99ej Sur=81=C3=81=BD <ondrej at debian.org>, Ross Burton <ro=
ss at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at d=
ebian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.=
debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Cl=81=C3=81=A9m=
ent Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilher=
me de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.or=
g>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen@=
debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <j=
sogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at d=
ooz.org>, Marc HE Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gm=
ail.com>, Oystein Gisnas <oystein at gisnas.net>, Ond=81=C5=99ej Sur=81=C3=81=
=BD <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sjoerd Simons <sj=
oerd at debian.org>
 Build-Depends: debhelper (>> 5.0.22), pkg-config (>=3D 0.14.0), gettext,=
 autotools-dev, gnome-pkg-tools
 Standards-Version: 3.6.2
=20
diff -u glib2.0-2.10.3/debian/changelog glib2.0-2.10.3/debian/changelog
--- glib2.0-2.10.3/debian/changelog
+++ glib2.0-2.10.3/debian/changelog
@@ -1,3 +1,11 @@
+glib2.0 (2.10.3-2.1) unstable; urgency=3Dlow
+
+  * Non-maintainer upload.
+  * Drop 999_ia64_atomic_ops_broken.patch, no longer needed w/ gcc-4.1
+    (closes: #376260).
+
+ -- dann frazier <dannf at debian.org>  Tue, 11 Jul 2006 18:58:46 -0600
+
 glib2.0 (2.10.3-2) unstable; urgency=3Dmedium
=20
   * Re-add changes from 2.10.2-2 that were lost in the wild
reverted:
--- glib2.0-2.10.3/debian/patches/999_ia64_atomic_ops_broken.patch
+++ glib2.0-2.10.3.orig/debian/patches/999_ia64_atomic_ops_broken.patch
@@ -1,37 +0,0 @@
---- glib-2.10.0/glib/gatomic.c	2006-02-24 14:02:51.000000000 +0000
-+++ glib-2.10.0/glib/gatomic.c	2006-03-06 18:12:06.000000000 +0000
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- 			       gint           val)
- {
--  return __sync_fetch_and_add (atomic, val);
-+  return __sync_fetch_and_add_si (atomic, val);
- }
- =20
- void
- g_atomic_int_add (volatile gint *atomic,=20
- 		  gint val)
- {
--  __sync_fetch_and_add (atomic, val);
-+  __sync_fetch_and_add_si (atomic, val);
- }
-=20
- gboolean
-@@ -429,7 +429,7 @@
- 				   gint           oldval,=20
- 				   gint           newval)
- {
--  return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+  return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
-=20
- gboolean
-@@ -437,7 +437,7 @@
- 				       gpointer           oldval,=20
- 				       gpointer           newval)
- {
--  return __sync_bool_compare_and_swap ((long *)atomic,=20
-+  return __sync_bool_compare_and_swap_di ((long *)atomic,=20
- 				       (long)oldval, (long)newval);
- }
-=20


--=20
dann frazier