[debian-edu-commits] debian-edu/pkg-team/ 06/07: rename package: midori-display -> surf-display.
Mike Gabriel
sunweaver at debian.org
Tue Jun 6 22:26:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository surf-display.
commit 05daefc747193f4edb73d564621d1110531e0d53
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jun 7 00:06:07 2017 +0200
rename package: midori-display -> surf-display.
---
debian/changelog | 4 ++--
debian/control | 26 ++++++++++++----------
debian/copyright | 4 ++--
debian/midori-display.doc-base | 9 --------
...midori-display.default => surf-display.default} | 25 +++++----------------
debian/surf-display.doc-base | 9 ++++++++
...dori-display.postinst => surf-display.postinst} | 6 ++---
.../{midori-display.prerm => surf-display.prerm} | 4 ++--
debian/watch | 4 ++--
9 files changed, 40 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cf58e63..ba54973 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-midori-display (0.0.2-1) UNRELEASED; urgency=medium
+surf-display (0.0.5-1) UNRELEASED; urgency=medium
* Initial release to Debian. (Closes: #858378).
- -- Mike Gabriel <sunweaver at debian.org> Fri, 21 Mar 2017 18:39:18 +0100
+ -- Mike Gabriel <sunweaver at debian.org> Fri, 24 Mar 2017 18:31:56 +0100
diff --git a/debian/control b/debian/control
index 5e7a377..5517763 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: midori-display
+Source: surf-display
Section: admin
Priority: extra
Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team at lists.alioth.debian.org>
@@ -11,37 +11,39 @@ Build-Depends:
texlive-fonts-recommended,
lmodern,
Standards-Version: 3.9.8
-Homepage: https://code.it-zukunft-schule.de/cgit/midori-display/
-Vcs-Git: https://anonscm.debian.org/git/debian-edu/pkg-team/midori-display.git
-Vcs-Browser: https://anonscm.debian.org/git/debian-edu/pkg-team/midori-display.git
+Homepage: https://code.it-zukunft-schule.de/cgit/surf-display/
+Vcs-Git: https://anonscm.debian.org/git/debian-edu/pkg-team/surf-display.git
+Vcs-Browser: https://anonscm.debian.org/git/debian-edu/pkg-team/surf-display.git
-Package: midori-display
+Package: surf-display
Architecture: all
Depends:
${misc:Depends},
- ${perl:Depends},
- midori,
+ surf (>= 0.7),
psmisc,
+ x11-xkb-utils,
xdotool,
xinit,
xprintidle,
Recommends:
matchbox-window-manager,
pulseaudio,
- texlive-extra-utils,
unclutter,
x11-xserver-utils,
wmctrl,
Suggests:
nodm,
-Description: Display screen / web browser terminal based on Midori browser in kiosk mode
+Description: Kiosk browser session manager based on the surf browser
Provide an X11 session manager script that launches a minimal window
- manager and then opens an entry web page via stripped down Midori web
- browser in kiosk mode. The web page can be consumed "read-only" or
- in interactive mode.
+ manager and then opens an entry web page via the surf web browser in
+ kiosk mode. The web page can be consumed "read-only" or in interactive
+ mode.
.
In combination with the nodm display manager you can provide an
easy-to-setup html'ish display screen or a web terminal.
.
+ If URL/domain filtering is needed, combine surf-display with a local
+ instance of tinyproxy.
+ .
After a configurable idle time, the browser session is fully
reset and started anew.
diff --git a/debian/copyright b/debian/copyright
index 1b3d863..5432ab8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Midori WWW Display
+Upstream-Name: Surf Kiosk Display
Upstream-Contact: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Source: https://code.it-zukunft-schule.de/cgit/midori-display/
+Source: https://code.it-zukunft-schule.de/cgit/surf-display/
Files: bin/*
data/*
diff --git a/debian/midori-display.doc-base b/debian/midori-display.doc-base
deleted file mode 100644
index fee94b0..0000000
--- a/debian/midori-display.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: midori-display
-Title: Midori WWW Display
-Author: Mike Gabriel
-Abstract: HowTo set up Midori WWW Display
-Section: Network/Web Browsing
-
-Format: PDF
-Index: /usr/share/doc/midori-display/midori-display.pdf.gz
-Files: /usr/share/doc/midori-display/midori-display.pdf.gz
diff --git a/debian/midori-display.default b/debian/surf-display.default
similarity index 63%
rename from debian/midori-display.default
rename to debian/surf-display.default
index 8dfa2c6..789e5a6 100644
--- a/debian/midori-display.default
+++ b/debian/surf-display.default
@@ -1,8 +1,8 @@
-# Midori Display: Wrap around midori browser and turn your
+# Surf Kiosk Display: Wrap around surf browser and turn your
# system into a browser screen in KIOSK-mode.
# default download URI for all display screens if not configured individually
-DEFAULT_WWW_URI="file:///usr/share/midori-display/midori-display.html"
+DEFAULT_WWW_URI="file:///usr/share/surf-display/empty-page.html"
# Enforce fixed resolution for all displays (default: not set):
#DEFAULT_RESOLUTION="1920x1080"
@@ -12,15 +12,15 @@ DEFAULT_WWW_URI="file:///usr/share/midori-display/midori-display.html"
#DISPLAYS['display-host-1']="www_uri=https://www.displayserver.comany.net/display-2/index.html"
#DISPLAYS['display-host-2']="www_uri=https://www.displayserver.comany.net/display-3/index.html|res=1920x1280"
#DISPLAYS['display-host-3']="www_uri=https://www.displayserver.comany.net/display-4/index.html"|res=1280x1024"
-#DISPLAYS['display-host-local-file']="www_uri=file:///usr/share/doc/midori-display/midori-display.html"
+#DISPLAYS['display-host-local-file']="www_uri=file:///usr/share/doc/surf-display/empty-page.html"
-#### ^^^ use: FAKE_HOSTNAME="display-host-1" midori-display
+#### ^^^ use: FAKE_HOSTNAME="display-host-1" surf-display
### to play with other hostnames and their PDF URI / resolution settings...
# HTTP proxy URL, if needed (default: not set).
#HTTP_PROXY_URL="http://webcache:3128"
-# Setting for internal inactivity timer to restart midori-display
+# Setting for internal inactivity timer to restart surf-display
# if the user goes inactive/idle.
#INACTIVITY__INTERVAL="300"
@@ -33,20 +33,7 @@ DEFAULT_WWW_URI="file:///usr/share/midori-display/midori-display.html"
# screensaver settings, see "man 1 xset" for possible options
#SCREENSAVER_SETTINGS=""
-# URI blocklist, URLs that Midori should block (default: unset)
-# If URI blocklist is unset, the midori-display script will tell
-# Midori to block access to all other servers except the one in
-# the WWW_URI.
-# (i.e. URI_BLOCKLIST='^((?!'$URI_TYPE'.*'$WWW_SERVER'/).).*$')
-#unset URI_BLOCKLIST
-
-# Other example: block some famous data collection sites
-#URI_BLOCKLIST=".*(facebook|google|apple|microsoft|twitter)[^/]+/.*"
-
-# Or allow access to all sites on the internet
-#URI_BLOCKLIST=""
-
-# disable right and middle pointer device click in Midori sessions while keeping
+# disable right and middle pointer device click in browser sessions while keeping
# scrolling wheels' functionality intact... (consider "pointer" subcommand on
# xmodmap man page for details).
#POINTER_BUTTON_MAP="1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"
diff --git a/debian/surf-display.doc-base b/debian/surf-display.doc-base
new file mode 100644
index 0000000..1c33390
--- /dev/null
+++ b/debian/surf-display.doc-base
@@ -0,0 +1,9 @@
+Document: surf-display
+Title: Surf Kiosk Display
+Author: Mike Gabriel
+Abstract: HowTo set up Surf Kiosk Display
+Section: Network/Web Browsing
+
+Format: PDF
+Index: /usr/share/doc/surf-display/surf-display.pdf.gz
+Files: /usr/share/doc/surf-display/surf-display.pdf.gz
diff --git a/debian/midori-display.postinst b/debian/surf-display.postinst
similarity index 86%
rename from debian/midori-display.postinst
rename to debian/surf-display.postinst
index 24ca5c5..44fef0f 100755
--- a/debian/midori-display.postinst
+++ b/debian/surf-display.postinst
@@ -1,5 +1,5 @@
#!/bin/sh
-# postinst script for midori-display
+# postinst script for surf-display
#
# see: dh_installdeb(1)
@@ -20,9 +20,9 @@ set -e
case "$1" in
configure)
update-alternatives --install /usr/bin/x-session-manager \
- x-session-manager /usr/bin/midori-display 20 \
+ x-session-manager /usr/bin/surf-display 20 \
--slave /usr/share/man/man1/x-session-manager.1.gz \
- x-session-manager.1.gz /usr/share/man/man1/midori-display.1.gz
+ x-session-manager.1.gz /usr/share/man/man1/surf-display.1.gz
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/midori-display.prerm b/debian/surf-display.prerm
similarity index 89%
rename from debian/midori-display.prerm
rename to debian/surf-display.prerm
index d328066..225af45 100755
--- a/debian/midori-display.prerm
+++ b/debian/surf-display.prerm
@@ -1,6 +1,6 @@
#! /bin/sh
-# prerm script for midori-display
+# prerm script for surf-display
#
# see: dh_installdeb(1)
@@ -19,7 +19,7 @@ set -e
if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
- update-alternatives --remove x-session-manager /usr/bin/midori-display
+ update-alternatives --remove x-session-manager /usr/bin/surf-display
fi
diff --git a/debian/watch b/debian/watch
index 183c92c..42a947d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-http://code.it-zukunft-schule.de/cgit/midori-display/ \
- snapshot/midori-display-(\d\.\d\.\d)\.tar\.gz
+http://code.it-zukunft-schule.de/cgit/surf-display/ \
+ snapshot/surf-display-(\d\.\d\.\d)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/surf-display.git
More information about the debian-edu-commits
mailing list