This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to tag v1.0.0 in repository osmium-tool.
commit 7acc96b4deae56851384ad54e043d825705e5fa3 Author: Jochen Topf <joc...@topf.org> Date: Sat Jul 19 17:26:09 2014 +0200 Build and debian packaging fixes. --- Makefile | 12 +++++---- debian/.gitignore | 3 +++ debian/control | 14 +++++++--- debian/rules | 79 ++++--------------------------------------------------- 4 files changed, 26 insertions(+), 82 deletions(-) diff --git a/Makefile b/Makefile index bebd203..33c1c2a 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,8 @@ CXXFLAGS += -O3 CXXFLAGS += -std=c++11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CXXFLAGS += -I../libosmium/include +PREFIX ?= /usr + OS:=$(shell uname -s) ifeq ($(OS),Darwin) CXXFLAGS += -stdlib=libc++ @@ -66,7 +68,7 @@ src/command_%.o: src/command_%.cpp src/command_%.hpp $(INCLUDES) osmium: src/main.o $(COMMANDS_O) $(CXX) -o $@ $< $(COMMANDS_O) $(LDFLAGS) $(LIB_PBF) $(LIB_EXPAT) $(LIB_GZIP) $(LIB_BZIP2) $(LIB_PRGOPT) $(LIB_CRYPTO) -check: +cppcheck: cppcheck --std=c++11 $(CPPCHECK_OPTIONS) src/*pp indent: @@ -80,10 +82,10 @@ doc: $(MAKE) -C doc install: - install -m 755 -g $(INSTALL_GROUP) -o root -d $(DESTDIR)/usr/bin - install -m 755 -g $(INSTALL_GROUP) -o root -d $(DESTDIR)/usr/share/doc/osmium - install -m 755 -g $(INSTALL_GROUP) -o root osmium $(DESTDIR)/usr/bin/osmium - install -m 644 -g $(INSTALL_GROUP) -o root README.md $(DESTDIR)/usr/share/doc/osmium/README.md + install -m 755 -g $(INSTALL_GROUP) -o root -d $(DESTDIR)$(PREFIX)/bin + install -m 755 -g $(INSTALL_GROUP) -o root -d $(DESTDIR)$(PREFIX)/share/doc/osmium + install -m 755 -g $(INSTALL_GROUP) -o root osmium $(DESTDIR)$(PREFIX)/bin/osmium + install -m 644 -g $(INSTALL_GROUP) -o root README.md $(DESTDIR)$(PREFIX)/share/doc/osmium/README.md deb: debuild -I -us -uc diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..e82be81 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,3 @@ +files +osmium.debhelper.log +osmium.substvars diff --git a/debian/control b/debian/control index 391e53a..5fdc58b 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,21 @@ Source: osmium Section: utils Priority: optional Maintainer: Jochen Topf <joc...@topf.org> -Build-Depends: debhelper (>= 7) -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 7), + libboost-program-options-dev, + libbz2-dev, + libcrypto++-dev, + libexpat1-dev, + libosmpbf-dev, + pandoc, + zlib1g-dev +Standards-Version: 3.9.5 Homepage: http://osmcode.org/osmium/ Package: osmium Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Recommends: Description: Command line tool for working with OpenStreetMap data. A versatile command line tool that makes manipulating diff --git a/debian/rules b/debian/rules index d38ac5f..2eff4e7 100755 --- a/debian/rules +++ b/debian/rules @@ -9,79 +9,10 @@ # 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. +%: + dh $@ - touch configure-stamp +override_dh_auto_build: + dh_auto_build + make doc -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) CXX=clang++ - $(MAKE) doc - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - $(MAKE) clean || /bin/true - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/osmium. - $(MAKE) DESTDIR=$(CURDIR)/debian/osmium 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel