tag 661474 + patch thanks On Mon, 27 Feb 2012 15:09:31 +0100, Andreas Beckmann wrote:
> The list of installed files at points (1) and (2) should be identical, > but the following files have disappeared: > > /usr/share/applications/enigma.desktop > > The enigma package has the following relationships with enigma-data: > > Conflicts: n/a > Breaks: n/a > Replaces: enigma-data I think the problem is more that both enigma and enigma-data install a (different version of) enigma.desktop: % debc | grep \\.desktop -rw-r--r-- root/root 380 2012-04-03 20:48 ./usr/share/applications/enigma.desktop -rw-r--r-- root/root 249 2009-12-08 02:12 ./usr/share/applications/enigma.desktop The one in enigma is installed by the package: debian/enigma.install:debian/enigma.desktop usr/share/applications so the one in -data is installed by the upstream build system: /usr/bin/install -c -m 644 enigma.desktop '/tmp/buildd/enigma-1.10~~pre-alpha+r2210/debian/tmp//usr/share/applications' % find -name "*.desktop" ./etc/enigma.desktop ./debian/enigma.desktop The attached patch removes the duplicate; does this look ok piuparts-wise? Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Diana Krall: Little Girl Blue
diff -Nru enigma-1.10~~pre-alpha+r2210/debian/changelog enigma-1.10~~pre-alpha+r2210/debian/changelog --- enigma-1.10~~pre-alpha+r2210/debian/changelog 2011-07-03 18:14:10.000000000 +0200 +++ enigma-1.10~~pre-alpha+r2210/debian/changelog 2012-04-03 21:01:09.000000000 +0200 @@ -1,3 +1,12 @@ +enigma (1.10~~pre-alpha+r2210-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix "removal of enigma makes files disappear from enigma-data": + remove the duplicate .dekstop file in debian/rules. + (Closes: #661474) + + -- gregor herrmann <[email protected]> Tue, 03 Apr 2012 20:42:29 +0200 + enigma (1.10~~pre-alpha+r2210-1) unstable; urgency=low * New SVN checkout, r2210 diff -Nru enigma-1.10~~pre-alpha+r2210/debian/rules enigma-1.10~~pre-alpha+r2210/debian/rules --- enigma-1.10~~pre-alpha+r2210/debian/rules 2009-12-08 03:02:32.000000000 +0100 +++ enigma-1.10~~pre-alpha+r2210/debian/rules 2012-04-03 21:00:35.000000000 +0200 @@ -11,6 +11,7 @@ binary-post-install/enigma-data:: -rm debian/enigma-data/usr/share/games/enigma/fonts/DejaVuSansCondensed.ttf -rm debian/enigma-data/usr/share/games/enigma/fonts/vera_sans.ttf + -rm debian/enigma-data/usr/share/applications/enigma.desktop # yes, using DejaVuSans instead of Vera Sans, one dependency less # and the fonts are pretty much the same anyway dh_link -p enigma-data \
signature.asc
Description: Digital signature
