Improvements from Debian packaging

debian/compat

-10

debian/control

 Source: libloc
 Maintainer: Stefan Schantl <stefan.schantl@ipfire.org>
-Section: misc
+Section: net
 Priority: optional
-Standards-Version: 4.3.0
+Standards-Version: 4.6.1
 Build-Depends:
- debhelper (>= 11),
- dh-python <!nopython>,
- asciidoc <!nodoc>,
- intltool (>=0.40.0),
- libpython3-dev <!nopython>,
+ debhelper-compat (= 13),
+ dh-sequence-python3,
+ asciidoc,
+ intltool,
  libssl-dev,
  libsystemd-dev,
- python3-dev:any <!nopython>,
  pkg-config,
+ python3-all-dev,
  systemd,
- xsltproc <!nodoc>,
- docbook-xsl <!nodoc>,
- git,
+ xsltproc,
+ docbook-xsl,
 Rules-Requires-Root: no
 Homepage: https://location.ipfire.org/
-Vcs-Git: https://git.ipfire.org/pub/git/location/libloc.git
-Vcs-Browser: https://git.ipfire.org/pub/git/location/libloc.git
+Vcs-Git: https://salsa.debian.org/debian/libloc.git
+Vcs-Browser: https://salsa.debian.org/debian/libloc
+Description: IP geolocation query library
+ libloc is a lightweight library to query the IPFire Location database and
+ determine the location of someone else on the Internet based on their IP
+ address.
 
 Package: libloc1
 Architecture: any
 Section: libs
-Pre-Depends:
- ${misc:Pre-Depends}
 Depends:
  ${shlibs:Depends},
- ${misc:Depends}
-Recommends:
- location (= ${binary:Version})
+ ${misc:Depends},
 Multi-Arch: same
-Description: Location library
- A library to determine the location of someone on the Internet
+Description: ${source:Synopsis}
+ ${source:Extended-Description}
+ .
+ This package provides the shared library.
 
 Package: libloc-dev
 Architecture: any
@@ -42,42 +42,46 @@ Section: libdevel
 Depends:
  libloc1 (= ${binary:Version}),
  ${misc:Depends},
-Suggests:
- pkg-config
 Multi-Arch: same
-Description: Development files for libloc
- Install this package if you wish to develop your own programs using
- libloc.
+Description: ${source:Synopsis} (development files)
+ ${source:Extended-Description}
+ .
+ This package provides the headers and development files needed to use libloc
+ in your own programs.
 
 Package: location
-Architecture: any
-Pre-Depends:
- ${misc:Pre-Depends}
+Architecture: all
 Depends:
  python3-location,
  ${misc:Depends},
- ${python3:Depends}
+ ${python3:Depends},
+Recommends:
+ libloc-database,
 Replaces: location-importer (<< 0.9.14-1~)
 Breaks: location-importer (<< 0.9.14-1~)
-Multi-Arch: same
-Description: CLI utilities for libloc
- Commands to determine someone's location on the Internet
+Description: ${source:Synopsis} (CLI utilities)
+ ${source:Extended-Description}
+ .
+ This package provides CLI utilities based on libloc.
 
 Package: python3-location
 Architecture: any
 Section: python
-Pre-Depends:
- ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},
  python3-psycopg2,
-Replaces: location-python (<< 0.9.14-1~)
-Breaks: location-python (<< 0.9.14-1~), location-importer (<< 0.9.14-1~)
+Replaces:
+ location-python (<< 0.9.14-1~),
+Breaks:
+ location-python (<< 0.9.14-1~),
+ location-importer (<< 0.9.14-1~),
 Multi-Arch: foreign
-Description: Python modules for libloc
- This package contains Python bindings for libloc
+Description: ${source:Synopsis} (Python 3 bindings)
+ ${source:Extended-Description}
+ .
+ This package provides the Python 3 bindings for libloc.
 
 Package: location-python
 Depends: python3-location, ${misc:Depends}

