I've uploaded the following NMU.  Note that it also fixes #369088 but
I forgot to put this in the changelog.


diff -u vrweb-1.5/debian/patches/00list vrweb-1.5/debian/patches/00list
--- vrweb-1.5/debian/patches/00list
+++ vrweb-1.5/debian/patches/00list
@@ -5,0 +6 @@
+40_gcc41
diff -u vrweb-1.5/debian/control vrweb-1.5/debian/control
--- vrweb-1.5/debian/control
+++ vrweb-1.5/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Stan Vasilyev <[EMAIL PROTECTED]>
 Standards-Version: 3.6.2.1
-Build-Depends: debhelper (>> 4.1), dpatch, libx11-dev, libxext-dev, 
libxmu-dev, x-dev, xutils, xlibmesa-gl-dev, xlibmesa-glu-dev, libpng12-dev, 
libtiff4-dev, libjpeg62-dev
+Build-Depends: debhelper (>> 4.1), dpatch, libx11-dev, libxext-dev, 
libxmu-dev, x-dev, xutils, xlibmesa-gl-dev, libglu1-mesa-dev | libglu-dev, 
libpng12-dev, libtiff4-dev, libjpeg62-dev
 
 Package: vrweb
 Architecture: any
diff -u vrweb-1.5/debian/changelog vrweb-1.5/debian/changelog
--- vrweb-1.5/debian/changelog
+++ vrweb-1.5/debian/changelog
@@ -1,3 +1,11 @@
+vrweb (1.5-15.1) unstable; urgency=low
+
+  * NMU as part of the GCC 4.1 transition.
+  * Update build-dependency to libglu1-mesa-dev.
+  * Remove extra qualification from C++ file (Closes: #357408)
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]>  Sun, 28 May 2006 11:56:45 +0200
+
 vrweb (1.5-15) unstable; urgency=low
 
   * New maintainer. (Closes: #279818)
only in patch2:
unchanged:
--- vrweb-1.5.orig/debian/patches/40_gcc41.dpatch
+++ vrweb-1.5/debian/patches/40_gcc41.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian/patches/40_gcc41.dpatch
+## by [EMAIL PROTECTED]
+## DP: Fix GCC 4.1 build failure
+
[EMAIL PROTECTED]@
+--- vrweb-1.5/src/harmony/iicmviews/InterViews/style.C~        2006-03-17 
04:30:13.000000000 +0000
++++ vrweb-1.5/src/harmony/iicmviews/InterViews/style.C 2006-03-17 
04:30:16.000000000 +0000
+@@ -145,7 +145,7 @@
+       const UniqueString& name, const StyleAttributeTableEntry&,
+       const StyleList&, long s_index, String& value
+     );
+-    int StyleRep::finish_match(
++    int finish_match(
+       const StyleList&, long s_index, const UniqueStringList&, long p_index
+     );
+ };
+

-- 
Martin Michlmayr
http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to