--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: u++: diff for NMU version 5.3.0-1.1
- From: Luk Claes <luk@debian.org>
- Date: Mon, 17 Mar 2008 22:25:08 +0100
- Message-id: <20080317212508.GA10890@station.luk.local>
Package: u++
Version: 5.3.0-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my u++ 5.3.0-1.1 NMU.
diff -u u++-5.3.0/src/kernel/Makefile u++-5.3.0/src/kernel/Makefile
--- u++-5.3.0/src/kernel/Makefile
+++ u++-5.3.0/src/kernel/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/src/translator/Makefile u++-5.3.0/src/translator/Makefile
--- u++-5.3.0/src/translator/Makefile
+++ u++-5.3.0/src/translator/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/src/library/Makefile u++-5.3.0/src/library/Makefile
--- u++-5.3.0/src/library/Makefile
+++ u++-5.3.0/src/library/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/src/examples/IO/Makefile u++-5.3.0/src/examples/IO/Makefile
--- u++-5.3.0/src/examples/IO/Makefile
+++ u++-5.3.0/src/examples/IO/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/src/examples/Makefile u++-5.3.0/src/examples/Makefile
--- u++-5.3.0/src/examples/Makefile
+++ u++-5.3.0/src/examples/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/src/collection/Makefile u++-5.3.0/src/collection/Makefile
--- u++-5.3.0/src/collection/Makefile
+++ u++-5.3.0/src/collection/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/src/debugger/Makefile u++-5.3.0/src/debugger/Makefile
--- u++-5.3.0/src/debugger/Makefile
+++ u++-5.3.0/src/debugger/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/src/profiler/Makefile u++-5.3.0/src/profiler/Makefile
--- u++-5.3.0/src/profiler/Makefile
+++ u++-5.3.0/src/profiler/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/src/scheduler/Makefile u++-5.3.0/src/scheduler/Makefile
--- u++-5.3.0/src/scheduler/Makefile
+++ u++-5.3.0/src/scheduler/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/doc/refman/Makefile u++-5.3.0/doc/refman/Makefile
--- u++-5.3.0/doc/refman/Makefile
+++ u++-5.3.0/doc/refman/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/doc/man/Makefile u++-5.3.0/doc/man/Makefile
--- u++-5.3.0/doc/man/Makefile
+++ u++-5.3.0/doc/man/Makefile
@@ -1,6 +1,6 @@
## Define the appropriate configuration variables.
-PACKAGE = /home/delahaym/u++/u++-5.3.0
+PACKAGE = /home/u++-5.3.0
## Include the architecture dependent definitions.
diff -u u++-5.3.0/debian/control u++-5.3.0/debian/control
--- u++-5.3.0/debian/control
+++ u++-5.3.0/debian/control
@@ -1,8 +1,7 @@
Source: u++
Section: devel
Priority: optional
-Maintainer: Richard C. Bilson <rcbilson@plg.uwaterloo.ca>
-Uploaders: Matthieu Delahaye <matthieu@debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends: csh | c-shell, g++ (>= 1:3.3), debhelper (>> 4.0.0), tetex-bin, tetex-extra
Build-Depends-Indep: debhelper (>> 4.0.0), tetex-bin, tetex-extra
Standards-Version: 3.6.2
diff -u u++-5.3.0/debian/rules u++-5.3.0/debian/rules
--- u++-5.3.0/debian/rules
+++ u++-5.3.0/debian/rules
@@ -36,6 +36,7 @@
-test -f CONFIG && $(MAKE) $(PACKAGEINSTALL_DIRS) scratch
cd doc/refman && rm -f *.aux *.dvi *.idx *.ilg *.ind *.log *.ps *.toc
rm -f CONFIG
+ -rm -rf src/translator/lib-$(UCPP_ARCH) src/translator/obj-$(UCPP_ARCH) src/translator/bin-$(UCPP_ARCH)
dh_clean
diff -u u++-5.3.0/debian/changelog u++-5.3.0/debian/changelog
--- u++-5.3.0/debian/changelog
+++ u++-5.3.0/debian/changelog
@@ -1,3 +1,12 @@
+u++ (5.3.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Set maintainer to Debian QA Group
+ * Fix FTBFS with GCC 4.3 (Closes: #417737).
+ * Clean src/translator/{bin,obj,lib}-linux-ARCH (Closes: #442790).
+
+ -- Luk Claes <luk@debian.org> Mon, 17 Mar 2008 21:19:44 +0000
+
u++ (5.3.0-1) unstable; urgency=low
* New upstream. Now supports amd64. Closes: bug#282843, bug#345004
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/main.cc
+++ u++-5.3.0/src/translator/main.cc
@@ -24,10 +24,12 @@
// along with this library.
//
+#include <cstdlib>
#include <iostream>
#include <iomanip>
#include <fstream>
#include <csignal>
+#include <cstring>
using std::cin;
using std::cout;
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/output.cc
+++ u++-5.3.0/src/translator/output.cc
@@ -32,6 +32,9 @@
#include "input.h"
#include "output.h"
+#include <cstdlib>
+#include <cstring>
+
static char *file = NULL;
static unsigned int line = 1;
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/gen.cc
+++ u++-5.3.0/src/translator/gen.cc
@@ -33,6 +33,8 @@
#include "input.h"
#include "gen.h"
+#include <cstdlib>
+#include <cstring>
void gen_code( token_t *before, const char text ) {
char buffer[2] = { text, '\0' };
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/parse.cc
+++ u++-5.3.0/src/translator/parse.cc
@@ -39,6 +39,8 @@
#include "parse.h"
#include "gen.h"
+#include <cstdlib>
+#include <cstring>
#include <set>
//#define __U_DEBUG_H__
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/cc1plus.cc
+++ u++-5.3.0/src/translator/cc1plus.cc
@@ -24,7 +24,7 @@
// along with this library.
//
-
+#include <cstdlib>
#include <string>
using std::string;
#include <cstdio>
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/input.cc
+++ u++-5.3.0/src/translator/input.cc
@@ -29,6 +29,7 @@
#include "token.h"
#include "input.h"
+#include <cstdlib>
#include <iostream>
using std::cerr;
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/table.cc
+++ u++-5.3.0/src/translator/table.cc
@@ -31,6 +31,7 @@
#include "table.h"
#include "input.h"
+#include <cstdlib>
#include <iostream>
using std::cerr;
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/scan.cc
+++ u++-5.3.0/src/translator/scan.cc
@@ -30,6 +30,7 @@
#include "input.h"
#include "scan.h"
+#include <cstdio>
void scan() {
ahead = ahead->next_parse_token();
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/u++.cc
+++ u++-5.3.0/src/translator/u++.cc
@@ -31,6 +31,7 @@
#include <cstdlib> // getenv, putenv
#include <string> // STL version
#include <unistd.h> // execvp
+#include <cstring>
using std::ifstream;
using std::cerr;
only in patch2:
unchanged:
--- u++-5.3.0.orig/src/translator/token.cc
+++ u++-5.3.0/src/translator/token.cc
@@ -29,6 +29,9 @@
#include "token.h"
#include "main.h"
+#include <cstdlib>
+#include <cstring>
+
// The token manager.
#define INITIAL_SIZE 1000
--- End Message ---