[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#754033: at-spi2-core: stray shlibs file makes udebs useless



Source: at-spi2-core
Version: 2.10.2-3
Severity: serious
Tags: d-i patch
Justification: broken udebs

[ -boot@ in X-D-Cc ]

Hi maintainers,

the following bugs should have been fixed thanks to various udeb
additions: #723951, #723163. Unfortunately that isn't the case yet,
because during the build the following instructions:
| override_dh_makeshlibs:
| 	dh_makeshlibs -a --add-udeb=libatspi0-udeb

generate the following shlibs file:
| $ cat debian/libatspi2.0-0/DEBIAN/shlibs
| libatspi 0 libatspi2.0-0
| udeb: libatspi 0 libatspi0-udeb

which looks like what we would like reverse dependencies to use to get a
proper dependencies as far as udebs are concerned.

But given there's still this file around, the generated shlibs file is
later getting replaced by its contents, making all efforts moot:
| $ cat debian/libatspi2.0-0.shlibs 
| libatspi 0 libatspi2.0-0 (>= 2.9.90)

(Note the missing udeb line.)

I'm going to assume you might want to be keep the version around, you'll
find attached a patch against master which implements that.

Mraw,
KiBi.
>From 01af06cd340cfd547f3f66f8b9af1cd8967c1132 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Sun, 6 Jul 2014 23:11:41 +0200
Subject: [PATCH] Fix generated shlibs file (broken for udebs).

---
 debian/changelog            | 7 +++++++
 debian/libatspi2.0-0.shlibs | 1 -
 debian/rules                | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 debian/libatspi2.0-0.shlibs

diff --git a/debian/changelog b/debian/changelog
index 6445706..c8a4304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
 at-spi2-core (2.10.2-4) UNRELEASED; urgency=medium
 
+  [ Samuel Thibault ]
   * control: Fix typo in package description (Closes: Bug#745283)
 
+  [ Cyril Brulebois ]
+  * Fix generated shlibs file by removing stray, static copy
+    (debian/libatspi2.0-0.shlibs), and by moving the version to the
+    dh_makeshlibs call (-V flag). This will fix reverse-depending udeb
+    uninstallability as soon as at-spi2-atk is rebuilt.
+
  -- Samuel Thibault <sthibault@debian.org>  Sun, 20 Apr 2014 10:38:29 +0200
 
 at-spi2-core (2.10.2-3) unstable; urgency=low
diff --git a/debian/libatspi2.0-0.shlibs b/debian/libatspi2.0-0.shlibs
deleted file mode 100644
index 8035888..0000000
--- a/debian/libatspi2.0-0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libatspi 0 libatspi2.0-0 (>= 2.9.90)
diff --git a/debian/rules b/debian/rules
index 6b1afc7..de62d98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_install:
 override_dh_auto_test:
 
 override_dh_makeshlibs:
-	dh_makeshlibs -a --add-udeb=libatspi0-udeb
+	dh_makeshlibs -a --add-udeb=libatspi0-udeb -V 'libatspi2.0-0 (>= 2.9.90)'
 	dh_girepository -pgir1.2-atspi-2.0
 
 override_dh_strip:
-- 
2.0.1


Reply to: