debian: Rename main package to "location"

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 7deecfec192f2c41fec351ec7246a7ad526bf3de..ef57551fa7a7e77d9256c5d89e7e85617b5232b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -442,11 +442,12 @@ EXTRA_DIST += \
        debian/compat \
        debian/control \
        debian/copyright \
+       debian/location.install \
+       debian/location.manpages \
+       debian/location-perl.install \
+       debian/location-python.install \
+       debian/libloc0.install \
        debian/libloc-dev.install \
-       debian/libloc.install \
-       debian/libloc.lintian-overrides \
-       debian/libloc.manpages \
-       debian/libloc-perl.install \
        debian/rules \
        debian/source/format
 

diff --git a/debian/control b/debian/control
index 09fbae796f9f1ed59eed901edad471d8bd6a4e7b..eff0b992ce5917a1d8732fe8b7c5071318fd5676 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Standards-Version: 4.3.0
 Build-Depends:
  debhelper (>= 11),
  dh-python <!nopython>,
- dh-systemd,
  asciidoc <!nodoc>,
  intltool (>=0.40.0),
  libpython3-dev <!nopython>,
@@ -22,7 +21,7 @@ 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
 
-Package: libloc
+Package: libloc0
 Architecture: any
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -31,7 +30,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${python3:Depends},
-Multi-Arch: same
+Recommends:
+ location (= ${binary:Version})
 Description: Location library
  A library to determine the location of someone on the Internet
 
@@ -39,16 +39,38 @@ Package: libloc-dev
 Architecture: any
 Section: libdevel
 Depends:
- libloc (= ${binary:Version}),
+ libloc0 (= ${binary:Version}),
  ${misc:Depends},
 Suggests:
  pkg-config,
 Multi-Arch: same
-Description: Development files for libloc.
+Description: Development files for libloc
  Install this package if you wish to develop your own programs using
  libloc.
 
-Package: libloc-perl
+Package: location
+Architecture: any
+Pre-Depends:
+ ${misc:Pre-Depends}
+Depends:
+ location-python (= ${binary:Version}),
+ ${misc:Depends}
+Multi-Arch: same
+Description: CLI utilities for libloc
+ Commands to determine someone's location on the Internet
+
+Package: location-python
+Architecture: any
+Section: python
+Pre-Depends:
+ ${misc:Pre-Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: Python modules for libloc
+ This package contains Python bindings for libloc
+
+Package: location-perl
 Architecture: any
 Section: perl
 Depends:
@@ -57,4 +79,4 @@ Depends:
  ${shlibs:Depends}
 Multi-Arch: same
 Description: Perl bindings for libloc
- This package contains simple perl bindings for libloc.
+ This package contains simple perl bindings for libloc

diff --git a/debian/libloc.lintian-overrides b/debian/libloc.lintian-overrides
deleted file mode 100644 (file)
index ca2589e..0000000
--- a/debian/libloc.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libloc: package-name-doesnt-match-sonames libloc0

diff --git a/debian/libloc0.install b/debian/libloc0.install
new file mode 100644 (file)
index 0000000..0f8eec4
--- /dev/null
+++ b/debian/libloc0.install
@@ -0,0 +1 @@
+usr/lib/*/libloc.so.*

diff --git a/debian/libloc-perl.install b/debian/location-perl.install
similarity index 100%
rename from debian/libloc-perl.install
rename to debian/location-perl.install

diff --git a/debian/location-python.install b/debian/location-python.install
new file mode 100644 (file)
index 0000000..a6004ca
--- /dev/null
+++ b/debian/location-python.install
@@ -0,0 +1 @@
+usr/lib/python3*/site-packages

diff --git a/debian/libloc.install b/debian/location.install
similarity index 71%
rename from debian/libloc.install
rename to debian/location.install
index c20e5029ce3df0cda462ed30caade0f41762a6a9..25d9b6fcce2cbc89b36109bc9f2a79346ead5164 100644 (file)
--- a/debian/libloc.install
+++ b/debian/location.install
@@ -1,6 +1,4 @@
 usr/bin/location
-usr/lib/*/libloc.so.*
-usr/lib/python3*/site-packages
+var/lib/location/signing-key.pem
 src/systemd/*.service          /lib/systemd/system/
 src/systemd/*.timer            /lib/systemd/system/
-var/lib/location/signing-key.pem

diff --git a/debian/libloc.manpages b/debian/location.manpages
similarity index 100%
rename from debian/libloc.manpages
rename to debian/location.manpages