--- protobuf-2.0.3.orig/python/google/protobuf/internal/decoder_test.py +++ protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py @@ -122,7 +122,7 @@ ['fixed64', decoder.Decoder.ReadFixed64, 0xffffffffffffffff, 'ReadLittleEndian64', 0xffffffffffffffff], ['sfixed32', decoder.Decoder.ReadSFixed32, long(-1), - 'ReadLittleEndian32', 0xffffffff], + 'ReadLittleEndian32', long(0xffffffff)], ['sfixed64', decoder.Decoder.ReadSFixed64, long(-1), 'ReadLittleEndian64', 0xffffffffffffffff], ['float', decoder.Decoder.ReadFloat, 0.0, --- protobuf-2.0.3.orig/debian/libprotobuf-java.install +++ protobuf-2.0.3/debian/libprotobuf-java.install @@ -0,0 +1 @@ +java/target/*.jar usr/share/java/ --- protobuf-2.0.3.orig/debian/protoc.xml +++ protobuf-2.0.3/debian/protoc.xml @@ -0,0 +1,223 @@ + +.
will be generated. You may view the +manual page with: nroff -man .
| less'. A typical entry +in a Makefile or Makefile.am is: + +DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl +XP = xsltproc -nonet -param man.charmap.use.subset "0" + +manpage.1: manpage.xml + $(XP) $(DB2MAN) $< + +The xsltproc binary is found in the xsltproc package. The XSL files are in +docbook-xsl. A description of the parameters you can use can be found in the +docbook-xsl-doc-* packages. Please remember that if you create the nroff +version in one of the debian/rules file targets (such as build), you will need +to include xsltproc and docbook-xsl in your Build-Depends control field. +Alternatively use the xmlto command/package. That will also automatically +pull in xsltproc and docbook-xsl. + +Notes for using docbook2x: docbook2x-man does not automatically create the +AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as + ... . + +To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections +read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be +found in the docbook-xsl-doc-html package. + +Validation can be done using: `xmllint -noout -valid manpage.xml` + +General documentation about man-pages and man-page-formatting: +man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ + +--> + + + + + + + + + + + + + +]> + + + + &dhtitle; + &dhucpackage; + + + &dhfirstname; + &dhsurname; + Wrote this manpage for the Debian system. +
+ &dhemail; +
+ + + + 2007 + &dhusername; + + + This manual page was written 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 (at your option) any later version published by + the Free Software Foundation. + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + 2008-10-04 + + + &dhpackage; + &dhsection; + 2.0.3 + + + &dhpackage; + compile protocol buffer description files + + + + &dhpackage; + + + + + + + + + + + + PROTO_FILE + + + + &dhpackage; + + + + + + + &dhpackage; + + + + + DESCRIPTION + + &dhpackage; is a compiler for protocol + buffers definitions files. It can can generate C++, Java and + Python source code for the classes defined in + PROTO_FILE. + + + + + OPTIONS + + + + + + + Specify the directory in which to search for imports. + May be specified multiple times; directories will be + searched in order. If not given, the current working + directory is used. + + + + + + Enable generation of C++ bindings and store them in + OUT_DIR. + + + + + + Enable generation of Java bindings and store them + in OUT_DIR. + + + + + + Enable generation of Python bindings and store them + in OUT_DIR. + + + + + + + Show summary of options. + + + + + + Show version of program. + + + + + Note that at least one of the , + and + options must be given (otherwise the program has nothing to + do). It's also possible to specify more than one. + + + + + BUGS + + The program currently exits with code 255 for all errors, + which makes it hard to differentiante from scripts the actual + error. + + The upstreams BTS can be found at . + + + + SEE ALSO + + More documentation about protocol buffers syntax and APIs is + available online at . + + + + --- protobuf-2.0.3.orig/debian/changelog +++ protobuf-2.0.3/debian/changelog @@ -0,0 +1,164 @@ +protobuf (2.0.3-2.2ubuntu1~hardy1) hardy-backports; urgency=low + + * Automated backport upload; no source changes. + + -- Scott Kitterman Mon, 17 Aug 2009 12:55:29 +0100 + +protobuf (2.0.3-2.2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - src/google/protobuf/compiler/python/python_generator.cc: + do not hardcode python2.4 + - src/gtest/internal/gtest-port.h + disable death tests if architecture is IA64 + + -- Michael Vogt Thu, 04 Jun 2009 14:47:43 +0200 + +protobuf (2.0.3-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS from -2.1: don't fail when we can't clean up the java build, + such as when openjdk isn't installed. + * Disable parallel builds, because libtool is made of fail (if binary-arch + and build-indep run concurrently, we relink a library while it's being + used; that doesn't work so well). + + -- Julien Cristau Tue, 02 Jun 2009 16:19:00 +0200 + +protobuf (2.0.3-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Medium urgency for RC bugfix. + * Fix building of test suites on ia64: use __clone2() instead of clone(), + which doesn't exist there (closes: #530606). Patch by Sune Vuorela. + * Only build the java and python bindings when building the arch:all + packages. Move openjdk to Build-Depends-Indep. This should allow + building on hppa, which doesn't have openjdk. Based on a patch by Sune + Vuorela (but any bugs are mine). + + -- Julien Cristau Tue, 02 Jun 2009 14:45:32 +0200 + +protobuf (2.0.3-2) unstable; urgency=low + + * Fix the binary-arch/binary-common interaction by only calling + dh_pysupport when we are in arch-independent mode (DH_OPTIONS=-i) + * Remove the extraneous conflicts/replace with libprotobuf2/libprotobuf0 + from libprotobuf3, as they share no files (and have different SONAMES) + (Closes: #523992) + + -- Iustin Pop Tue, 14 Apr 2009 09:35:39 +0200 + +protobuf (2.0.3-1) unstable; urgency=low + + [ Ehren Kret ] + * New Upstream Version (Closes: #522470) + * Applied patch proposed in bug#503807 provided by + Torsten Werner (Closes: #503807) + + [ Iustin Pop ] + * Policy version 3.8.1, added handling for the nocheck DEB_BUILD_OPTIONS flag + * Fix lintian warnings (copyright-with-old-dh-make-debian-copyright, + wrong-section-according-to-package-name) + * The new upstream version build successfully (and passes the + unittest) with gcc-snapshort, so marking bug#505411 as fixed + (Closes: #505411) + + -- Iustin Pop Thu, 09 Apr 2009 15:01:36 +0200 + +protobuf (2.0.3-0ubuntu2) jaunty; urgency=low + + * src/google/protobuf/compiler/python/python_generator.cc: + removed line in code generator that added "#!/usr/bin/python2.4" + to every python file created, (LP: #348243) should be fixed in + upstream revision 2.0.4. + + -- Brian Murray Thu, 26 Mar 2009 15:47:31 -0700 + +protobuf (2.0.3-0ubuntu1) jaunty; urgency=low + + * Merge from new upstream version (LP: #309237), remaining changes: + * debian/control Moving python-support from Build-Depends-Indep + to Build-Depends to fix build failures. + * Fix FTBFS on ia64 architecture due to lack of clone(2) + - src/gtest/internal/gtest-port.h (LP: #308829) + disable death tests if architecture is IA64 + adapted from gtest upstream fix at: + http://codereview.appspot.com/8690/show + * Fix FTBFS on x64 architectures due to python 2.x int vs long issue + test expects return type long but on x64 architecture return type + unpacks to int + -python/google/protobuf/internal/decoder_test.py + explicitly type the result value as long + taken from upstream discussion: + http://groups.google.com/group/protobuf/browse_thread + /thread/2357176cb1f50e10/ + + -- Manny Vindiola Thu, 18 Dec 2008 01:26:29 -0500 + +protobuf (2.0.2-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #302680), remaining changes: + + debian/control Moving python-support from Build-Depends-Indep + to Build-Depends to fix build failures. + change kept from 2.0.0~b-3ubuntu1 + + -- Manny Vindiola Wed, 26 Nov 2008 21:42:18 -0500 + +protobuf (2.0.2-1) unstable; urgency=low + + * New Upstream Version (Closes: #501349) + + -- Iustin Pop Tue, 07 Oct 2008 21:51:47 +0200 + +protobuf (2.0.1-2) unstable; urgency=low + + * Fix the java .jar symlink (Closes: #501490) + + -- Iustin Pop Sat, 04 Oct 2008 17:05:01 +0200 + +protobuf (2.0.1-1) unstable; urgency=low + + * New Upstream Version (Closes: #499925) + + -- Iustin Pop Sun, 28 Sep 2008 18:14:16 +0200 + +protobuf (2.0.0~b-3ubuntu2) intrepid; urgency=low + + * src/google/protobuf/compiler/cpp/cpp_enum.cc: added patch to stop + generating trailing comma after enum definition. (Going to be applied + upstream soon: http://tinyurl.com/3l72co) (LP: #264124) + * src/google/protobuf/descriptor.pb.h: Run 'bash + generate_descriptor_proto.sh'. + + -- Elliot Murphy Tue, 23 Sep 2008 17:48:44 -0400 + +protobuf (2.0.0~b-3ubuntu1) intrepid; urgency=low + + * Moving python-support from Build-Depends-Indep to Build-Depends to + fix build failures. (LP: #262665) + + -- Elliot Murphy Fri, 29 Aug 2008 04:40:28 -0400 + +protobuf (2.0.0~b-3) unstable; urgency=low + + * Remove DM-Upload-Allowed for sponsoring + + -- Iustin Pop Sun, 03 Aug 2008 11:01:44 +0200 + +protobuf (2.0.0~b-2) unstable; urgency=low + + * Mark the different license for some of the files, and fix the long + description (it contained UTF-8 chars), both thanks to Vincent Bernat + + * Cleanup debian/rules (removed commented out debhelper lines) + * Improve the java build process, as suggested by Matthew Johnson + + + -- Iustin Pop Sat, 02 Aug 2008 14:12:59 +0200 + +protobuf (2.0.0~b-1) unstable; urgency=low + + * Initial release (Closes: #489842) + + -- Iustin Pop Tue, 08 Jul 2008 20:03:51 +0200 + --- protobuf-2.0.3.orig/debian/ant-wrapper +++ protobuf-2.0.3/debian/ant-wrapper @@ -0,0 +1,15 @@ +#!/bin/sh + +JAVA_HOME="/usr/lib/jvm/java-6-openjdk" + +if [ ! -d "$JAVA_HOME" ]; then + echo "Can't find java-6-openjdk, please check the build-depends" 1>&2 + exit 1 +fi + +export JAVA_HOME + +# workaround for openjdk bug, see http://bugs.debian.org/491074 +export ANT_OPTS="-client" + +exec ant "$@" --- protobuf-2.0.3.orig/debian/libprotobuf-dev.install +++ protobuf-2.0.3/debian/libprotobuf-dev.install @@ -0,0 +1,4 @@ +usr/lib/libprotobuf*.so +usr/lib/libprotoc*.so +usr/lib/*.la +usr/include --- protobuf-2.0.3.orig/debian/java-build.xml +++ protobuf-2.0.3/debian/java-build.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- protobuf-2.0.3.orig/debian/libprotobuf3.install +++ protobuf-2.0.3/debian/libprotobuf3.install @@ -0,0 +1,2 @@ +usr/lib/libprotobuf*.so.* +usr/lib/libprotoc*.so.* --- protobuf-2.0.3.orig/debian/copyright +++ protobuf-2.0.3/debian/copyright @@ -0,0 +1,108 @@ +This package was debianized by Iustin Pop on +Mon, 07 Jul 2008 17:48:21 +0200. + +It was downloaded from http://code.google.com/p/protobuf/ + +Upstream Authors: Google Inc, more specifically: + +Original Protocol Buffers design and implementation: + Sanjay Ghemawat + Jeff Dean + Daniel Dulitz + Craig Silverstein + Paul Haahr + Corey Anderson + (and many others) + +Proto2 C++ and Java primary author: + Kenton Varda + +Proto2 Python primary authors: + Will Robinson + Petar Petrov + +Large code contributions: + Joseph Schorr + Wenbo Zhu + +Large quantity of code reviews: + Scott Bruce + Frank Yellin + Neal Norwitz + Jeffrey Yasskin + Ambrose Feinstein + +Documentation: + Lisa Carey + +Maven packaging: + Gregory Kick + +Copyright: + + Copyright (C) 2008 Google Inc. + +License (new style BSD, with Google Inc. as copyright holder): + + Copyright 2008, Google Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Code generated by the Protocol Buffer compiler is owned by the owner + of the input file used when generating it. This code is not + standalone and requires a support library to be linked with it. This + support library is itself covered by the above license. + +On Debian systems, the complete text of the BSD License can be found in +`/usr/share/common-licenses/BSD'. + +The files `python/mox.py' and `python/stubout.py' are licensed under a +different license (Apache License 2.0): + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +On Debian systems, the complete text of the Apache License can be found in +`/usr/share/common-licenses/Apache-2.0'. + +The Debian packaging is: + + Copyright (C) 2008, 2009 Iustin Pop + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. --- protobuf-2.0.3.orig/debian/libprotobuf-dev.dirs +++ protobuf-2.0.3/debian/libprotobuf-dev.dirs @@ -0,0 +1 @@ +usr/share/doc --- protobuf-2.0.3.orig/debian/compat +++ protobuf-2.0.3/debian/compat @@ -0,0 +1 @@ +7 --- protobuf-2.0.3.orig/debian/watch +++ protobuf-2.0.3/debian/watch @@ -0,0 +1,6 @@ +# format version number, currently 3; this line is compulsory! +version=3 + +# code.google.com/p/$project/downloads/list has links to $project.googlecode.com/files/ +opts="versionmangle=s/beta/~b/" http://code.google.com/p/protobuf/downloads/list \ + http://protobuf.googlecode.com/files/protobuf-(.*)\.tar\.gz --- protobuf-2.0.3.orig/debian/protobuf-compiler.docs +++ protobuf-2.0.3/debian/protobuf-compiler.docs @@ -0,0 +1,4 @@ +CONTRIBUTORS.txt +README.txt +editors +examples --- protobuf-2.0.3.orig/debian/protobuf-compiler.manpages +++ protobuf-2.0.3/debian/protobuf-compiler.manpages @@ -0,0 +1 @@ +protoc.1 --- protobuf-2.0.3.orig/debian/rules +++ protobuf-2.0.3/debian/rules @@ -0,0 +1,167 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# DEB_BUILD_OPTIONS handling - is this really needed since dpkg-dev 1.14.17? +# note that the strip option is handled directly by dh_strip +CFLAGS = -Wall -g + +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +# NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +# MAKEFLAGS += -j$(NUMJOBS) +#endif +# end DEB_BUILD_OPTIONS + +version=0.0.0 +major=0 + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + dh_auto_configure + touch configure-stamp + + +#Architecture +build: build-arch + +build-arch: build-arch-stamp +build-arch-stamp: configure-stamp + + # Add here commands to compile the arch part of the package. + $(MAKE) + + # run the test suite +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + $(MAKE) check +endif + + # build the protoc manpage + xmlto man debian/protoc.xml + + touch $@ + +build-indep: build-indep-stamp +build-indep-stamp: build-arch-stamp + + # python bindings + cd python && python setup.py build + +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + cd python && python setup.py test +endif + + # java bindings + # this code mimics mvn package. This should be changed when maven is supported by debian. + $(SHELL) ./debian/ant-wrapper -f debian/java-build.xml jar + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + + # remove the built manpage + rm -f protoc.1 + + cd python && \ + python setup.py clean --all ;\ + rm -rf protobuf.egg-info + + # remove java builds + $(SHELL) ./debian/ant-wrapper -f debian/java-build.xml clean || true + + dh_clean + +install: install-indep install-arch +install-indep: build-indep + dh_testdir + dh_testroot + dh_prep -i + dh_installdirs -i + + # python bindings + cd python && \ + python setup.py install --no-compile \ + --root=$(CURDIR)/debian/python-protobuf ; \ + find $(CURDIR)/debian/python-protobuf -name 'protobuf-*-nspkg.pth' -print0 | \ + xargs -r0 rm -f + + dh_install -i + + +install-arch: build-arch + dh_testdir + dh_testroot + dh_prep -s + dh_installdirs -s + + # Add here commands to install the arch part of the package into + # debian/tmp. + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + + dh_install --sourcedir=debian/tmp -s + + # convert doc dir to symlink for the dev package + rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev + ln -s libprotobuf3 $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev + + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs CHANGES.txt + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +ifeq ($(DH_OPTIONS),-i) + dh_pysupport +endif + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure --- protobuf-2.0.3.orig/debian/protobuf-compiler.install +++ protobuf-2.0.3/debian/protobuf-compiler.install @@ -0,0 +1 @@ +usr/bin --- protobuf-2.0.3.orig/debian/pkg-test.sh +++ protobuf-2.0.3/debian/pkg-test.sh @@ -0,0 +1,67 @@ +#!/bin/sh + +# Script to automate running the provided example programs to test all +# language binding (cpp, python, java) + +# Needs to be run from the directory containing the newly-built deb's + +set -e + +test -f protobuf-compiler_*.deb || \ + { echo "Cannot find protobuf-compiler deb file, exiting" 1>&2; exit 1; } + +echo "*** Installing dependencies (hardcoded list)" + +apt-get install -y openjdk-6-jdk python python-support + +echo "*** Installing packages" + +dpkg -i *.deb + +cd /usr/share/doc/protobuf-compiler/examples + +export CLASSPATH=/usr/share/java/protobuf.jar + +echo "*** Building example programs" + +make + +TEST_FILE=`mktemp` +echo "Test file is $TEST_FILE" + +echo "*** Adding via cpp" +./add_person_cpp $TEST_FILE << EOF +1 +Person One + + +EOF + +echo "*** Adding via python" + +./add_person_python $TEST_FILE << EOF +2 +Person Two +two@example.net + +EOF + +echo "*** Adding via java" + +./add_person_java $TEST_FILE << EOF +2 +Person Two + +555-1234 +work + +EOF + + + +for kind in cpp python java; do + echo "*** Listing via $kind" + ./list_people_$kind $TEST_FILE +done + +rm $TEST_FILE --- protobuf-2.0.3.orig/debian/libprotobuf-java.links +++ protobuf-2.0.3/debian/libprotobuf-java.links @@ -0,0 +1 @@ +usr/share/java/protobuf-2.0.3.jar usr/share/java/protobuf.jar --- protobuf-2.0.3.orig/debian/control +++ protobuf-2.0.3/debian/control @@ -0,0 +1,112 @@ +Source: protobuf +Section: devel +Priority: extra +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Iustin Pop +Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-setuptools (>= 0.6c8), xmlto, ant +Build-Depends-Indep: python-support (>= 0.6), openjdk-6-jdk +Standards-Version: 3.8.1 +Homepage: http://code.google.com/p/protobuf/ +Vcs-Browser: http://git.debian.org/?p=collab-maint/protobuf.git +Vcs-Git: git://git.debian.org/git/collab-maint/protobuf.git + +Package: libprotobuf3 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: protocol buffer C++ library + Protocol buffers are a flexible, efficient, automated mechanism for + serializing structured data - similar to XML, but smaller, faster, and + simpler. You define how you want your data to be structured once, then you can + use special generated source code to easily write and read your structured + data to and from a variety of data streams and using a variety of languages. + You can even update your data structure without breaking deployed programs + that are compiled against the "old" format. + . + Google uses Protocol Buffers for almost all of its internal RPC protocols and + file formats. + . + This package contains the runtime libraries needed for C++ applications and + the protocol buffer compiler + +Package: libprotobuf-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libprotobuf3 +Description: protocol buffer C++ library (development headers) + Protocol buffers are a flexible, efficient, automated mechanism for + serializing structured data - similar to XML, but smaller, faster, and + simpler. You define how you want your data to be structured once, then you can + use special generated source code to easily write and read your structured + data to and from a variety of data streams and using a variety of languages. + You can even update your data structure without breaking deployed programs + that are compiled against the "old" format. + . + Google uses Protocol Buffers for almost all of its internal RPC protocols and + file formats. + . + This package contains the development libraries needed for writing C++ + applications. + +Package: protobuf-compiler +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libprotobuf3 (= ${binary:Version}) +Description: compiler for protocol buffer definition files + Protocol buffers are a flexible, efficient, automated mechanism for + serializing structured data - similar to XML, but smaller, faster, and + simpler. You define how you want your data to be structured once, then you can + use special generated source code to easily write and read your structured + data to and from a variety of data streams and using a variety of languages. + You can even update your data structure without breaking deployed programs + that are compiled against the "old" format. + . + Google uses Protocol Buffers for almost all of its internal RPC protocols and + file formats. + . + This package contains the protocol buffer compiler that is used for + translating from .proto files (containing the definitions) to the language + binding for the supported languages. + +Package: python-protobuf +Architecture: all +Section: python +Depends: ${python:Depends}, ${misc:Depends} +Provides: ${python:Provides} +Recommends: protobuf-compiler +Description: Python bindings for protocol buffers + Protocol buffers are a flexible, efficient, automated mechanism for + serializing structured data - similar to XML, but smaller, faster, and + simpler. You define how you want your data to be structured once, then you can + use special generated source code to easily write and read your structured + data to and from a variety of data streams and using a variety of languages. + You can even update your data structure without breaking deployed programs + that are compiled against the "old" format. + . + Google uses Protocol Buffers for almost all of its internal RPC protocols and + file formats. + . + This package contains the Python bindings for the protocol buffers. You will + need the protoc tool (in the protobuf-compiler package) to compile your + definition to Python classes, and then the modules in this package will allow + you to use those classes in your programs. + +Package: libprotobuf-java +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java5-runtime +Recommends: protobuf-compiler +Section: java +Description: Java bindings for protocol buffers + Protocol buffers are a flexible, efficient, automated mechanism for + serializing structured data - similar to XML, but smaller, faster, and + simpler. You define how you want your data to be structured once, then you can + use special generated source code to easily write and read your structured + data to and from a variety of data streams and using a variety of languages. + You can even update your data structure without breaking deployed programs + that are compiled against the "old" format. + . + Google uses Protocol Buffers for almost all of its internal RPC protocols and + file formats. + . + This package contains the Java bindings for the protocol buffers. You will + need the protoc tool (in the protobuf-compiler package) to compile your + definition to Java classes, and then the modules in this package will allow + you to use those classes in your programs. --- protobuf-2.0.3.orig/debian/pyversions +++ protobuf-2.0.3/debian/pyversions @@ -0,0 +1 @@ +2.4- --- protobuf-2.0.3.orig/src/gtest/gtest-death-test.cc +++ protobuf-2.0.3/src/gtest/gtest-death-test.cc @@ -37,6 +37,15 @@ #include #include #include +#include + +#ifdef __ia64__ +extern "C" { +int __clone2(int (*fn) (void *arg), void *child_stack_base, + size_t child_stack_size, int flags, void *arg, + pid_t *parent_tid, void *tls, pid_t *child_tid); +} +#endif #include #include @@ -579,8 +588,14 @@ void* const stack_top = static_cast(stack) + (stack_grows_down ? stack_size : 0); ExecDeathTestArgs args = { argv, close_fd }; +#ifdef __ia64__ + const pid_t child_pid = __clone2(&ExecDeathTestChildMain, stack_top, stack_size, + SIGCHLD, &args, NULL, NULL, NULL); +#else const pid_t child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args); +#endif + GTEST_DEATH_TEST_CHECK(child_pid != -1); GTEST_DEATH_TEST_CHECK(munmap(stack, stack_size) != -1); return child_pid; --- protobuf-2.0.3.orig/src/gtest/internal/gtest-port.h +++ protobuf-2.0.3/src/gtest/internal/gtest-port.h @@ -44,6 +44,8 @@ // The user can define the following macros in the build script to // control Google Test's behavior: // +// GTEST_HAS_CLONE - Define it to 1/0 to indicate that clone(2) +// is/isn't available. // GTEST_HAS_STD_STRING - Define it to 1/0 to indicate that // std::string does/doesn't work (Google Test can be // used where std::string is unavailable). Leave @@ -187,8 +189,23 @@ #include // NOLINT #endif // GTEST_HAS_STD_STRING +// Determines whether clone(2) is supported. +// Usually it will only be available on Linux, excluding +// Linux on the Itanium architecture. +// Also see http://linux.die.net/man/2/clone. +#ifndef GTEST_HAS_CLONE +// The user didn't tell us, so we need to figure it out. + +#if defined(GTEST_OS_LINUX) && !defined(__ia64__) +#define GTEST_HAS_CLONE 1 +#else +#define GTEST_HAS_CLONE 0 +#endif // defined(GTEST_OS_LINUX) && !defined(__ia64__) + +#endif // GTEST_HAS_CLONE + // Determines whether to support death tests. -#if GTEST_HAS_STD_STRING && defined(GTEST_OS_LINUX) +#if GTEST_HAS_STD_STRING && GTEST_HAS_CLONE #define GTEST_HAS_DEATH_TEST // On some platforms, needs someone to define size_t, and // won't compile if being #included first. Therefore it's important @@ -197,7 +214,7 @@ #include #include #include -#endif // GTEST_HAS_STD_STRING && defined(GTEST_OS_LINUX) +#endif // GTEST_HAS_STD_STRING && GTEST_HAS_CLONE // Defines some utility macros. --- protobuf-2.0.3.orig/src/google/protobuf/compiler/python/python_generator.cc +++ protobuf-2.0.3/src/google/protobuf/compiler/python/python_generator.cc @@ -111,7 +111,6 @@ io::Printer* printer, const FileDescriptor* file, bool descriptor_proto) { // TODO(robinson): Allow parameterization of Python version? printer->Print( - "#!/usr/bin/python2.4\n" "# Generated by the protocol buffer compiler. DO NOT EDIT!\n" "\n" "from google.protobuf import descriptor\n"