Package: icon
Version: 9.4.3-4.2
Followup-For: Bug #718947
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Switch the testsuite to use /usr/share/base-files/motd instead
of /etc/motd, since base-files ships the former (LP: #1226567)
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers saucy-updates
APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.11.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u icon-9.4.3/debian/changelog icon-9.4.3/debian/changelog
only in patch2:
unchanged:
--- icon-9.4.3.orig/tests/general/io.icn
+++ icon-9.4.3/tests/general/io.icn
@@ -6,7 +6,7 @@
local L, f, m, n, t1, t2
L := [&input, &output, &errout,
- m := open("/etc/motd") | stop("no /etc/motd"),
+ m := open("/usr/share/base-files/motd") | stop("no /usr/share/base-files/motd"),
n := open("/dev/null", "w") | stop("no /dev/null")]
L := sort(L)
every f := !L do
@@ -21,10 +21,10 @@
every write(!&input) \ 2
write()
- write("flush /etc/motd: ", image(flush(m)) | "FAILED")
- write("close /etc/motd: ", image(close(m)) | "FAILED")
- write("close /etc/motd: ", image(close(m)) | "FAILED")
- write("flush /etc/motd: ", image(flush(m)) | "FAILED")
+ write("flush /usr/share/base-files/motd: ", image(flush(m)) | "FAILED")
+ write("close /usr/share/base-files/motd: ", image(close(m)) | "FAILED")
+ write("close /usr/share/base-files/motd: ", image(close(m)) | "FAILED")
+ write("flush /usr/share/base-files/motd: ", image(flush(m)) | "FAILED")
write()
write("flush /dev/null: ", image(flush(n)) | "FAILED")
only in patch2:
unchanged:
--- icon-9.4.3.orig/tests/general/io.std
+++ icon-9.4.3/tests/general/io.std
@@ -2,7 +2,7 @@
file: &input
file: &output
file: file(/dev/null)
-file: file(/etc/motd)
+file: file(/usr/share/base-files/motd)
aaa
bbbb
@@ -13,10 +13,10 @@
ggggggggg
hhhhhhhhhh
-flush /etc/motd: file(/etc/motd)
-close /etc/motd: file(/etc/motd)
-close /etc/motd: file(/etc/motd)
-flush /etc/motd: file(/etc/motd)
+flush /usr/share/base-files/motd: file(/usr/share/base-files/motd)
+close /usr/share/base-files/motd: file(/usr/share/base-files/motd)
+close /usr/share/base-files/motd: file(/usr/share/base-files/motd)
+flush /usr/share/base-files/motd: file(/usr/share/base-files/motd)
flush /dev/null: file(/dev/null)
close /dev/null: file(/dev/null)
@@ -109,7 +109,7 @@
> =()= local L, f, m, n, t1, t2
> =()=
> =()= L := [&input, &output, &errout,
-> =()= m := open("/etc/motd") | stop("no /etc/motd"),
+> =()= m := open("/usr/share/base-files/motd") | stop("no /usr/share/base-files/motd"),
> =()= n := open("/dev/null", "w") | stop("no /dev/null")]
file(ls io.i?n io.d?t io.s?d)
