Merge location-importer into location package

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

diff --git a/debian/control b/debian/control
index 660f759deb8c17293cf7e309e09f609accfc22e7..89cac4f7488407d6c92773d763aeda6897da44f5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -57,22 +57,12 @@ Depends:
  python3-location,
  ${misc:Depends},
  ${python3:Depends}
+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
 
-Package: location-importer
-Architecture: any
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- python3-location,
- ${misc:Depends},
- ${python3:Depends}
-Multi-Arch: foreign
-Description: Tools to author location databases
- This package contains tools that are required to build location databases
-
 Package: python3-location
 Architecture: any
 Section: python
@@ -81,9 +71,10 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
  ${python3:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ python3-psycopg2,
 Replaces: location-python (<< 0.9.14-1~)
-Breaks: 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
@@ -95,3 +86,11 @@ Priority: optional
 Section: oldlibs
 Description: transitional package
  This is a transitional package. It can safely be removed.
+
+Package: location-importer
+Depends: location, ${misc:Depends}
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.

diff --git a/debian/location-importer.install b/debian/location-importer.install
deleted file mode 100644 (file)
index eaae79d..0000000
--- a/debian/location-importer.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/location-importer
-usr/lib/python3*/site-packages/location/database.py
-usr/lib/python3*/site-packages/location/importer.py

diff --git a/debian/location.install b/debian/location.install
index 25d9b6fcce2cbc89b36109bc9f2a79346ead5164..716f0def565b6215dc9e3bc495ddf6e38496c53e 100644 (file)
--- a/debian/location.install
+++ b/debian/location.install
@@ -1,4 +1,5 @@
 usr/bin/location
+usr/bin/location-importer
 var/lib/location/signing-key.pem
 src/systemd/*.service          /lib/systemd/system/
 src/systemd/*.timer            /lib/systemd/system/

diff --git a/debian/rules b/debian/rules
index 8c252ecde4e9096a4f83d118b871694c16f798fd..6ec8d8a84fc40fec57d4a441b50a025c037067f3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,3 @@ override_dh_install:
        dh_install
        # lintian: unknown-file-in-python-module-directory
        rm debian/python3-location/usr/lib/python3*/site-packages/_location.la
-       # linitan: binaries-have-file-conflict (d/location-importer.install)
-       rm debian/python3-location/usr/lib/python3*/site-packages/location/database.py
-       rm debian/python3-location/usr/lib/python3*/site-packages/location/importer.py