Re: Upload libloc to Debian

[Jochen Sprickerhof <libloc@jochen.sprickerhof.de>]

[-- Attachment #1: Type: text/plain, Size: 1348 bytes --]

* Michael Tremer <michael.tremer(a)ipfire.org> [2022-07-06 09:29]:
>This is what I expected. However, if —-verify complains, shouldn’t it complain about the symlink, too?

No, I create the symlink in the maintainer scripts:
https://salsa.debian.org/debian/libloc/-/blob/master/debian/location.postinst
https://salsa.debian.org/debian/libloc/-/blob/master/debian/location.postrm

>Yes, I wouldn’t want any discrepancies here and be as consistent as possible.
>
>So, would you be up for submitting a patch for this as well?

Attached.

>Ultimately, I am not even sure if there is any point in keeping those build scripts around in our repository. There should only be one set of packages available and if that is part of the distribution already, I do not see any reason why we should have our own set of packages, too.

Agreed, though I will upload the package to Debian unstable from where 
it will transition to testing to be part of the next Debian version 
(bookworm). You probably want to provide packages for the older Debian 
versions, still.

I've uploaded first versions here:

https://salsa.debian.org/debian/libloc
https://salsa.debian.org/debian/libloc-database

Note that these target Debian unstable and will probably not build on 
older Debian versions. Testing and comments welcome.

Cheers Jochen

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Merge-location-importer-into-location-package.patch --]
[-- Type: text/x-diff, Size: 3283 bytes --]

From 9de4bdb6a221c5fa66f97e1272342b6e18404f7a Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Wed, 6 Jul 2022 10:40:42 +0200
Subject: [PATCH] Merge location-importer into location package

---
 debian/control                   | 27 +++++++++++++--------------
 debian/location-importer.install |  3 ---
 debian/location.install          |  1 +
 debian/rules                     |  3 ---
 4 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 debian/location-importer.install

diff --git a/debian/control b/debian/control
index 660f759..89cac4f 100644
--- 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
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 25d9b6f..716f0de 100644
--- 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 8c252ec..6ec8d8a 100755
--- 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
-- 
2.36.1


[-- Attachment #3: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]