Hi, NMU patch is attached.
debdiff entity_1.0.1-7.dsc entity_1.0.1-7.1.dsc
entity-1.0.1/debian/changelog | 14 ++++++++++++--
entity-1.0.1/debian/control | 2 +-
libentitynjs/iostream.c | 4 ++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff -u entity-1.0.1/debian/changelog entity-1.0.1/debian/changelog
--- entity-1.0.1/debian/changelog
+++ entity-1.0.1/debian/changelog
@@ -1,3 +1,13 @@
+entity (1.0.1-7.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update Build-Depends to xlibmesa-gl-dev (Closes: #328154).
+ * libentitynjs/iostream.c: Apply patch by Andreas Jochens to fix FTBFS with
+ gcc-4.0 (Closes: #285693).
+ * Fix changelog formatting.
+
+ -- Christoph Berg <[EMAIL PROTECTED]> Thu, 10 Nov 2005 15:29:03 +0100
+
entity (1.0.1-7) unstable; urgency=low
* Update to Policy 3.6.1 (no changes needed).
@@ -151,13 +161,13 @@
* New CVS pull.
- -- Brian Bassett <[EMAIL PROTECTED]> Thu, 31 Aug 2000 17:10:03 -0700
+ -- Brian Bassett <[EMAIL PROTECTED]> Thu, 31 Aug 2000 17:10:03 -0700
entity (0.6.5-2) unstable; urgency=low
* Fix build-depends (closes: #65964)
- -- Brian Bassett <[EMAIL PROTECTED]> Fri, 23 Jun 2000 23:19:24 -0700
+ -- Brian Bassett <[EMAIL PROTECTED]> Fri, 23 Jun 2000 23:19:24 -0700
entity (0.6.5.cvs20000618-1) entity-cvsdebs; urgency=low
diff -u entity-1.0.1/debian/control entity-1.0.1/debian/control
--- entity-1.0.1/debian/control
+++ entity-1.0.1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Brian Bassett <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: python2.3-dev (>= 2.3-4), python (>= 2.3-4), python (<< 2.4),
tcl8.4-dev, perl (>= 5.8.0), libperl-dev (>= 5.8.0), gdk-imlib1-dev,
libglib1.2-dev (>= 1.2.6), libgtk1.2-dev (>= 1.2.6), libpcre3-dev,
gtkglarea5-dev, xlibmesa-dev | libgl-dev, libglut3-dev, debhelper (>= 1.1.17),
libssl-dev, libgdk-pixbuf-dev
+Build-Depends: python2.3-dev (>= 2.3-4), python (>= 2.3-4), python (<< 2.4),
tcl8.4-dev, perl (>= 5.8.0), libperl-dev (>= 5.8.0), gdk-imlib1-dev,
libglib1.2-dev (>= 1.2.6), libgtk1.2-dev (>= 1.2.6), libpcre3-dev,
gtkglarea5-dev, xlibmesa-gl-dev | libgl-dev, libglut3-dev, debhelper (>=
1.1.17), libssl-dev, libgdk-pixbuf-dev
Package: entity
Architecture: any
only in patch2:
unchanged:
--- entity-1.0.1.orig/libentitynjs/iostream.c
+++ entity-1.0.1/libentitynjs/iostream.c
@@ -233,7 +233,7 @@
stream->bufpos += got;
size -= got;
- (unsigned char *) ptr += got;
+ ptr = (unsigned char *) ptr + got;
total += got;
}
else
@@ -290,7 +290,7 @@
stream->data_in_buf += space;
total += space;
size -= space;
- (unsigned char *) ptr += space;
+ ptr = (unsigned char *) ptr + space;
/* Now the buffer contains buffered write data. */
stream->writep = 1;
Christoph
--
[EMAIL PROTECTED] | http://www.df7cb.de/
signature.asc
Description: Digital signature
