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 <[EMAIL PROTECTED]>
-Uploaders: Debian GNOME Maintainers <[EMAIL PROTECTED]>, Akira TAGOH <[EMAIL
PROTECTED]>, Andreas Rottmann <[EMAIL PROTECTED]>, Andrew Lau <[EMAIL
PROTECTED]>, Cl????ment Stenac <[EMAIL PROTECTED]>, Dafydd Harries <[EMAIL
PROTECTED]>, Guilherme de S. Pastore <[EMAIL PROTECTED]>, Gustavo Franco
<[EMAIL PROTECTED]>, Gustavo Noronha Silva <[EMAIL PROTECTED]>, J.H.M. Dassen
(Ray) <[EMAIL PROTECTED]>, Jordi Mallach <[EMAIL PROTECTED]>, Jose Carlos
Garcia Sogo <[EMAIL PROTECTED]>, Josselin Mouette <[EMAIL PROTECTED]>, Loic
Minier <[EMAIL PROTECTED]>, Marc HE Brockschmidt <[EMAIL PROTECTED]>, Marco
Cabizza <[EMAIL PROTECTED]>, Ond???ej Sur???? <[EMAIL PROTECTED]>, Ross Burton
<[EMAIL PROTECTED]>, Sjoerd Simons <[EMAIL PROTECTED]>, Takuo KITAME <[EMAIL
PROTECTED]>
+Uploaders: Debian GNOME Maintainers <[EMAIL PROTECTED]>, Andrew Lau <[EMAIL
PROTECTED]>, Cl????ment Stenac <[EMAIL PROTECTED]>, Dafydd Harries <[EMAIL
PROTECTED]>, Guilherme de S. Pastore <[EMAIL PROTECTED]>, Gustavo Franco
<[EMAIL PROTECTED]>, Gustavo Noronha Silva <[EMAIL PROTECTED]>, J.H.M. Dassen
(Ray) <[EMAIL PROTECTED]>, Jordi Mallach <[EMAIL PROTECTED]>, Jose Carlos
Garcia Sogo <[EMAIL PROTECTED]>, Josselin Mouette <[EMAIL PROTECTED]>, Loic
Minier <[EMAIL PROTECTED]>, Marc HE Brockschmidt <[EMAIL PROTECTED]>, Marco
Cabizza <[EMAIL PROTECTED]>, Oystein Gisnas <[EMAIL PROTECTED]>, Ond???ej
Sur???? <[EMAIL PROTECTED]>, Ross Burton <[EMAIL PROTECTED]>, Sjoerd Simons
<[EMAIL PROTECTED]>
Build-Depends: debhelper (>> 5.0.22), pkg-config (>= 0.14.0), gettext,
autotools-dev, gnome-pkg-tools
Standards-Version: 3.6.2
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=low
+
+ * Non-maintainer upload.
+ * Drop 999_ia64_atomic_ops_broken.patch, no longer needed w/ gcc-4.1
+ (closes: #376260).
+
+ -- dann frazier <[EMAIL PROTECTED]> Tue, 11 Jul 2006 18:58:46 -0600
+
glib2.0 (2.10.3-2) unstable; urgency=medium
* 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);
- }
-
- void
- g_atomic_int_add (volatile gint *atomic,
- gint val)
- {
-- __sync_fetch_and_add (atomic, val);
-+ __sync_fetch_and_add_si (atomic, val);
- }
-
- gboolean
-@@ -429,7 +429,7 @@
- gint oldval,
- gint newval)
- {
-- return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
-
- gboolean
-@@ -437,7 +437,7 @@
- gpointer oldval,
- gpointer newval)
- {
-- return __sync_bool_compare_and_swap ((long *)atomic,
-+ return __sync_bool_compare_and_swap_di ((long *)atomic,
- (long)oldval, (long)newval);
- }
-
--
dann frazier
