diff -Nru panto-defaults-2.1/debian/changelog panto-defaults-3.5/debian/changelog --- panto-defaults-2.1/debian/changelog 2016-03-24 18:08:58.000000000 +0000 +++ panto-defaults-3.5/debian/changelog 2016-05-08 18:28:06.000000000 +0000 @@ -1,4 +1,4 @@ -panto-defaults (2.1) trusty; urgency=medium +panto-defaults (3.5) trusty; urgency=medium * Fix installation path of /etc/xdg/xfce/terminal/terminalrc into /etc/xdg/xfce4/terminal/terminalrc. diff -Nru panto-defaults-2.1/debian/kali-defaults/etc/X11/Xsession.d/52panto_fix_lang panto-defaults-3.5/debian/kali-defaults/etc/X11/Xsession.d/52panto_fix_lang --- panto-defaults-2.1/debian/kali-defaults/etc/X11/Xsession.d/52panto_fix_lang 2016-03-24 16:47:57.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults/etc/X11/Xsession.d/52panto_fix_lang 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# Basically gdm will incorrectly set LANG=C and gnome-terminal doesn't -# like a non-UTF8 locale. - -if [ "$LANG" = "C" ]; then - if [ -e /etc/default/locale ]; then - . /etc/default/locale - else - LANG="C.UTF-8" - fi -fi diff -Nru panto-defaults-2.1/debian/kali-defaults/etc/X11/Xsession.d/52panto_noautomount panto-defaults-3.5/debian/kali-defaults/etc/X11/Xsession.d/52panto_noautomount --- panto-defaults-2.1/debian/kali-defaults/etc/X11/Xsession.d/52panto_noautomount 2016-03-24 18:09:40.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults/etc/X11/Xsession.d/52panto_noautomount 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -# This file implements the "noautomount" boot option used by Panto's -# forensic mode to avoid auto-mounting disks which are detected -# dynamically by udisks - -# The downside of this approach is that the setting is overwritten every -# time that you login in the graphical interface. If you're fed up by this -# and want to keep automount always disabled, just edit this file and -# comment everything. - -if [ -r /proc/cmdline ] && [ -x "$(which gsettings)" ]; then - if grep -q -E "\bnoautomount\b" /proc/cmdline 2>/dev/null; then - gsettings set org.gnome.desktop.media-handling automount false - else - gsettings set org.gnome.desktop.media-handling automount true - fi -fi diff -Nru panto-defaults-2.1/debian/kali-defaults/etc/xdg/xfce4/terminal/terminalrc panto-defaults-3.5/debian/kali-defaults/etc/xdg/xfce4/terminal/terminalrc --- panto-defaults-2.1/debian/kali-defaults/etc/xdg/xfce4/terminal/terminalrc 2016-03-24 16:45:42.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults/etc/xdg/xfce4/terminal/terminalrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -[Configuration] -ColorForeground=#ffffffffffff -ColorBackground=#000000000000 -ColorCursor=#ffff09100bf0 -FontName=DejaVu Sans Mono 7.5 -MiscAlwaysShowTabs=FALSE -MiscBell=FALSE -MiscBordersDefault=TRUE -MiscCursorBlinks=FALSE -MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK -MiscDefaultGeometry=80x24 -MiscInheritGeometry=FALSE -MiscMenubarDefault=TRUE -MiscMouseAutohide=FALSE -MiscToolbarDefault=FALSE -MiscConfirmClose=TRUE -MiscCycleTabs=TRUE -MiscTabCloseButtons=TRUE -MiscTabCloseMiddleClick=TRUE -MiscTabPosition=GTK_POS_TOP -MiscHighlightUrls=TRUE -MiscScrollAlternateScreen=TRUE -ScrollingLines=1172 -TabActivityColor=#dc322f -ColorBold=#93a1a1 -BackgroundMode=TERMINAL_BACKGROUND_IMAGE -BackgroundImageFile=/etc/lightdm/lightdmwall.png -BackgroundDarkness=0,170000 -ColorPalette=#070736364242;#0000cfbeffff;#858599990000;#ffffc1c40000;#26268b8bd2d2;#d3d336368282;#2a2aa1a19898;#45b2b506ffff;#00002b2b3636;#cbcb4b4b1616;#4633abbdc348;#0000bbbbffff;#ffff35d73a9b;#6c6c7171c4c4;#9393a1a1a1a1;#ffffffffffff -ScrollingSingleLine=FALSE -ScrollingOnOutput=FALSE -ColorBoldUseDefault=FALSE -ColorBackgroundVary=TRUE -BackgroundImageStyle=TERMINAL_BACKGROUND_STYLE_STRETCHED \ No newline at end of file diff -Nru panto-defaults-2.1/debian/kali-defaults/usr/share/panto-defaults/.bashrc panto-defaults-3.5/debian/kali-defaults/usr/share/panto-defaults/.bashrc --- panto-defaults-2.1/debian/kali-defaults/usr/share/panto-defaults/.bashrc 2016-03-24 16:47:30.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults/usr/share/panto-defaults/.bashrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines in the history. See bash(1) for more options -# ... or force ignoredups and ignorespace -HISTCONTROL=ignoredups:ignorespace - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1="\[\033[0;37m\]\342\224\214\342\224\200\$([[ \$? != 0 ]] && echo \"[\[\033[0;31m\]\342\234\227\[\033[0;37m\]]\342\224\200\")[$(if [[ ${EUID} == 0 ]]; then echo '\[\033[0;31m\]\h'; else echo '\[\033[0;33m\]\u\[\033[0;37m\]@\[\033[0;96m\]\h'; fi)\[\033[0;37m\]]\342\224\200[\[\033[0;32m\]\w\[\033[0;37m\]]\n\[\033[0;37m\]\342\224\224\342\224\200\342\224\200> \[\033[0m\]" -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - -# some more ls aliases -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then -# . /etc/bash_completion -#fi diff -Nru panto-defaults-2.1/debian/kali-defaults/usr/share/panto-defaults/xsettings.xml panto-defaults-3.5/debian/kali-defaults/usr/share/panto-defaults/xsettings.xml --- panto-defaults-2.1/debian/kali-defaults/usr/share/panto-defaults/xsettings.xml 2016-03-24 16:46:20.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults/usr/share/panto-defaults/xsettings.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru panto-defaults-2.1/debian/kali-defaults.dirs panto-defaults-3.5/debian/kali-defaults.dirs --- panto-defaults-2.1/debian/kali-defaults.dirs 2015-07-29 13:48:58.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -etc/iceweasel/pref -etc/iceweasel/profile -lib/systemd/system/postgresql@.service.d diff -Nru panto-defaults-2.1/debian/kali-defaults.install panto-defaults-3.5/debian/kali-defaults.install --- panto-defaults-2.1/debian/kali-defaults.install 2016-03-24 17:09:25.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -52panto_noautomount etc/X11/Xsession.d/ -52panto_fix_lang etc/X11/Xsession.d/ -.bashrc usr/share/panto-defaults/ -xfce/xsettings.xml usr/share/panto-defaults/ -xfce/terminalrc etc/xdg/xfce4/terminal/ -dconf/user etc/dconf/profile/ -dconf/panto-tweaks etc/dconf/db/local.d/ -postgresql/panto_postgresql.conf lib/systemd/system/postgresql@.service.d/ -postgresql/postgresql_reduce_shared_buffers usr/share/panto-defaults/ diff -Nru panto-defaults-2.1/debian/kali-defaults.postinst panto-defaults-3.5/debian/kali-defaults.postinst --- panto-defaults-2.1/debian/kali-defaults.postinst 2016-03-24 17:14:30.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ]; then - if dpkg --compare-versions "$2" lt-nl 2.0~14; then - dpkg-divert --rename --package panto-defaults \ - --divert /usr/share/xsessions/default.desktop \ - --remove /usr/share/xsessions/gnome-fallback.desktop - fi - - for file in /etc/skel/.bashrc /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml - do - orig_file="/usr/share/panto-defaults/$(basename $file)" - if [ ! -e $file ] && [ -e $orig_file ]; then - echo "Installing $orig_file as $file" - mkdir -p $(dirname $file) - cp $orig_file $file - fi - done - dconf update || true -fi - -#DEBHELPER# - diff -Nru panto-defaults-2.1/debian/kali-defaults.postrm panto-defaults-3.5/debian/kali-defaults.postrm --- panto-defaults-2.1/debian/kali-defaults.postrm 2016-03-24 17:13:44.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -#!/bin/sh -# postrm script for panto-defaults -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -drop_diversion() { - dpkg-divert --rename --package panto-defaults \ - --divert $2 \ - --remove $1 -} - -case "$1" in - remove) - for file in /etc/skel/.bashrc \ - /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml - do - rm -f $file - drop_diversion $file $file.original - done - ;; - - purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru panto-defaults-2.1/debian/kali-defaults.preinst panto-defaults-3.5/debian/kali-defaults.preinst --- panto-defaults-2.1/debian/kali-defaults.preinst 2016-03-24 17:12:56.000000000 +0000 +++ panto-defaults-3.5/debian/kali-defaults.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#!/bin/sh -# preinst script for panto-defaults -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -setup_diversion() { - # $1: is file to divert, $2 is path to divert to - dpkg-divert --rename --package panto-defaults \ - --divert $2 \ - --add $1 -} -setup_diversions() { - for file in "$@" - do - setup_diversion $file $file.original - done -} - -TO_DIVERT=" -/etc/skel/.bashrc -/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml -" - -case "$1" in - install) - setup_diversions $TO_DIVERT - ;; - - upgrade) - if dpkg --compare-versions "$2" lt 0.8; then - setup_diversions /etc/skel/.bashrc - fi - if dpkg --compare-versions "$2" lt 2.0~14; then - setup_diversions /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml - fi - ;; - - upgrade|abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - diff -Nru panto-defaults-2.1/debian/panto-defaults.dirs panto-defaults-3.5/debian/panto-defaults.dirs --- panto-defaults-2.1/debian/panto-defaults.dirs 1970-01-01 00:00:00.000000000 +0000 +++ panto-defaults-3.5/debian/panto-defaults.dirs 2015-07-29 13:48:58.000000000 +0000 @@ -0,0 +1,3 @@ +etc/iceweasel/pref +etc/iceweasel/profile +lib/systemd/system/postgresql@.service.d diff -Nru panto-defaults-2.1/debian/panto-defaults.install panto-defaults-3.5/debian/panto-defaults.install --- panto-defaults-2.1/debian/panto-defaults.install 1970-01-01 00:00:00.000000000 +0000 +++ panto-defaults-3.5/debian/panto-defaults.install 2016-05-06 13:25:31.000000000 +0000 @@ -0,0 +1,7 @@ +52panto_noautomount etc/X11/Xsession.d/ +52panto_fix_lang etc/X11/Xsession.d/ +.bashrc usr/share/panto-defaults/ +xfce/xsettings.xml usr/share/panto-defaults/ +xfce/terminalrc etc/xdg/xfce4/terminal/ +postgresql/panto_postgresql.conf lib/systemd/system/postgresql@.service.d/ +postgresql/postgresql_reduce_shared_buffers usr/share/panto-defaults/ diff -Nru panto-defaults-2.1/debian/panto-defaults.postinst panto-defaults-3.5/debian/panto-defaults.postinst --- panto-defaults-2.1/debian/panto-defaults.postinst 1970-01-01 00:00:00.000000000 +0000 +++ panto-defaults-3.5/debian/panto-defaults.postinst 2016-03-24 17:14:30.000000000 +0000 @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + if dpkg --compare-versions "$2" lt-nl 2.0~14; then + dpkg-divert --rename --package panto-defaults \ + --divert /usr/share/xsessions/default.desktop \ + --remove /usr/share/xsessions/gnome-fallback.desktop + fi + + for file in /etc/skel/.bashrc /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml + do + orig_file="/usr/share/panto-defaults/$(basename $file)" + if [ ! -e $file ] && [ -e $orig_file ]; then + echo "Installing $orig_file as $file" + mkdir -p $(dirname $file) + cp $orig_file $file + fi + done + dconf update || true +fi + +#DEBHELPER# + diff -Nru panto-defaults-2.1/debian/panto-defaults.postrm panto-defaults-3.5/debian/panto-defaults.postrm --- panto-defaults-2.1/debian/panto-defaults.postrm 1970-01-01 00:00:00.000000000 +0000 +++ panto-defaults-3.5/debian/panto-defaults.postrm 2016-03-24 17:13:44.000000000 +0000 @@ -0,0 +1,52 @@ +#!/bin/sh +# postrm script for panto-defaults +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +drop_diversion() { + dpkg-divert --rename --package panto-defaults \ + --divert $2 \ + --remove $1 +} + +case "$1" in + remove) + for file in /etc/skel/.bashrc \ + /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml + do + rm -f $file + drop_diversion $file $file.original + done + ;; + + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru panto-defaults-2.1/debian/panto-defaults.preinst panto-defaults-3.5/debian/panto-defaults.preinst --- panto-defaults-2.1/debian/panto-defaults.preinst 1970-01-01 00:00:00.000000000 +0000 +++ panto-defaults-3.5/debian/panto-defaults.preinst 2016-03-24 17:12:56.000000000 +0000 @@ -0,0 +1,63 @@ +#!/bin/sh +# preinst script for panto-defaults +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +setup_diversion() { + # $1: is file to divert, $2 is path to divert to + dpkg-divert --rename --package panto-defaults \ + --divert $2 \ + --add $1 +} +setup_diversions() { + for file in "$@" + do + setup_diversion $file $file.original + done +} + +TO_DIVERT=" +/etc/skel/.bashrc +/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +" + +case "$1" in + install) + setup_diversions $TO_DIVERT + ;; + + upgrade) + if dpkg --compare-versions "$2" lt 0.8; then + setup_diversions /etc/skel/.bashrc + fi + if dpkg --compare-versions "$2" lt 2.0~14; then + setup_diversions /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml + fi + ;; + + upgrade|abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + diff -Nru panto-defaults-2.1/xfce/terminalrc panto-defaults-3.5/xfce/terminalrc --- panto-defaults-2.1/xfce/terminalrc 2016-03-24 16:45:42.000000000 +0000 +++ panto-defaults-3.5/xfce/terminalrc 2016-05-07 20:38:02.000000000 +0000 @@ -24,11 +24,12 @@ TabActivityColor=#dc322f ColorBold=#93a1a1 BackgroundMode=TERMINAL_BACKGROUND_IMAGE -BackgroundImageFile=/etc/lightdm/lightdmwall.png +BackgroundImageFile=/root/terminal.png BackgroundDarkness=0,170000 ColorPalette=#070736364242;#0000cfbeffff;#858599990000;#ffffc1c40000;#26268b8bd2d2;#d3d336368282;#2a2aa1a19898;#45b2b506ffff;#00002b2b3636;#cbcb4b4b1616;#4633abbdc348;#0000bbbbffff;#ffff35d73a9b;#6c6c7171c4c4;#9393a1a1a1a1;#ffffffffffff ScrollingSingleLine=FALSE ScrollingOnOutput=FALSE ColorBoldUseDefault=FALSE ColorBackgroundVary=TRUE -BackgroundImageStyle=TERMINAL_BACKGROUND_STYLE_STRETCHED \ No newline at end of file +BackgroundImageStyle=TERMINAL_BACKGROUND_STYLE_STRETCHED + diff -Nru panto-defaults-2.1/xfce/xsettings.xml panto-defaults-3.5/xfce/xsettings.xml --- panto-defaults-2.1/xfce/xsettings.xml 2016-03-24 16:46:20.000000000 +0000 +++ panto-defaults-3.5/xfce/xsettings.xml 2016-05-08 09:26:57.000000000 +0000 @@ -3,7 +3,7 @@ - +