From 2a7454829cfff38d38680ac8d71aca92918abeea Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 27 Mar 2017 18:12:40 +0200 Subject: [PATCH] TT#5420 Update packaging - Use canonical homepage URL. - Bump debhelper compatibility to 9. - Bump Standards-Version to 3.9.8. - Bump source format to 3.0 (native). - Switch to dh debian/rules. - Update copyright years. - Update package description. - Move file installation to an .install file. Change-Id: Id3023dfc888327b53dec252d934ee0514dc3d671 --- .gitignore | 2 + debian/.gitignore | 6 +++ debian/compat | 2 +- debian/control | 10 ++-- debian/copyright | 2 +- debian/install | 1 + debian/{overrides => lintian-overrides} | 0 debian/rules | 72 ++----------------------- debian/source/format | 1 + 9 files changed, 21 insertions(+), 75 deletions(-) create mode 100644 .gitignore create mode 100644 debian/.gitignore create mode 100644 debian/install rename debian/{overrides => lintian-overrides} (100%) create mode 100644 debian/source/format diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3993e9d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.o +/mediator diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..51d4604 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,6 @@ +*.log +*.substvars +*.debhelper +/debhelper-build-stamp +/files +/ngcp-mediator/ diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index d2424de..26414d2 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: utils Priority: extra Maintainer: Sipwise Development Team Build-Depends: - debhelper (>= 5), + debhelper (>= 9), default-libmysqlclient-dev | libmysqlclient15-dev, libglib2.0-dev, -Standards-Version: 3.9.7 -Homepage: http://sipwise.com/ +Standards-Version: 3.9.8 +Homepage: https://www.sipwise.com/ Package: ngcp-mediator Architecture: any @@ -15,5 +15,5 @@ Depends: lsb-base, ${misc:Depends}, ${shlibs:Depends}, -Description: CDR creation tool for NGCP platforms. - This tool generates CDR entries from accounting information in a NGCP platform. +Description: CDR creation tool for NGCP + This tool generates CDR entries from accounting information in a NGCP system. diff --git a/debian/copyright b/debian/copyright index 298f1a5..ab757f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: Sipwise Development Team Files: * Copyright: - Copyright © 2007-2015 Sipwise GmbH, Austria + Copyright © 2007-2017 Sipwise GmbH, Austria License: GPL-3+ 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 diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..c3af3a5 --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +mediator usr/bin/ diff --git a/debian/overrides b/debian/lintian-overrides similarity index 100% rename from debian/overrides rename to debian/lintian-overrides diff --git a/debian/rules b/debian/rules index 71cc35c..e2f099b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,76 +1,12 @@ #!/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 -CFLAGS = -Wall -g +%: + dh $@ -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -build: build-stamp - -build-stamp: - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs usr/bin - - # Add here commands to install the package into debian/ngcp-mediator. - install -m 755 mediator $(CURDIR)/debian/ngcp-mediator/usr/bin/mediator - - -# 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 ChangeLog - dh_installdocs - dh_installexamples - dh_installman +override_dh_installinit: dh_installinit --name=mediator - dh_link - dh_strip - mkdir -p $(CURDIR)/debian/ngcp-mediator/usr/share/lintian/overrides/ - cp -av debian/overrides $(CURDIR)/debian/ngcp-mediator/usr/share/lintian/overrides/ngcp-mediator - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: override_dh_installinit diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native)