Hello,
I'm doing an NMU of savant to fix #337110 and #345740; diff attached.
Thanks,
Matej
diff -u savant-20031216/debian/changelog savant-20031216/debian/changelog
--- savant-20031216/debian/changelog
+++ savant-20031216/debian/changelog
@@ -1,3 +1,14 @@
+savant (20031216-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for C++ transition. Closes: #337110, #345740.
+ * src/util/hash_table.hh: Include savant.hh for ASSERT().
+ * src/util/set.hh: Import std::cout, std::endl.
+ * Remove unnecessary build dependency on g++.
+ * Remove /usr/doc compatibility code.
+
+ -- Matej Vela <[EMAIL PROTECTED]> Sat, 28 Jan 2006 11:22:38 +0100
+
savant (20031216-5) unstable; urgency=low
* Made the build dependency just "g++", not -3.2 or -3.3.
diff -u savant-20031216/debian/control savant-20031216/debian/control
--- savant-20031216/debian/control
+++ savant-20031216/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Dale E Martin <[EMAIL PROTECTED]>
Standards-Version: 3.5.6.1
-Build-Depends: pccts, flex, g++, debhelper (>> 4.1.0), libclutils0-dev
+Build-Depends: pccts, flex, debhelper (>> 4.1.0), libclutils0-dev
Package: libaire0
Architecture: any
reverted:
--- savant-20031216/debian/scram.prerm
+++ savant-20031216.orig/debian/scram.prerm
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/scram ]; then
- rm -f /usr/doc/scram
-fi
-
-#DEBHELPER#
reverted:
--- savant-20031216/debian/libaire0.prerm
+++ savant-20031216.orig/debian/libaire0.prerm
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/libaire0 ]; then
- rm -f /usr/doc/libaire0
-fi
-
-#DEBHELPER#
reverted:
--- savant-20031216/debian/libaire0.postinst
+++ savant-20031216.orig/debian/libaire0.postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/libaire0 -a -d /usr/share/doc/libaire0 ];
then
- ln -sf ../share/doc/libaire0 /usr/doc/libaire0
- fi
-fi
-
-#DEBHELPER#
reverted:
--- savant-20031216/debian/scram.postinst
+++ savant-20031216.orig/debian/scram.postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/scram -a -d /usr/share/doc/scram ]; then
- ln -sf ../share/doc/scram /usr/doc/scram
- fi
-fi
-
-#DEBHELPER#
only in patch2:
unchanged:
--- savant-20031216.orig/src/util/hash_table.hh
+++ savant-20031216/src/util/hash_table.hh
@@ -29,6 +29,7 @@
#include <iostream>
#include <cstring>
+#include "savant.hh"
#include "dl_list.hh"
/** Template based bucket hashing class. Hashes on input string.
only in patch2:
unchanged:
--- savant-20031216.orig/src/util/set.hh
+++ savant-20031216/src/util/set.hh
@@ -30,6 +30,8 @@
#include "dl_list.hh"
#include "IIR_Declaration.hh"
#include "IIR_TypeDefinition.hh"
+using std::cout;
+using std::endl;
template <class type>
class set{
