aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2006-05-22 09:05:24 +0000
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2006-05-22 09:05:24 +0000
commit8938d6b2c0e661229e8e92cb6a6950dc8d3dcf5d (patch)
tree2f92a77846d623d65178ccc8ad4ac5de5567771d /debian
parent151dcf1c94fb83c2fdfa3524e6f404da40bd1a33 (diff)
ethereal->wireshark
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18208 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/04_drop-capabilities.dpatch2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 5e49da253d..5af0c49a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -629,7 +629,7 @@ ethereal (0.9.1-6) unstable; urgency=low
ethereal (0.9.1-5) unstable; urgency=low
- * debian/rules: added --disable-ssl so that ethereal is not built with
+ * debian/rules: added --disable-ssl so that wireshark is not built with
ssl support and may be uploaded to main. (closes: #134273)
-- Frederic Peters <fpeters@debian.org> Mon, 18 Feb 2002 09:33:30 +0100
diff --git a/debian/patches/04_drop-capabilities.dpatch b/debian/patches/04_drop-capabilities.dpatch
index 45a881ef17..260df311d7 100644
--- a/debian/patches/04_drop-capabilities.dpatch
+++ b/debian/patches/04_drop-capabilities.dpatch
@@ -66,7 +66,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./configure.in /tmp/dpep-work.rT2mW8/et
+fi
+
+
- dnl Check if ethereal should be installed setuid
+ dnl Check if wireshark should be installed setuid
AC_ARG_ENABLE(setuid-install,
[ --enable-setuid-install install ethereal as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
@@ -1322,3 +1363,4 @@