Various fixes for easier Debian packaging

This commit is contained in:
Jochen Topf 2014-03-12 14:09:13 +01:00
parent 3199c9fa6f
commit 237240107f
6 changed files with 47 additions and 31 deletions

31
debian/control vendored
View File

@ -1,19 +1,18 @@
Source: osmpbf
Maintainer: Jochen Topf <jochen@topf.org>
Section: java
Priority: extra
Maintainer: Debian GIS Team <pkg-grass-devel@lists.alioth.debian.org>
Build-Depends:
debhelper (>= 9~)
, protobuf-compiler
, libprotobuf-java
, ant
, default-jdk
, libprotobuf-dev
, maven-repo-helper
Priority: optional
Build-Depends: debhelper (>= 9~),
protobuf-compiler,
libprotobuf-java,
ant,
default-jdk,
libprotobuf-dev,
maven-repo-helper
Standards-Version: 3.9.5
Homepage: http://github.com/scrosby/OSM-binary
Vcs-Git: git://anonscm.debian.org/pkg-grass/osmpbf.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/osmpbf.git;a=summary
Vcs-Git: git://anonscm.debian.org/pkg-grass/osmpbf.git
Homepage: http://github.com/scrosby/OSM-binary
Package: libosmpbf-java
Architecture: all
@ -26,8 +25,8 @@ Description: Java access library for OpenStreetMap PBF file format
This package provides a Java library.
Package: libosmpbf-dev
Section: libdevel
Architecture: any
Section: libdevel
Depends: ${misc:Depends}
Description: C headers for OpenStreetMap PBF file format
Osmpbf is a Java/C library to read and write OpenStreetMap PBF files.
@ -38,9 +37,10 @@ Description: C headers for OpenStreetMap PBF file format
applications.
Package: osmpbf-bin
Section: utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Section: utils
Depends: ${shlibs:Depends},
${misc:Depends}
Description: OpenStreetMap PBF file format library - tools
Osmpbf is a Java/C library to read and write OpenStreetMap PBF files.
PBF (Protocol buffer Binary Format) is a binary file format for OpenStreetMap
@ -48,3 +48,4 @@ Description: OpenStreetMap PBF file format library - tools
.
This package provides various tools to deal with OpenStreetMap PBF file
format.

27
debian/rules vendored
View File

@ -4,27 +4,36 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
CXXFLAGS += $(CPPFLAGS)
%:
dh $@
dh $@ --buildsystem makefile --parallel
override_dh_auto_clean:
$(MAKE) -C src clean
$(MAKE) -C tools clean
dh_auto_clean --buildsystem ant
dh_auto_clean -Dsrc
dh_auto_clean -Dtools
mh_clean
override_dh_auto_configure:
dh_auto_configure --buildsystem ant
dh_auto_configure -Dsrc
dh_auto_configure -Dtools
override_dh_auto_build:
ant
$(MAKE) -C src
$(MAKE) -C tools
dh_auto_build --buildsystem ant
dh_auto_build -Dsrc
dh_auto_build -Dtools
override_dh_auto_install:
$(MAKE) -C src DESTDIR=$(CURDIR)/debian/libosmpbf-dev PREFIX=/usr install
$(MAKE) -C tools DESTDIR=$(CURDIR)/debian/osmpbf-bin PREFIX=/usr install
dh_auto_install --buildsystem ant
dh_auto_install -Dsrc -- PREFIX=/usr
dh_auto_install -Dtools -- PREFIX=/usr
override_dh_installchangelogs:
dh_installchangelogs -- ReleaseNotes.txt
override_dh_install:
dh_install
mh_installjar -plibosmpbf-java -l pom.xml osmpbf.jar
mh_installpom -plibosmpbf-java pom.xml

2
debian/watch vendored Normal file
View File

@ -0,0 +1,2 @@
version=3
http://githubredir.debian.net/github/scrosby/OSM-binary/v(\d+.*)\.tar\.gz

View File

@ -1,10 +1,12 @@
PREFIX ?= /usr/local
CXX ?= g++
# these default settings can be overridden by setting environment variables
PREFIX ?= /usr/local
CXX ?= g++
CXXFLAGS ?= -O3
AR ?= ar
PROTOC ?= protoc
AR ?= ar
PROTOC ?= protoc
CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
.PHONY: clean install

View File

@ -1,9 +1,11 @@
PREFIX ?= /usr/local
CXX ?= g++
# these default settings can be overridden by setting environment variables
PREFIX ?= /usr/local
CXX ?= g++
CXXFLAGS ?= -g
CXXFLAGS += -I../include -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
LDFLAGS += -L../src -pthread -lz -lprotobuf-lite -losmpbf
LDFLAGS += -L../src -pthread -lz -lprotobuf-lite -losmpbf
.PHONY: clean install