--- protobuf-c-0.11.orig/src/test/Makefile.am +++ protobuf-c-0.11/src/test/Makefile.am @@ -18,7 +18,7 @@ ../libprotobuf-c.la cxx_generate_packed_data_SOURCES = \ cxx-generate-packed-data.cc generated-code/test-full.pb.cc -cxx_generate_packed_data_LDADD = -lprotobuf +cxx_generate_packed_data_LDADD = -lprotobuf -lpthread example_server_SOURCES = \ example-server.c generated-code/test.pb-c.c example_server_LDADD = ../libprotobuf-c.la --- protobuf-c-0.11.orig/debian/libprotobuf-c0-dev.dirs +++ protobuf-c-0.11/debian/libprotobuf-c0-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include/google/protobuf-c --- protobuf-c-0.11.orig/debian/control +++ protobuf-c-0.11/debian/control @@ -0,0 +1,61 @@ +Source: protobuf-c +Section: devel +Priority: optional +Maintainer: Robert S. Edmonds +Build-Depends: debhelper (>= 6), autoconf, autotools-dev, automake, libtool, + libprotobuf-dev (>= 2.2.0a-0.1~), libprotoc-dev, protobuf-compiler, quilt, zlib1g-dev +Standards-Version: 3.8.3 +Homepage: http://protobuf-c.googlecode.com/ + +Package: protobuf-c-compiler +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: protocol buffers C compiler + Protocol buffers are a flexible, efficient, automated mechanism for + serializing structured data – think 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. + . + This is the C implementation of protocol buffers. + . + This package contains a compiler that generates C stubs from protocol + buffer schemas. These stubs must be compiled and linked against + libprotobuf-c. + +Package: libprotobuf-c0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Protocol Buffers C library + Protocol buffers are a flexible, efficient, automated mechanism for + serializing structured data – think 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. + . + This is the C implementation of protocol buffers. + . + This package contains the shared library. + +Package: libprotobuf-c0-dev +Architecture: any +Section: libdevel +Depends: libprotobuf-c0 (= ${binary:Version}), ${misc:Depends} +Description: Protocol Buffers C static library and headers + Protocol buffers are a flexible, efficient, automated mechanism for + serializing structured data – think 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. + . + This is the C implementation of protocol buffers. + . + This package contains the static library and development headers. --- protobuf-c-0.11.orig/debian/libprotobuf-c0.install +++ protobuf-c-0.11/debian/libprotobuf-c0.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* --- protobuf-c-0.11.orig/debian/rules +++ protobuf-c-0.11/debian/rules @@ -0,0 +1,45 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +configure: configure-stamp +configure-stamp: + dh_testdir + autoreconf -fvi + ./configure --prefix=/usr + touch configure-stamp + +build: patch build-stamp +build-stamp: configure-stamp + $(MAKE) + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + dh_clean -k + rm -f Makefile.in aclocal.m4 config.guess config.sub configure depcomp \ + install-sh ltmain.sh missing src/Makefile.in src/test/Makefile.in + +install: build + dh_testdir + dh_installchangelogs + dh_installdocs + dh_installdirs + $(MAKE) prefix=$$(pwd)/usr install + dh_install + dh_strip + dh_makeshlibs + dh_shlibdeps + +binary-arch: install + dh_testdir + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch --- protobuf-c-0.11.orig/debian/protobuf-c-compiler.dirs +++ protobuf-c-0.11/debian/protobuf-c-compiler.dirs @@ -0,0 +1 @@ +usr/bin --- protobuf-c-0.11.orig/debian/libprotobuf-c0-dev.install +++ protobuf-c-0.11/debian/libprotobuf-c0-dev.install @@ -0,0 +1,3 @@ +usr/lib/lib*.a +usr/lib/lib*.so +usr/include/google/protobuf-c/* --- protobuf-c-0.11.orig/debian/libprotobuf-c0.symbols +++ protobuf-c-0.11/debian/libprotobuf-c0.symbols @@ -0,0 +1,63 @@ +libprotobuf-c.so.0 libprotobuf-c0 #MINVER# + protobuf_c_buffer_simple_append@Base 0.10 + protobuf_c_data_buffer_append@Base 0.10 + protobuf_c_data_buffer_append_char@Base 0.10 + protobuf_c_data_buffer_append_repeated_char@Base 0.10 + protobuf_c_data_buffer_append_string0@Base 0.10 + protobuf_c_data_buffer_append_string@Base 0.10 + protobuf_c_data_buffer_cleanup_recycling_bin@Base 0.10 + protobuf_c_data_buffer_clear@Base 0.10 + protobuf_c_data_buffer_discard@Base 0.10 + protobuf_c_data_buffer_drain@Base 0.10 + protobuf_c_data_buffer_index_of@Base 0.10 + protobuf_c_data_buffer_init@Base 0.10 + protobuf_c_data_buffer_parse_string0@Base 0.10 + protobuf_c_data_buffer_peek@Base 0.10 + protobuf_c_data_buffer_peek_char@Base 0.10 + protobuf_c_data_buffer_read@Base 0.10 + protobuf_c_data_buffer_read_char@Base 0.10 + protobuf_c_data_buffer_read_in_fd@Base 0.10 + protobuf_c_data_buffer_read_line@Base 0.10 + protobuf_c_data_buffer_reset@Base 0.10 + protobuf_c_data_buffer_str_index_of@Base 0.10 + protobuf_c_data_buffer_transfer@Base 0.10 + protobuf_c_data_buffer_writev@Base 0.10 + protobuf_c_data_buffer_writev_len@Base 0.10 + protobuf_c_default_allocator@Base 0.10 + protobuf_c_dispatch_add_idle@Base 0.10 + protobuf_c_dispatch_add_timer@Base 0.10 + protobuf_c_dispatch_add_timer_millis@Base 0.10 + protobuf_c_dispatch_clear_changes@Base 0.10 + protobuf_c_dispatch_close_fd@Base 0.10 + protobuf_c_dispatch_default@Base 0.10 + protobuf_c_dispatch_destroy_default@Base 0.10 + protobuf_c_dispatch_dispatch@Base 0.10 + protobuf_c_dispatch_fd_closed@Base 0.10 + protobuf_c_dispatch_free@Base 0.10 + protobuf_c_dispatch_new@Base 0.10 + protobuf_c_dispatch_peek_allocator@Base 0.10 + protobuf_c_dispatch_remove_idle@Base 0.10 + protobuf_c_dispatch_remove_timer@Base 0.10 + protobuf_c_dispatch_run@Base 0.10 + protobuf_c_dispatch_watch_fd@Base 0.10 + protobuf_c_enum_descriptor_get_value@Base 0.10 + protobuf_c_enum_descriptor_get_value_by_name@Base 0.10 + protobuf_c_message_descriptor_get_field@Base 0.10 + protobuf_c_message_descriptor_get_field_by_name@Base 0.10 + protobuf_c_message_free_unpacked@Base 0.10 + protobuf_c_message_get_packed_size@Base 0.10 + protobuf_c_message_pack@Base 0.10 + protobuf_c_message_pack_to_buffer@Base 0.10 + protobuf_c_message_unpack@Base 0.10 + protobuf_c_out_of_memory@Base 0.10 + protobuf_c_rpc_client_disable_autoreconnect@Base 0.10 + protobuf_c_rpc_client_is_connected@Base 0.10 + protobuf_c_rpc_client_new@Base 0.10 + protobuf_c_rpc_client_set_autoreconnect_period@Base 0.10 + protobuf_c_rpc_server_destroy@Base 0.10 + protobuf_c_rpc_server_new@Base 0.10 + protobuf_c_service_descriptor_get_method_by_name@Base 0.10 + protobuf_c_service_destroy@Base 0.10 + protobuf_c_service_generated_init@Base 0.10 + protobuf_c_service_invoke_internal@Base 0.10 + protobuf_c_system_allocator@Base 0.10 --- protobuf-c-0.11.orig/debian/libprotobuf-c0.dirs +++ protobuf-c-0.11/debian/libprotobuf-c0.dirs @@ -0,0 +1 @@ +usr/lib --- protobuf-c-0.11.orig/debian/changelog +++ protobuf-c-0.11/debian/changelog @@ -0,0 +1,58 @@ +protobuf-c (0.11-4~basak3) unstable; urgency=low + + * [12f9f27] Use -lpthread when linking to -lprotobuf in tests + + -- Robie Basak Sun, 07 Mar 2010 14:53:12 +0000 + +protobuf-c (0.11-4~basak2) unstable; urgency=low + + * [d943f3c] Brought back to debhelper 6 + + -- Robie Basak Sun, 07 Mar 2010 04:34:21 +0000 + +protobuf-c (0.11-4~basak1) unstable; urgency=low + + * No-change backport to Intrepid + + -- Robie Basak Mon, 25 Jan 2010 22:39:08 +0000 + +protobuf-c (0.11-4) unstable; urgency=low + + * Add versioned build dependency on libprotobuf-dev. + * libprotobuf-dev header renamed: wire_format_inl.h -> wire_format.h. + * Closes: #559960. + + -- Robert S. Edmonds Mon, 07 Dec 2009 16:42:12 -0800 + +protobuf-c (0.11-3) unstable; urgency=low + + * Second attempt at fixing FTBFS on big endian platforms; closes: #544755. + + -- Robert S. Edmonds Wed, 11 Nov 2009 12:07:02 -0500 + +protobuf-c (0.11-2) unstable; urgency=low + + * Fix FTBFS on big endian platforms; closes: #544755. + + -- Robert S. Edmonds Tue, 10 Nov 2009 22:02:38 -0500 + +protobuf-c (0.11-1) unstable; urgency=low + + * New upstream release; closes: #529004. + * Add build dependency on libprotoc-dev; closes: #540970. + * Drop .la file from libprotobuf-c0-dev. + + -- Robert S. Edmonds Sun, 23 Aug 2009 13:59:24 -0400 + +protobuf-c (0.10-2) unstable; urgency=low + + * Add dependency on libprotobuf-c0 for package libprotobuf-c0-dev; + closes: #529042. + + -- Robert S. Edmonds Sun, 17 May 2009 15:22:48 -0400 + +protobuf-c (0.10-1) unstable; urgency=low + + * Initial release; closes: #528147. + + -- Robert S. Edmonds Sun, 10 May 2009 23:34:05 -0400 --- protobuf-c-0.11.orig/debian/protobuf-c-compiler.install +++ protobuf-c-0.11/debian/protobuf-c-compiler.install @@ -0,0 +1 @@ +usr/bin/* --- protobuf-c-0.11.orig/debian/compat +++ protobuf-c-0.11/debian/compat @@ -0,0 +1 @@ +6 --- protobuf-c-0.11.orig/debian/copyright +++ protobuf-c-0.11/debian/copyright @@ -0,0 +1,46 @@ +This package was debianized by Robert S. Edmonds on +Sun, 10 May 2009 23:12:37 -0400. + +It was downloaded from: + + http://code.google.com/p/protobuf-c/downloads/list + +Copyright Holders: + Copyright (C) 2008 Dave Benson + Copyright (C) 2008 Google Inc. + +License: + + 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. + +The Debian packaging is + + Copyright (C) 2009 Robert S. Edmonds + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. + +protobuf-c is distributed with a file 'scripts/pkgwrite' which is not used +by the Debian packages. + + Copyright Dave Benson , 2000-2001. + + 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 software may also be licensed under the terms of + the GNU Lesser General Public License, version 2 or higher. + (This is so that the pkgwrite script may be legally included + with LGPL'd software.) --- protobuf-c-0.11.orig/debian/patches/series +++ protobuf-c-0.11/debian/patches/series @@ -0,0 +1,3 @@ +10_ftbfs_big_endian +20_disable_rpc_test +30_wire_format_fix --- protobuf-c-0.11.orig/debian/patches/30_wire_format_fix +++ protobuf-c-0.11/debian/patches/30_wire_format_fix @@ -0,0 +1,78 @@ +Index: protobuf-c-0.11/src/google/protobuf/compiler/c/c_bytes_field.cc +=================================================================== +--- protobuf-c-0.11.orig/src/google/protobuf/compiler/c/c_bytes_field.cc 2009-12-07 16:38:42.755484755 -0800 ++++ protobuf-c-0.11/src/google/protobuf/compiler/c/c_bytes_field.cc 2009-12-07 16:38:48.386362572 -0800 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + + namespace google { +Index: protobuf-c-0.11/src/google/protobuf/compiler/c/c_enum_field.cc +=================================================================== +--- protobuf-c-0.11.orig/src/google/protobuf/compiler/c/c_enum_field.cc 2009-12-07 16:39:03.302985060 -0800 ++++ protobuf-c-0.11/src/google/protobuf/compiler/c/c_enum_field.cc 2009-12-07 16:39:07.727684378 -0800 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + namespace google { + namespace protobuf { +Index: protobuf-c-0.11/src/google/protobuf/compiler/c/c_message_field.cc +=================================================================== +--- protobuf-c-0.11.orig/src/google/protobuf/compiler/c/c_message_field.cc 2009-12-07 16:39:11.110985029 -0800 ++++ protobuf-c-0.11/src/google/protobuf/compiler/c/c_message_field.cc 2009-12-07 16:39:14.407585621 -0800 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + namespace google { + namespace protobuf { +Index: protobuf-c-0.11/src/google/protobuf/compiler/c/c_primitive_field.cc +=================================================================== +--- protobuf-c-0.11.orig/src/google/protobuf/compiler/c/c_primitive_field.cc 2009-12-07 16:39:07.774985280 -0800 ++++ protobuf-c-0.11/src/google/protobuf/compiler/c/c_primitive_field.cc 2009-12-07 16:39:11.063666274 -0800 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + namespace google { + namespace protobuf { +Index: protobuf-c-0.11/src/google/protobuf/compiler/c/c_string_field.cc +=================================================================== +--- protobuf-c-0.11.orig/src/google/protobuf/compiler/c/c_string_field.cc 2009-12-07 16:38:58.754985683 -0800 ++++ protobuf-c-0.11/src/google/protobuf/compiler/c/c_string_field.cc 2009-12-07 16:39:02.619803520 -0800 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + + namespace google { +Index: protobuf-c-0.11/src/test/generated-code/test-full.pb.cc +=================================================================== +--- protobuf-c-0.11.orig/src/test/generated-code/test-full.pb.cc 2009-12-07 16:38:30.846985631 -0800 ++++ protobuf-c-0.11/src/test/generated-code/test-full.pb.cc 2009-12-07 16:38:42.154984576 -0800 +@@ -4,7 +4,7 @@ + #include + #include + #include +-#include ++#include + + namespace foo { + --- protobuf-c-0.11.orig/debian/patches/20_disable_rpc_test +++ protobuf-c-0.11/debian/patches/20_disable_rpc_test @@ -0,0 +1,29 @@ +Index: protobuf-c-0.11/src/test/Makefile.am +=================================================================== +--- protobuf-c-0.11.orig/src/test/Makefile.am 2009-11-11 12:49:22.131993500 -0500 ++++ protobuf-c-0.11/src/test/Makefile.am 2009-11-11 12:52:09.579993993 -0500 +@@ -1,4 +1,4 @@ +-check_PROGRAMS = test-generated-code test-generated-code2 test-rpc ++check_PROGRAMS = test-generated-code test-generated-code2 + noinst_PROGRAMS = cxx-generate-packed-data example-server example-client + INCLUDES = -I$(srcdir)/.. + test_generated_code_SOURCES = \ +@@ -11,11 +11,6 @@ + generated-code/test-full.pb-c.c + test_generated_code2_LDADD = \ + ../libprotobuf-c.la +-test_rpc_SOURCES = \ +-test-rpc.c \ +-generated-code/test.pb-c.c +-test_rpc_LDADD = \ +-../libprotobuf-c.la + cxx_generate_packed_data_SOURCES = \ + cxx-generate-packed-data.cc generated-code/test-full.pb.cc + cxx_generate_packed_data_LDADD = -lprotobuf -lpthread +@@ -43,5 +38,5 @@ + generated-code/test-full.pb.cc generated-code/test-full.pb.h \ + generated-code/test-full-cxx-output.inc + DISTCLEANFILES = $(BUILT_SOURCES) +-TESTS = test-generated-code test-generated-code2 test-rpc ++TESTS = test-generated-code test-generated-code2 + EXTRA_DIST = test.proto test-full.proto common-test-arrays.h --- protobuf-c-0.11.orig/debian/patches/10_ftbfs_big_endian +++ protobuf-c-0.11/debian/patches/10_ftbfs_big_endian @@ -0,0 +1,22 @@ +Index: protobuf-c-0.11/src/google/protobuf-c/protobuf-c.c +=================================================================== +--- protobuf-c-0.11.orig/src/google/protobuf-c/protobuf-c.c 2009-11-10 22:24:53.663993648 -0500 ++++ protobuf-c-0.11/src/google/protobuf-c/protobuf-c.c 2009-11-11 12:02:11.049833384 -0500 +@@ -685,7 +685,7 @@ + case PROTOBUF_C_TYPE_FIXED32: + case PROTOBUF_C_TYPE_FLOAT: + out[0] |= PROTOBUF_C_WIRE_TYPE_32BIT; +- return rv + fixed32_pack (*(const uint64_t *) member, out + rv); ++ return rv + fixed32_pack (*(const uint32_t *) member, out + rv); + case PROTOBUF_C_TYPE_SFIXED64: + case PROTOBUF_C_TYPE_FIXED64: + case PROTOBUF_C_TYPE_DOUBLE: +@@ -864,7 +864,7 @@ + case PROTOBUF_C_TYPE_FIXED32: + case PROTOBUF_C_TYPE_FLOAT: + scratch[0] |= PROTOBUF_C_WIRE_TYPE_32BIT; +- rv += fixed32_pack (*(const uint64_t *) member, scratch + rv); ++ rv += fixed32_pack (*(const uint32_t *) member, scratch + rv); + buffer->append (buffer, rv, scratch); + break; + case PROTOBUF_C_TYPE_SFIXED64: