Commit 05d0b96d authored by Ondřej Nový's avatar Ondřej Nový

Bump debhelper compat level to 12.

parent 1a5d653e
......@@ -8,6 +8,7 @@ swift (2.22.0-1) UNRELEASED; urgency=medium
* python3-swift.lintian-overrides: Fix wrong binary package name
* Use pybuild to build package.
* Clean using d/clean file instead of override_dh_auto_clean target.
* Bump debhelper compat level to 12.
-- Ondřej Nový <onovy@debian.org> Mon, 05 Aug 2019 13:32:18 +0200
......
......@@ -7,7 +7,7 @@ Uploaders:
Michal Arbet <michal.arbet@ultimum.io>,
Ondřej Nový <onovy@debian.org>,
Build-Depends:
debhelper-compat (= 10),
debhelper-compat (= 12),
dh-exec,
dh-python,
openstack-pkg-tools (>= 99~),
......@@ -56,6 +56,7 @@ Testsuite: autopkgtest-pkg-python
Package: python3-swift
Architecture: all
Section: python
Pre-Depends: ${misc:Pre-Depends}
Depends:
adduser,
python3-cryptography,
......@@ -97,6 +98,7 @@ Description: distributed virtual object store - Python 3 libraries
Package: swift
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends:
logrotate,
python3-swift (=${binary:Version}),
......@@ -127,6 +129,7 @@ Description: distributed virtual object store - common files
Package: swift-account
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends:
lsb-base,
python3-swift (=${binary:Version}),
......@@ -160,6 +163,7 @@ Description: distributed virtual object store - account server
Package: swift-container
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends:
lsb-base,
python3-swift (=${binary:Version}),
......@@ -194,6 +198,7 @@ Description: distributed virtual object store - container server
Package: swift-doc
Architecture: all
Section: doc
Pre-Depends: ${misc:Pre-Depends}
Depends:
libjs-bootstrap,
libjs-jquery,
......@@ -225,6 +230,7 @@ Description: distributed virtual object store - documentation
Package: swift-drive-audit
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends:
python3-swift (=${binary:Version}),
swift (=${binary:Version}),
......@@ -254,6 +260,7 @@ Description: distributed virtual object store - drive audit
Package: swift-object
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends:
lsb-base,
python3-swift (=${binary:Version}),
......@@ -287,6 +294,7 @@ Description: distributed virtual object store - object server
Package: swift-object-expirer
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends:
lsb-base (>= 3.0-6),
python3-swift (=${binary:Version}),
......@@ -320,6 +328,7 @@ Description: distributed virtual object store - object-expirer
Package: swift-proxy
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends:
lsb-base,
python3-swift (=${binary:Version}),
......
#!/usr/bin/make -f
-include /usr/share/openstack-pkg-tools/pkgos.make
export SWIFT_TEST_CONFIG_FILE=$(CURDIR)/debian/swift-test.conf
export PYBUILD_TEST_ARGS=\
test/unit \
--exclude-test=test.unit.common.test_utils.TestUtils.test_get_logger_sysloghandler_plumbing
include /usr/share/openstack-pkg-tools/pkgos.make
%:
dh $@ --buildsystem=pybuild --with python3,sphinxdoc,systemd
override_dh_auto_install:
dh_auto_install
rm debian/tmp/usr/bin/swift-init
dh $@ --buildsystem=pybuild --with python3,sphinxdoc
override_dh_auto_build:
dh_auto_build
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func python3-swift.postinst
# Create the init scripts and systemd unit files from the template
set -e ; for i in $(sort $(wildcard debian/*.init.in)) ; do \
MYINIT=`echo $$i | sed s/.init.in//` ; \
override_dh_auto_install:
dh_auto_install
rm debian/tmp/usr/bin/swift-init
override_dh_installinit:
set -e ; \
for i in $(sort $(wildcard debian/*.init.in)) ; do \
MYINIT=`echo $$i | sed -e s/.init.in//` ; \
INITPKG=`echo $$MYINIT | sed -e s:debian/:: | cut -d. -f1` ; \
INITNAME=`echo $$MYINIT | sed -e s:debian/:: | cut -d. -f2` ; \
echo "[installinit] Package: $$INITPKG Init: $$INITNAME" ; \
cp $$i $$MYINIT.init ; \
cat debian/init-script-template >>$$MYINIT.init ; \
dh_installinit --error-handler=true -p$$INITPKG --name=$$INITNAME ;\
done
override_dh_installsystemd:
set -e ; \
for i in $(sort $(wildcard debian/*.init.in)) ; do \
MYINIT=`echo $$i | sed -e s/.init.in//` ; \
INITPKG=`echo $$MYINIT | sed -e s:debian/:: | cut -d. -f1` ; \
INITNAME=`echo $$MYINIT | sed -e s:debian/:: | cut -d. -f2` ; \
echo "[installsystemd] Package: $$INITPKG Init: $$INITNAME" ; \
debian/gen-systemd-unit $$i ; \
dh_installsystemd -p$$INITPKG --name=$$INITNAME ;\
done
override_dh_systemd_enable:
echo "Do nothing"
gen-init-configurations:
echo "Do nothing"
# build with sphinx documentation
override_dh_sphinxdoc:
ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
......@@ -37,38 +58,6 @@ ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
dh_sphinxdoc
endif
gen-init-configurations:
# Create the init scripts and systemd unit files from the template
set -e ; for i in $(sort $(wildcard debian/*.init.in)) ; do \
MYINIT=`echo $$i | sed s/.init.in//` ; \
cp $$i $$MYINIT.init ; \
cat debian/init-script-template >>$$MYINIT.init ; \
debian/gen-systemd-unit $$i ; \
done
override_dh_systemd_enable: gen-init-configurations
echo "Do nothing"
override_dh_systemd_start:
echo "Do nothing"
override_dh_installinit: gen-init-configurations
set -e ; for i in $(sort $(wildcard debian/*.init.in)) ; do \
MYINIT=`echo $$i | sed -e s/.init.in// -e s:debian/::` ; \
INITPKG=`echo $$MYINIT | cut -d. -f1` ; \
INITNAME=`echo $$MYINIT | cut -d. -f2` ; \
echo "Package: $$INITPKG Init: $$INITNAME" ; \
dh_systemd_enable -p$$INITPKG --name=$$INITNAME ; \
case $$INITNAME in \
swift-object-expirer|swift-container-reconciler) \
dh_installinit --error-handler=true --restart-after-upgrade -p$$INITPKG --name=$$INITNAME ;; \
*) \
dh_installinit --error-handler=true --restart-after-upgrade -p$$INITPKG --name=$$INITNAME ; \
cp debian/$$INITPKG.$$INITNAME@.service debian/$$INITPKG/lib/systemd/system/$$INITNAME@.service ;; \
esac ; \
dh_systemd_start -p$$INITPKG --name=$$INITNAME ; \
done
override_dh_installdocs:
dh_installdocs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment