--- thrift-compiler-0.9.0.orig/configure.ac
+++ thrift-compiler-0.9.0/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.65])
-AC_INIT([thrift], [0.8.0])
+AC_INIT([thrift], [0.9.0])
#AM_CONFIG_SRCDIR([cpp/thrifty.h])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
--- thrift-compiler-0.9.0.orig/cpp/compiler.vcxproj
+++ thrift-compiler-0.9.0/cpp/compiler.vcxproj
@@ -45,7 +45,7 @@
-
+
@@ -166,7 +166,7 @@
flex -o "src\\thriftl.cc" src/thriftl.ll
-bison -y -o "src\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy
+bison -y -o "src\thrifty.cc" --defines="src/thrifty.hh" src/thrifty.yy
@@ -185,7 +185,7 @@
flex -o "src\thriftl.cc" src/thriftl.ll
-bison -y -o "src\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy
+bison -y -o "src\thrifty.cc" --defines="src/thrifty.hh" src/thrifty.yy
@@ -208,7 +208,7 @@
flex -o "src\thriftl.cc" src/thriftl.ll
-bison -y -o "src\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy
+bison -y -o "src\thrifty.cc" --defines="src/thrifty.hh" src/thrifty.yy
@@ -231,7 +231,7 @@
flex -o "src\thriftl.cc" src/thriftl.ll
-bison -y -o "src\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy
+bison -y -o "src\thrifty.cc" --defines="src/thrifty.hh" src/thrifty.yy
--- thrift-compiler-0.9.0.orig/cpp/compiler.vcxproj.filters
+++ thrift-compiler-0.9.0/cpp/compiler.vcxproj.filters
@@ -71,7 +71,7 @@
parse
-
+
windows
--- thrift-compiler-0.9.0.orig/cpp/src/thriftl.ll
+++ thrift-compiler-0.9.0/cpp/src/thriftl.ll
@@ -48,7 +48,7 @@
* Must be included AFTER parse/t_program.h, but I can't remember why anymore
* because I wrote this a while ago.
*/
-#include "thrifty.h"
+#include "thrifty.hh"
void thrift_reserved_keyword(char* keyword) {
yyerror("Cannot use reserved language keyword: \"%s\"\n", keyword);
--- thrift-compiler-0.9.0.orig/debian/README.source
+++ thrift-compiler-0.9.0/debian/README.source
@@ -0,0 +1,7 @@
+The Thrift project creates monolithic release artifacts that include the
+compiler, and a considerable number of language libraries. For practical
+reasons, this monolithic archive is repackaged into smaller components for
+inclusion in Debian as indiviual source packages.
+
+Source for the tools used to repackage Thrift releases can be found at
+http://git.debian.org/?p=collab-maint/thrift-repackage.git;a=summary.
\ No newline at end of file
--- thrift-compiler-0.9.0.orig/debian/changelog
+++ thrift-compiler-0.9.0/debian/changelog
@@ -0,0 +1,30 @@
+thrift-compiler (0.9.0-3) unstable; urgency=low
+
+ * Fixed FTBFS caused by a backward incompatible change to header file
+ naming in automake's yacc support, (Closes: #713741).
+
+ -- Eric Evans Tue, 13 Aug 2013 13:29:57 +0200
+
+thrift-compiler (0.9.0-2) unstable; urgency=low
+
+ * Updated versioning in build.
+
+ -- Eric Evans Thu, 31 Jan 2013 17:49:34 -0600
+
+thrift-compiler (0.9.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Eric Evans Tue, 15 Jan 2013 01:35:51 +0000
+
+thrift-compiler (0.8.0-2) unstable; urgency=low
+
+ * Added missing license and attribution to debian/copyright.
+
+ -- Eric Evans Mon, 20 Aug 2012 18:08:56 -0500
+
+thrift-compiler (0.8.0-1) unstable; urgency=low
+
+ * Initial release. (Closes: #648451)
+
+ -- Eric Evans Sun, 08 Jul 2012 16:56:02 -0600
--- thrift-compiler-0.9.0.orig/debian/compat
+++ thrift-compiler-0.9.0/debian/compat
@@ -0,0 +1 @@
+9
--- thrift-compiler-0.9.0.orig/debian/control
+++ thrift-compiler-0.9.0/debian/control
@@ -0,0 +1,21 @@
+Source: thrift-compiler
+Maintainer: Eric Evans
+Section: devel
+Priority: extra
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9), bison, flex, autoconf, automake
+Homepage: http://thrift.apache.org
+Vcs-Git: git://anonscm.debian.org/users/eevans/thrift-compiler.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/eevans/thrift-compiler.git;a=summary
+
+Package: thrift-compiler
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: code generator/compiler for Thrift definitions
+ Thrift is a software framework for the development of reliable and
+ performant communication and data serialization. It combines a software
+ stack with code generation to build services that operate seamlessly
+ across a number of different development languages.
+ .
+ This package contains the compiler used to generate language code from
+ Thrift definition files.
--- thrift-compiler-0.9.0.orig/debian/copyright
+++ thrift-compiler-0.9.0/debian/copyright
@@ -0,0 +1,48 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: thrift-compiler
+Source: http://www.apache.org/dist/thrift
+
+Files: *
+Copyright: Copyright 2006-2010 Apache Software Foundation
+License: Apache-2.0
+ On Debian systems, the full text of the Apache License 2.0 can be found in
+ the file `/usr/share/common-licenses/Apache-2.0'.
+
+Files: cpp/src/md5.*
+Copyright: Copyright (C) 1999, 2002 Aladdin Enterprises.
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: debian/*
+Copyright: Copyright 2012 Eric Evans
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this package; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version
+ 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
--- thrift-compiler-0.9.0.orig/debian/rules
+++ thrift-compiler-0.9.0/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -f \
+ Makefile.in \
+ aclocal.m4 \
+ compile \
+ config.h.in \
+ configure \
+ cpp/Makefile.in \
+ cpp/thrifty.hh \
+ depcomp \
+ install-sh \
+ missing \
+ ylwrap \
+ config.h \
+ config.log \
+ config.status \
+ stamp-h1
+
+override_dh_auto_configure:
+ aclocal
+ autoheader
+ automake --copy --add-missing --foreign
+ autoconf
+ dh_auto_configure
+
+%:
+ dh $@
--- thrift-compiler-0.9.0.orig/debian/source/format
+++ thrift-compiler-0.9.0/debian/source/format
@@ -0,0 +1 @@
+1.0
--- thrift-compiler-0.9.0.orig/debian/thrift-compiler.docs
+++ thrift-compiler-0.9.0/debian/thrift-compiler.docs
@@ -0,0 +1 @@
+debian/README.source
--- thrift-compiler-0.9.0.orig/debian/thrift-compiler.examples
+++ thrift-compiler-0.9.0/debian/thrift-compiler.examples
@@ -0,0 +1,2 @@
+tutorial/tutorial.thrift
+tutorial/shared.thrift
--- thrift-compiler-0.9.0.orig/debian/thrift-compiler.manpages
+++ thrift-compiler-0.9.0/debian/thrift-compiler.manpages
@@ -0,0 +1 @@
+debian/thrift.1
--- thrift-compiler-0.9.0.orig/debian/thrift.1
+++ thrift-compiler-0.9.0/debian/thrift.1
@@ -0,0 +1,78 @@
+.TH "THRIFT" "1" "July 9, 2012" "thrift-compiler" "thrift"
+.SH NAME
+thrift \ - code generator/compiler for Thrift IDL
+.SH SYNOPSIS
+.B thrift
+[options] \fIsource_file\fR
+.SH DESCRIPTION
+Thrift is a framework for efficient serialization and RPC services. The
+.B thrift
+compiler accepts a source file containing definitions of Thrift structs and services,
+and generates the language-specific code to implement them.
+.SH OPTIONS
+.TP
+\fB\-version\fR
+.RS 4
+print the compiler version and exit
+.RE
+.TP
+\fB\-o DIRECTORY\fR
+.RS 4
+Set the output directory for gen-* packages (default: current directory)
+.RE
+.TP
+\fB\-out DIRECTORY\fR
+.RS 4
+Set the ouput location for generated files. (no gen-* folder will be created)
+.RE
+.TP
+\fB\-I DIRECTORY\fR
+.RS 4
+Add a directory to the list of directories searched for include directives
+.RE
+.TP
+\fB\-nowarn\fR
+.RS 4
+Suppress all compiler warnings (BAD!)
+.RE
+.TP
+\fB\-strict\fR
+.RS 4
+Strict compiler warnings on
+.RE
+.TP
+\fB\-v[erbose]\fR
+.RS 4
+Verbose mode
+.RE
+.TP
+\fB\-r[ecurse]\fR
+.RS 4
+Also generate included files
+.RE
+.TP
+\fB\-debug\fR
+.RS 4
+Parse debug trace to stdout
+.RE
+.TP
+\fB\-\-gen STRING\fR
+.RS 4
+Generate code with a dynamically-registered generator. STRING has the form
+language[:key1=val1[,key2,[key3=val3]]]. Keys and values are options passed to
+the generator. Many options will not require values. For a complete list of
+supported generators, run
+.B thrift
+without arguments.
+.RE
+.SH AUTHOR
+Thrift is a top-level project of the Apache Software Foundation, (see
+http://thrift.apache.org).
+.PP
+This manual page was written by Eric Evans for the Debian
+system (but may be used by others). Permission is granted to copy, distribute
+and/or modify this document under the terms of the GNU General Public License,
+Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be
+found in /usr/share/common-licenses/GPL.
--- thrift-compiler-0.9.0.orig/debian/watch
+++ thrift-compiler-0.9.0/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/thrift/([\d\.]+)/thrift-([\d\.]+).tar.gz