Comment 5 for bug 8514

tags 273357 patch
thanks

On Thu, Sep 30, 2004 at 02:35:53PM +0200, Frank Lichtenheld wrote:
> Since the last upload was a NMU, should we make one again?

Here is a proposed patch (not yet uploaded):

diff -Naur linux86-0.16.14.bak/debian/changelog linux86-0.16.14/debian/changelog
--- linux86-0.16.14.bak/debian/changelog 2004-10-03 02:36:54.000000000 +0200
+++ linux86-0.16.14/debian/changelog 2004-10-03 02:47:29.000000000 +0200
@@ -1,3 +1,11 @@
+linux86 (0.16.14-1.2) unstable; urgency=high
+
+ * NMU
+ * As elks-libc is only available on i386, drop the bcc recommends
+ on it on all other arches (Closes: #273357)
+
+ -- Frank Lichtenheld <email address hidden> Sun, 3 Oct 2004 02:47:17 +0200
+
 linux86 (0.16.14-1.1) unstable; urgency=low

   * NMU.
diff -Naur linux86-0.16.14.bak/debian/control linux86-0.16.14/debian/control
--- linux86-0.16.14.bak/debian/control 2004-10-03 02:36:54.000000000 +0200
+++ linux86-0.16.14/debian/control 2004-10-03 02:45:49.000000000 +0200
@@ -18,7 +18,6 @@
 Package: bcc
 Architecture: any
 Depends: ${bcc:Depends}, bin86 (= ${Source-Version})
-Recommends: elks-libc (= ${Source-Version})
 Conflicts: linux86
 Replaces: linux86
 Provides: c-compiler
diff -Naur linux86-0.16.14.bak/debian/rules linux86-0.16.14/debian/rules
--- linux86-0.16.14.bak/debian/rules 2004-10-03 02:36:54.000000000 +0200
+++ linux86-0.16.14/debian/rules 2004-10-03 02:45:19.000000000 +0200
@@ -89,10 +89,12 @@

   dpkg-shlibdeps -pbin86 debian/tmp-bin86/usr/bin/*
   dpkg-shlibdeps -pbcc debian/tmp-bcc/usr/{bin/bcc,lib/bcc/*}
- dpkg-gencontrol -Pdebian/tmp-bcc -pbcc -isp
   dpkg-gencontrol -Pdebian/tmp-bin86 -pbin86 -isp
 ifeq ($(findstring i386-linux,$(DEB_BUILD_GNU_TYPE)),i386-linux)
   dpkg-gencontrol -Pdebian/tmp-elks-libc -pelks-libc -isp
+ dpkg-gencontrol -Pdebian/tmp-bcc -pbcc -isp '-DRecommends=elks-libc (= $${Source-Version})'
+else
+ dpkg-gencontrol -Pdebian/tmp-bcc -pbcc -isp
 endif
   chown -R 0.0 debian/tmp-bcc debian/tmp-bin86 debian/tmp-elks-libc
   chmod -R u=rwX,go=rX debian/tmp-bcc debian/tmp-bin86 debian/tmp-elks-libc

Gruesse,
--
Frank Lichtenheld <email address hidden>
www: http://www.djpig.de/