Package: sawzall
Version: 1.0-1
Followup-For: Bug #663575
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch
In Ubuntu, the attached patch can be applied to achieve the following:
* Add fix_erroneous_contructor patch from upstream changeset #38 to
resolve FTBFS (Closes: #663575)
Thanks for considering the patch.
Please note that there are additional issues that cause further FTBFS;
this patch addresses this specific issue.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-35-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru sawzall-1.0/debian/changelog sawzall-1.0/debian/changelog
diff -Nru sawzall-1.0/debian/control sawzall-1.0/debian/control
--- sawzall-1.0/debian/control 2010-12-02 16:34:09.000000000 -0500
+++ sawzall-1.0/debian/control 2013-01-06 17:14:39.000000000 -0500
@@ -1,7 +1,8 @@
Source: sawzall
Section: devel
Priority: optional
-Maintainer: Gustavo Franco <stra...@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gustavo Franco <stra...@debian.org>
Build-Depends: debhelper (>= 7), autotools-dev, protobuf-compiler, libpcre3-dev, libssl-dev, libicu-dev, libstdc++6-4.4-dev, libprotoc-dev
Standards-Version: 3.8.3
Homepage: http://code.google.com/p/szl/
diff -Nru sawzall-1.0/debian/patches/fix_erroneous_contructor sawzall-1.0/debian/patches/fix_erroneous_contructor
--- sawzall-1.0/debian/patches/fix_erroneous_contructor 1969-12-31 19:00:00.000000000 -0500
+++ sawzall-1.0/debian/patches/fix_erroneous_contructor 2013-01-06 16:54:07.000000000 -0500
@@ -0,0 +1,13 @@
+Index: sawzall-1.0/src/engine/symboltable.cc
+===================================================================
+--- sawzall-1.0.orig/src/engine/symboltable.cc 2010-08-15 18:04:14.000000000 -0400
++++ sawzall-1.0/src/engine/symboltable.cc 2013-01-06 16:54:00.071962463 -0500
+@@ -44,7 +44,7 @@
+ // ------------------------------------------------------------------------------
+ // Implementation of SymbolTable
+
+-Proc::Proc* SymbolTable::init_proc_ = NULL;
++Proc* SymbolTable::init_proc_ = NULL;
+
+ List<TableType*>* SymbolTable::table_types_ = NULL;
+ TableType* SymbolTable::collection_type_ = NULL;
diff -Nru sawzall-1.0/debian/patches/series sawzall-1.0/debian/patches/series
--- sawzall-1.0/debian/patches/series 2010-11-05 17:00:53.000000000 -0400
+++ sawzall-1.0/debian/patches/series 2013-01-06 16:53:18.000000000 -0500
@@ -1 +1,2 @@
debian-changes-1.0-1
+fix_erroneous_contructor
