Skip to content

Commit

Permalink
[#11] Fix lintian warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Stanislav Bogatyrev <stanislav@nspcc.ru>
  • Loading branch information
Stanislav Bogatyrev authored and realloc committed Oct 28, 2022
1 parent bbb5840 commit 606f993
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ in/
locode_db
# debhelpers
**/.debhelper
debian/changelog
21 changes: 11 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
4 changes: 1 addition & 3 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ export DEB_BUILD_OPTIONS := nostrip nocheck
%:
dh $@

override_dh_auto_build:
override_dh_auto_build:
$(MAKE) all

override_dh_installchangelogs:
dh_installchangelogs -k CHANGELOG.md

override_dh_clean:
dh_clean
rm -f locode_db

0 comments on commit 606f993

Please sign in to comment.