summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/rules3
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 10fb241f..7b0cb08a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,8 @@ hurd (20050119-1) unstable; urgency=low
* debian/control (hurd-dbg): New package.
* debian/rules (DEB_DH_STRIP_ARGS): Add support for hurd-dbg.
* debian/hurd-dbg.dirs: New file.
- * debian/hurd.install (debian/tmp/bin/fakeroot): Removed.
+ * debian/rules (install/hurd::): Rename /bin/fakeroot to
+ /bin/fakeroot-hurd.
* debian/control (hurd): Removed fakeroot from Provides:, Replaces:
and Conflicts:. (Closes: #293511)
diff --git a/debian/rules b/debian/rules
index b3b8155c..ae0a5774 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,9 @@ install/hurd::
# runsystem is managed by update-alternatives
mv debian/tmp/libexec/runsystem debian/tmp/libexec/runsystem.gnu
+ # move away fakeroot to not conflict with the one from the fakeroot package
+ mv debian/tmp/bin/fakeroot debian/tmp/bin/fakeroot-hurd
+
SUID_PROGRAMS = /bin/ids /bin/login /bin/ps /bin/w
binary-predeb/hurd::