diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/files | 1 | ||||
| -rw-r--r-- | debian/not-installed | 4 | ||||
| -rw-r--r-- | debian/tests/control | 4 | ||||
| -rw-r--r-- | debian/tests/start-net | 12 |
5 files changed, 12 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 3e5b6cd..9c37a72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,6 @@ sane-backends (1.0.29-1~experimental1) experimental; urgency=medium - Don't install obsolete hal fdi file (Closes: #913282). * Remove architecture dependent symbols files. * Merge release 1.0.27-3.2 into source tree. - - I disagree the changes from 1.0.27-3.1. - Thanks to John Paul Adrian Glaubitz for the bug fix. * New debian/patches/0725-fix_link_60-libsane_rule.patch: - Fix directory for 20-sane.hwdb (Closes: #916239). @@ -62,6 +61,7 @@ sane-backends (1.0.29-1~experimental1) experimental; urgency=medium * Install all docs: - New debian/libsane-common.dirs, debian/libsane-common.docs, debian/not-installed. + * Fix autopkgtest. -- Jörg Frings-Fürst <debian@jff.email> Tue, 23 Jul 2019 12:32:06 +0200 diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..2fbe88b --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +sane-backends_1.0.29-1~experimental1_source.buildinfo graphics optional diff --git a/debian/not-installed b/debian/not-installed index be47de8..fa760b5 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,4 +1,4 @@ usr/lib/*/sane/*.la -usr/lib/*/.la -usr/share/doc/libsane-common/README.* +usr/lib/*/*.la +usr/share/doc/libsane/README.* usr/bin/sane-config diff --git a/debian/tests/control b/debian/tests/control index 0d875a9..af31d1d 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -5,5 +5,5 @@ # 1. start-net # Tests: start-net -Depends: sane-utils -Restrictions: needs-root allow-stderr breaks-testbed +Depends: sane-utils, grep, coreutils +Restrictions: needs-root allow-stderr diff --git a/debian/tests/start-net b/debian/tests/start-net index dbc2c28..4ce08f1 100644 --- a/debian/tests/start-net +++ b/debian/tests/start-net @@ -7,23 +7,23 @@ set -ex # Enable localhost -sed -i '/localhost/d' /etc/sane.d/saned.conf +/bin/sed -i '/localhost/d' /etc/sane.d/saned.conf echo localhost >>/etc/sane.d/saned.conf # Enable pnm -sed -i 's/^#\(pnm\)$/\1/' /etc/sane.d/dll.conf +/bin/sed -i 's/^#\(pnm\)$/\1/' /etc/sane.d/dll.conf # Enable net @ localhost -sed -i 's/^# \(localhost\)$/\1/' /etc/sane.d/net.conf +/bin/sed -i 's/^# \(localhost\)$/\1/' /etc/sane.d/net.conf # Enable & start saned.socket -systemctl enable saned.socket -systemctl start saned.socket +#/bin/systemctl enable saned.socket +#/bin/systemctl start saned.socket # # test # -CNT=`scanimage -d net -L | grep net: | wc -l` +CNT=`/usr/bin/scanimage -d net -L | /bin/grep net: | /usr/bin/wc -l` if [ ${CNT} -eq 2 ] ; then exit 0 |