Merge 64f587f2eb into f27077761a

.gitignore

@@ -0,0 +1,3 @@
+src/*.pb.h
+src/*.pb.o
+src/libosmpbf.a

README

@@ -0,0 +1,9 @@
+
+OSM PBF
+=======
+
+See http://wiki.openstreetmap.org/wiki/PBF_Format .
+
+To build the Debian/Ubuntu package call:
+    debuild -I -us -uc
+

debian/changelog

@@ -0,0 +1,5 @@
+libosmpbf-dev (0.1) maverick; urgency=low
+
+  * Initial debian package
+
+ -- Jochen Topf <jochen@topf.org>  Wed, 13 Apr 2011 21:50:15 +0100

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,14 @@
+Source: libosmpbf-dev
+Section: libdevel
+Priority: optional
+Maintainer: Jochen Topf <jochen@topf.org>
+Build-Depends: debhelper (>= 7), libprotobuf-dev, protobuf-compiler
+Standards-Version: 3.9.1
+Homepage: http://wiki.openstreetmap.org/wiki/PBF_Format
+
+Package: libosmpbf-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for reading OSM PBF files.
+ Interface definition and library for reading binary
+ OpenStreetMap data files.

debian/copyright

@@ -0,0 +1,18 @@
+Copyright (c) 2010 Scott A. Crosby. <scott@sacrosby.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as 
+published by the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the license text can usually be found in
+/usr/share/common-licenses.
+

debian/docs

@@ -0,0 +1,2 @@
+src/fileformat.proto
+src/osmformat.proto

debian/rules

@@ -0,0 +1,86 @@
+#!/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.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp: 
+	dh_testdir
+	
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE) -C src
+
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) -C src clean || /bin/true
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# Add here commands to install the package into debian/libosmpbf-dev.
+	$(MAKE) -C src DESTDIR=$(CURDIR)/debian/libosmpbf-dev install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

src/Makefile

@@ -0,0 +1,25 @@
+
+CXX = g++
+CXXFLAGS = -O3
+AR = ar
+
+all: libosmpbf.a fileformat.pb.h osmformat.pb.h
+
+libosmpbf.a: fileformat.pb.o osmformat.pb.o
+	$(AR) -cr $@ fileformat.pb.o osmformat.pb.o
+
+%.pb.o: %.pb.cc
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+%.pb.cc %.pb.h: %.proto
+	protoc --proto_path=. --cpp_out=. $<
+
+install:
+	install -m 755 -g root -o root -d $(DESTDIR)/usr/lib
+	install -m 644 -g root -o root libosmpbf.a $(DESTDIR)/usr/lib
+	install -m 755 -g root -o root -d $(DESTDIR)/usr/include/osmpbf
+	install -m 644 -g root -o root fileformat.pb.h osmformat.pb.h $(DESTDIR)/usr/include/osmpbf
+
+clean:
+	rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a
+

src/fileformat.proto

@@ -8,13 +8,14 @@
    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.
+   GNU Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+option optimize_for = LITE_RUNTIME;
 option java_package = "crosby.binary";
 package OSMPBF;
 

src/osmformat.proto

@@ -8,13 +8,14 @@
    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.
+   GNU Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+option optimize_for = LITE_RUNTIME;
 option java_package = "crosby.binary";
 package OSMPBF;