:: Re: [DNG] initial elogind package r…
Page principale
Supprimer ce message
Répondre à ce message
Auteur: Hleb Valoshka
Date:  
À: dng
Sujet: Re: [DNG] initial elogind package ready / RFC
On 1/7/18, Andreas Messer <andi@???> wrote:

> Agree with that. I have added elogind-data now.


It still contains only translations so it's better to merge it with
elogind packages. See a patch attached.

I've also made package buildable and fixed some lintian errors. I've
added --with-udevrulesdir=/lib/udev/rules.d \ to CONFFLAGS because
configure.ac invokes pkg-config to get some values from udev.pc which
is installed by udev/eudev, that's not the case for build chroots.

I've also added call to dh_missing --list-missing so you know what
files are not installed to any package.

It still has some lintian warnings.

Both elogind and ck2 provide the very similar set of udev rules
imported from sd sources, maybe it would be better to merge them and
provide a shared data package, but this is a more distant task.
From 90ffdf9cf161ffcbe8460eb2b57180bd30ef0965 Mon Sep 17 00:00:00 2001
From: Hleb Valoshka <375gnu@???>
Date: Sun, 7 Jan 2018 16:33:17 +0300
Subject: [PATCH 2/2] Drop useless data package

---
 debian/control              | 19 +++----------------
 debian/elogind-data.install |  1 -
 debian/elogind.install      |  1 +
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 debian/elogind-data.install


diff --git a/debian/control b/debian/control
index ebb7ce5c7..a9afbde36 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,6 @@ Multi-Arch: foreign
 Pre-Depends: debconf, ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         elogind-data (= ${binary:Version}),
          libelogind0 (= ${binary:Version}),
          libpam-elogind (= ${binary:Version}),
          lsb-base (>= 3.1),
@@ -54,21 +53,10 @@ Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         elogind-data (= ${binary:Version})
+         ${misc:Depends}
 Description: user, seat and session management library
  This library provides access to elogind session management


-Package: elogind-data
-Section: admin
-Priority: optional
-Architecture: all
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-Description: user, seat and session management - common files
- Common files of elogind
-
 Package: libelogind-dev
 Section: libdevel
 Priority: optional
@@ -87,11 +75,10 @@ Section: admin
 Priority: optional
 Architecture: linux-any
 Multi-Arch: same
-Pre-Depends:  ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libpam-runtime,
-         elogind-data (= ${binary:Version})
+         libpam-runtime
 Provides: libpam-systemd
 Description: elogind PAM module 
  Plugable Authentication Module to register a session with elogind
diff --git a/debian/elogind-data.install b/debian/elogind-data.install
deleted file mode 100644
index 363548064..000000000
--- a/debian/elogind-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale
diff --git a/debian/elogind.install b/debian/elogind.install
index 9b48429ad..a749b2a39 100644
--- a/debian/elogind.install
+++ b/debian/elogind.install
@@ -5,6 +5,7 @@ etc/elogind/logind.conf
 lib/udev/rules.d/
 usr/share/bash-completion/
 usr/share/dbus-1/
+usr/share/locale/
 # Skip license files in /usr/share/doc/elogind
 usr/share/doc/elogind/README
 usr/share/doc/elogind/NEWS
-- 
2.15.1


From 693be5e7cec1dcba9bb216271950d0a2b7af6e3c Mon Sep 17 00:00:00 2001
From: Hleb Valoshka <375gnu@???>
Date: Sun, 7 Jan 2018 16:32:44 +0300
Subject: [PATCH 1/2] Make it build, fix some lintian errors.

---
 debian/copyright               | 4 ++--
 debian/libpam-elogind.postinst | 2 ++
 debian/libpam-elogind.prerm    | 2 ++
 debian/rules                   | 8 ++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)


diff --git a/debian/copyright b/debian/copyright
index 32a58310b..74c9617ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: elogind
Source: https://github.com/elogind/elogind

@@ -47,7 +47,7 @@ License: CC0-1.0

Files: man/glib-event-glue.c:
Copyright: 2014 Tom Gundersen
-License:
+License: Expat
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction,
diff --git a/debian/libpam-elogind.postinst b/debian/libpam-elogind.postinst
index 96c6817ea..7e37590c5 100755
--- a/debian/libpam-elogind.postinst
+++ b/debian/libpam-elogind.postinst
@@ -3,3 +3,5 @@
set -e

 pam-auth-update --package
+
+#DEBHELPER#
diff --git a/debian/libpam-elogind.prerm b/debian/libpam-elogind.prerm
index 3c25c6451..e6187ae2a 100755
--- a/debian/libpam-elogind.prerm
+++ b/debian/libpam-elogind.prerm
@@ -5,3 +5,5 @@ set -e
 if [ "$1" = remove ]; then
     pam-auth-update --package --remove elogind
 fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 76f29f0d4..6449e934a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,18 +11,22 @@


CONFFLAGS = \
--with-pamlibdir=/lib/$(DEB_HOST_MULTIARCH)/security \
+ --with-udevrulesdir=/lib/udev/rules.d \
--disable-lto \
--disable-tests

 #autoreconf:
 #    ./autogen.sh

    
-#override_dh_autoreconf:
-#    dh_autoreconf debian/rules -- autoreconf
+override_dh_autoreconf:
+    dh_autoreconf ./autogen.sh


 override_dh_auto_configure:
     dh_auto_configure --builddirectory=build \
     -- $(CONFFLAGS)


+override_dh_missing:
+    dh_missing --list-missing
+
 %:
     dh $@ --builddirectory=build --with autoreconf --parallel
-- 
2.15.1