From 606f9932901029eb45b9febc67cb5161904d944e Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev <stanislav@nspcc.ru> Date: Thu, 27 Oct 2022 22:54:31 +0300 Subject: [PATCH] [#11] Fix lintian warnings Signed-off-by: Stanislav Bogatyrev <stanislav@nspcc.ru> --- .gitignore | 1 + Makefile | 21 +++++++++++---------- debian/rules | 4 +--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 35dc291..bed0b94 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ in/ locode_db # debhelpers **/.debhelper +debian/changelog diff --git a/Makefile b/Makefile index ad211bc..a86cf2d 100644 --- a/Makefile +++ b/Makefile @@ -12,14 +12,14 @@ space := $(subst ,, ) # .deb package versioning OS_RELEASE = $(shell lsb_release -cs) PKG_VERSION ?= $(shell echo $(VERSION) | sed "s/^v//" | \ - sed -E "s/(.*)-(g[a-fA-F0-9]{6,8})(.*)/\1\3~\2/" | \ - sed "s/-/~/")-${OS_RELEASE} + sed -E "s/(.*)-(g[a-fA-F0-9]{6,8})(.*)/\1\3~\2/" | \ + sed "s/-/~/")-${OS_RELEASE} all: $(DIRS) locode_db $(DIRS): - @echo "⇒ Ensure dir: $@" - @mkdir -p $@ + @echo "⇒ Ensure dir: $@" + @mkdir -p $@ in/airports.dat: wget -c https://raw.githubusercontent.com/jpatokal/openflights/master/data/airports.dat -O in/airports.dat @@ -42,6 +42,7 @@ locode_db: unlocode in/continents.geojson in/airports.dat in/countries.dat --in in/2022-1\ UNLOCODE\ CodeListPart1.csv,in/2022-1\ UNLOCODE\ CodeListPart2.csv,in/2022-1\ UNLOCODE\ CodeListPart3.csv \ --subdiv in/2022-1\ SubdivisionCodes.csv \ --out locode_db + chmod 644 locode_db # Print version version: @@ -66,12 +67,12 @@ clean: # Package for Debian debpackage: dch --package neofs-locode-db \ - --controlmaint \ - --newversion $(PKG_VERSION) \ - --force-bad-version \ - --distribution $(OS_RELEASE) \ - "Please see CHANGELOG.md for code changes for $(VERSION)" + --controlmaint \ + --newversion $(PKG_VERSION) \ + --force-bad-version \ + --distribution $(OS_RELEASE) \ + "Please see CHANGELOG.md for code changes for $(VERSION)" dpkg-buildpackage --no-sign -b debclean: - dh clean + dh clean diff --git a/debian/rules b/debian/rules index d80f961..24b7cb1 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export DEB_BUILD_OPTIONS := nostrip nocheck %: dh $@ -override_dh_auto_build: +override_dh_auto_build: $(MAKE) all override_dh_installchangelogs: @@ -13,5 +13,3 @@ override_dh_installchangelogs: override_dh_clean: dh_clean - rm -f locode_db - \ No newline at end of file