debian/libloc-dev.install

 usr/include/libloc
 usr/lib/*/libloc.so
 usr/lib/*/pkgconfig
+usr/share/man/man3

debian/libloc1.install

 usr/lib/*/libloc.so.*
+usr/share/locale/*/LC_MESSAGES/libloc.mo

debian/libloc1.symbols

@@ -13,6 +13,7 @@ libloc.so.1 libloc1 #MINVER#
  loc_as_list_new@LIBLOC_1 0.9.5
  loc_as_list_ref@LIBLOC_1 0.9.5
  loc_as_list_size@LIBLOC_1 0.9.5
+ loc_as_list_sort@LIBLOC_1 0.9.12
  loc_as_list_unref@LIBLOC_1 0.9.5
  loc_as_new@LIBLOC_1 0.9.4
  loc_as_ref@LIBLOC_1 0.9.4
@@ -32,6 +33,7 @@ libloc.so.1 libloc1 #MINVER#
  loc_country_list_new@LIBLOC_1 0.9.5
  loc_country_list_ref@LIBLOC_1 0.9.5
  loc_country_list_size@LIBLOC_1 0.9.5
+ loc_country_list_sort@LIBLOC_1 0.9.12
  loc_country_list_unref@LIBLOC_1 0.9.5
  loc_country_new@LIBLOC_1 0.9.4
  loc_country_ref@LIBLOC_1 0.9.4

debian/location-perl.install

-usr/lib/*/perl/

debian/location.install

-usr/bin/location
-usr/bin/location-importer
+usr/bin
 var/lib/location/signing-key.pem
-src/systemd/*.service		/lib/systemd/system/
-src/systemd/*.timer		/lib/systemd/system/
+lib/systemd/system
+usr/share/man/man8

debian/location.manpages

-man/location.8

debian/location.postinst

+#!/bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+    mkdir -p /var/lib/location || true
+    ln -s /usr/share/libloc-location/location.db /var/lib/location/database.db 2>/dev/null || true
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/location.postrm

+#!/bin/sh
+
+set -e
+
+case "$1" in
+  purge)
+    rm -f /var/lib/location/database.db 2>/dev/null
+    rm -f /var/lib/location/signing-key.pem 2>/dev/null
+    rmdir /var/lib/location || true
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

debian/python3-location.install

-usr/lib/python3*/site-packages
+usr/lib/python3*

debian/rules

 #!/usr/bin/make -f
 
-# enable verbose mode
-#export DH_VERBOSE=1
-
-# enable all hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export PYBUILD_SYSTEM=custom
+export PYBUILD_CLEAN_ARGS=dh_auto_clean
+export PYBUILD_CONFIGURE_ARGS=intltoolize --force --automake; \
+	PYTHON={interpreter} dh_auto_configure -- \
+	--disable-perl
+export PYBUILD_BUILD_ARGS=dh_auto_build
+export PYBUILD_INSTALL_ARGS=dh_auto_install --destdir={destdir}; \
+	mkdir -p {destdir}/usr/lib/python{version}/dist-packages; \
+	mv {destdir}/usr/lib/python3/dist-packages/_location.so {destdir}/usr/lib/python{version}/dist-packages/_location.so; \
+	rm -f {destdir}/usr/lib/python3/dist-packages/_location.la {destdir}/usr/lib/*/libloc.la
+export PYBUILD_TEST_ARGS=dh_auto_test
 
 %:
-	dh $@ --with python3 --with-systemd
-
-override_dh_auto_configure:
-	intltoolize --force --automake
-	dh_auto_configure -- --disable-perl
-
-override_dh_perl:
-	dh_perl -d
-
-override_dh_systemd_enable:
-	dh_systemd_enable location-update.timer
-
-override_dh_install:
-	dh_install
-	# lintian: unknown-file-in-python-module-directory
-	rm debian/python3-location/usr/lib/python3*/site-packages/_location.la
+	dh $@ --buildsystem=pybuild

debian/watch

 version=4
 https://source.ipfire.org/releases/libloc/ \
-    @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate
+    @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@