tags 314713 patch
thanks
On Fri, Jun 17, 2005 at 03:37:58PM -0700, Daniel Schepler wrote:
> Package: coreutils
> Version: 5.2.1-2
> Severity: important
>
> As the subject says, if I build coreutils with the new dpkg in sid,
> the resulting package includes /usr/share/man/man1/kill.1.gz, which
> makes it conflict with procps. Taking a quick look at debian/rules,
> it appears this is because dpkg-architecture now returns "linux-gnu"
> for DEB_HOST_GNU_SYSTEM.
Assuming that the dbs patch I just sent as #316722 is applied as dbs
0.36, the attached patch corrects this problem.
Cheers,
--
Colin Watson [EMAIL PROTECTED]
diff -u coreutils-5.2.1/debian/rules coreutils-5.2.1/debian/rules
--- coreutils-5.2.1/debian/rules
+++ coreutils-5.2.1/debian/rules
@@ -75,17 +75,17 @@
mv $(d)/usr/share/man/man1/md5sum.1
$(d)/usr/share/man/man1/md5sum.textutils.1
# some things we don't do for hurd
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
# touch used to be in /usr/bin, don't break scripts
ln -s /bin/touch $(d)/usr/bin/touch
endif
# remove stuff provided by other packages
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
# kill from procps is linux-specific
rm -f $(d)/usr/bin/kill $(d)/usr/share/man/man1/kill.1
endif
-ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
rm -f $(d)/usr/bin/su $(d)/usr/share/man/man1/su.1
endif
@@ -147,7 +147,7 @@
dh_link -a
dh_compress -a
dh_fixperms -a
-ifeq ($(DEB_BUILD_GNU_SYSTEM),gnu)
+ifeq ($(DEB_BUILD_ARCH_OS),hurd)
chmod u+s $(d)/usr/bin/su
endif
dh_installdeb -a
diff -u coreutils-5.2.1/debian/control coreutils-5.2.1/debian/control
--- coreutils-5.2.1/debian/control
+++ coreutils-5.2.1/debian/control
@@ -3,7 +3,7 @@
Section: base
Priority: required
Standards-Version: 3.6.0
-Build-Depends: gettext (>= 0.10.37), debhelper, dh-buildinfo, perl-base,
texinfo (>= 4.2), groff, help2man, dbs, autoconf (>= 2.57), automake1.8,
libattr1-dev | not+linux-gnu, libacl1-dev | not+linux-gnu, bzip2, bison
+Build-Depends: gettext (>= 0.10.37), debhelper, dh-buildinfo, perl-base,
texinfo (>= 4.2), groff, help2man, dbs (>= 0.36), autoconf (>= 2.57),
automake1.8, libattr1-dev | not+linux-gnu, libacl1-dev | not+linux-gnu, bzip2,
bison
Build-Conflicts: automake1.4
Package: coreutils
