summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2012-06-16 23:37:07 +0200
committerAxel Beckert <abe@deuxchevaux.org>2012-06-16 23:37:32 +0200
commitdf1fa7c76f118d7587d50c1e81ef88068d03aa29 (patch)
tree815e1771d4815083fe4c42c0d6df8c71073cbe6d /debian
parent9110170b64683023e5ce08b7f0238abf60842338 (diff)
downloadscreen-df1fa7c76f118d7587d50c1e81ef88068d03aa29.tar.gz
Fix workaround for #644788 (detect running screen in maintainer scripts) on kfreebsd
Closes: #677227
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/config2
-rw-r--r--debian/preinst2
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b9cf121..f407f42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
screen (4.1.0~20120320gitdb59704-3) UNRELEASED; urgency=low
+ * Fix workaround for #644788 (detect running screen in maintainer
+ scripts) on kfreebsd (Closes: #677227)
* Update debconf templates received from the debian-l10n-english team
(Closes: #677303)
* Add translations of debconf templates
diff --git a/debian/config b/debian/config
index 244fb5c..e7bf977 100644
--- a/debian/config
+++ b/debian/config
@@ -4,7 +4,7 @@ set -e
. /usr/share/debconf/confmodule
-if pidof SCREEN >/dev/null && test '!' -e /tmp/screen-4.0.3 && dpkg --compare-versions $2 lt-nl 4.1.0~; then
+if pidof SCREEN screen >/dev/null && test '!' -e /tmp/screen-4.0.3 && dpkg --compare-versions $2 lt-nl 4.1.0~; then
if cp -pnT /usr/bin/screen /tmp/screen-4.0.3 ; then
echo Copied /usr/bin/screen to /tmp/screen-4.0.3
db_input high screen/410-upgrade || true
diff --git a/debian/preinst b/debian/preinst
index 5dd7f63..0c60d49 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -11,7 +11,7 @@ if [ "$1" = upgrade ]; then
ln -s /tmp/.screen /var/run/screen
fi
fi
- if pidof SCREEN >/dev/null && test '!' -e /tmp/screen-4.0.3 && dpkg --compare-versions "$2" lt-nl 4.1.0~; then
+ if pidof SCREEN screen >/dev/null && test '!' -e /tmp/screen-4.0.3 && dpkg --compare-versions "$2" lt-nl 4.1.0~; then
if cp -pnT /usr/bin/screen /tmp/screen-4.0.3 ; then
echo Copied /usr/bin/screen to /tmp/screen-4.0.3
db_input high screen/410-upgrade || true