]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Fri, 26 Jun 2015 22:17:48 +0000 (00:17 +0200)
committerFrank Brehm <frank@brehm-online.com>
Fri, 26 Jun 2015 22:17:48 +0000 (00:17 +0200)
19 files changed:
apt/apt.conf.d/01autoremove [deleted file]
apt/preferences.d/.keep_sys-apps_apt-0 [deleted file]
apt/sources.list [deleted file]
apt/sources.list.d/.keep_sys-apps_apt-0 [deleted file]
apt/trusted.gpg.d/.keep_sys-apps_apt-0 [deleted file]
bash/bashrc.d/bash_completion.sh
config-archive/etc/default/grub
config-archive/etc/default/grub.1 [new file with mode: 0644]
config-archive/etc/default/grub.dist
cron.daily/apt [deleted file]
cups/printers.conf
cups/subscriptions.conf
default/grub
gconf/gconf.xml.defaults/%gconf-tree.xml
init.d/lxc
logrotate.d/apt [deleted file]
lxdvdrip.conf
portage/package.keywords
resolv.conf

diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove
deleted file mode 100644 (file)
index c7ad51e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-APT
-{
-  NeverAutoRemove
-  {
-       "^firmware-linux.*";
-       "^linux-firmware$";
-       "^linux-image.*";
-       "^kfreebsd-image.*";
-       "^linux-restricted-modules.*";
-       "^linux-ubuntu-modules-.*";
-       "^gnumach$";
-       "^gnumach-image.*";
-  };
-
-  Never-MarkAuto-Sections
-  {
-       "metapackages";
-       "restricted/metapackages";
-       "universe/metapackages";
-       "multiverse/metapackages";
-       "oldlibs";
-       "restricted/oldlibs";
-       "universe/oldlibs";
-       "multiverse/oldlibs";
-  };
-};
diff --git a/apt/preferences.d/.keep_sys-apps_apt-0 b/apt/preferences.d/.keep_sys-apps_apt-0
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/apt/sources.list b/apt/sources.list
deleted file mode 100644 (file)
index cdb4524..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# See sources.list(5) manpage for more information
-# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
-deb http://ftp.us.debian.org/debian wheezy main contrib non-free
-deb http://security.debian.org wheezy/updates main contrib non-free
-
-# Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.us.debian.org/debian wheezy main contrib non-free
-#deb-src http://security.debian.org wheezy/updates main contrib non-free
diff --git a/apt/sources.list.d/.keep_sys-apps_apt-0 b/apt/sources.list.d/.keep_sys-apps_apt-0
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/apt/trusted.gpg.d/.keep_sys-apps_apt-0 b/apt/trusted.gpg.d/.keep_sys-apps_apt-0
deleted file mode 100644 (file)
index e69de29..0000000
index bb0fdb61a86c778800e0371da096ea99f3c4f65f..ae6756f99e6c30f55338bd3b9bc4815328032efb 100644 (file)
@@ -8,6 +8,7 @@ if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
             . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
         if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
             # Source completion code.
+            BASH_COMPLETION_COMPAT_DIR=/usr/share/bash-completion/completions
             . /usr/share/bash-completion/bash_completion
         fi
     fi
index 321487b36a4a0d28a4ba9035aef1dc803663567b..c4b113763a398a8707407973b5c34e32b2c2be1e 100644 (file)
@@ -1,23 +1,34 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $
 #
 # To populate all changes in this file you need to regenerate your
 # grub configuration file afterwards:
 #     'grub2-mkconfig -o /boot/grub/grub.cfg'
 #
 # See the grub info page for documentation on possible variables and
-# their associated values. 
+# their associated values.
 
 GRUB_DISTRIBUTOR="Bruni (Gentoo)"
 
+# Default menu entry
 GRUB_DEFAULT=0
-GRUB_HIDDEN_TIMEOUT=5
-GRUB_HIDDEN_TIMEOUT_QUIET=true
+
+# Boot the default entry this many seconds after the menu is displayed
+#GRUB_TIMEOUT=5
 GRUB_TIMEOUT=10
+#GRUB_TIMEOUT_STYLE=menu
 
 # Append parameters to the linux kernel command line
-# GRUB_CMDLINE_LINUX=""
+#GRUB_CMDLINE_LINUX=""
+#
+# Examples:
+#
+# Boot with network interface renaming disabled
+# GRUB_CMDLINE_LINUX="net.ifnames=0"
+#
+# Boot with systemd instead of sysvinit (openrc)
+# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
 
 # Append parameters to the linux kernel command line for non-recovery entries
 #GRUB_CMDLINE_LINUX_DEFAULT=""
@@ -31,6 +42,13 @@ GRUB_TIMEOUT=10
 #GRUB_GFXMODE=640x480
 GRUB_GFXMODE=800x600
 
+# Set to 'text' to force the Linux kernel to boot in normal text
+# mode, 'keep' to preserve the graphics mode set using
+# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
+# graphics mode, or a sequence of these separated by commas or
+# semicolons to try several modes in sequence.
+#GRUB_GFXPAYLOAD_LINUX=
+
 # Path to theme spec txt file.
 # The starfield is by default provided with use truetype.
 # NOTE: when enabling custom theme, ensure you have required font/etc.
diff --git a/config-archive/etc/default/grub.1 b/config-archive/etc/default/grub.1
new file mode 100644 (file)
index 0000000..321487b
--- /dev/null
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+#     'grub2-mkconfig -o /boot/grub/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values. 
+
+GRUB_DISTRIBUTOR="Bruni (Gentoo)"
+
+GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=5
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=10
+
+# Append parameters to the linux kernel command line
+# GRUB_CMDLINE_LINUX=""
+
+# Append parameters to the linux kernel command line for non-recovery entries
+#GRUB_CMDLINE_LINUX_DEFAULT=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+#GRUB_GFXMODE=640x480
+GRUB_GFXMODE=800x600
+
+# Path to theme spec txt file.
+# The starfield is by default provided with use truetype.
+# NOTE: when enabling custom theme, ensure you have required font/etc.
+#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+#GRUB_BACKGROUND="/boot/grub/mybackground.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
index f3f7e4764c95f4920de18221dab010a71868ee7a..8ff053fa7b35fdc2639ee538b2dd71aae3373a11 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $
 #
 # To populate all changes in this file you need to regenerate your
 # grub configuration file afterwards:
@@ -61,3 +61,14 @@ GRUB_DISTRIBUTOR="Gentoo"
 
 # Uncomment to disable generation of recovery mode menu entries
 #GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"
diff --git a/cron.daily/apt b/cron.daily/apt
deleted file mode 100644 (file)
index 5c00f22..0000000
+++ /dev/null
@@ -1,507 +0,0 @@
-#!/bin/sh
-#set -e
-#
-# This file understands the following apt configuration variables:
-# Values here are the default.
-# Create /etc/apt/apt.conf.d/02periodic file to set your preference.
-#
-#  Dir "/";
-#  - RootDir for all configuration files
-#
-#  Dir::Cache "var/cache/apt/";
-#  - Set apt package cache directory
-#
-#  Dir::Cache::Archives "archives/";
-#  - Set package archive directory
-#
-#  APT::Periodic::Enable "1";
-#  - Enable the update/upgrade script (0=disable)
-#
-#  APT::Periodic::BackupArchiveInterval "0";
-#  - Backup after n-days if archive contents changed.(0=disable)
-#
-#  APT::Periodic::BackupLevel "3";
-#  - Backup level.(0=disable), 1 is invalid.
-#
-#  Dir::Cache::Backup "backup/";
-#  - Set periodic package backup directory
-#
-#  APT::Archives::MaxAge "0"; (old, deprecated)
-#  APT::Periodic::MaxAge "0"; (new)
-#  - Set maximum allowed age of a cache package file. If a cache 
-#    package file is older it is deleted (0=disable)
-#
-#  APT::Archives::MinAge "2"; (old, deprecated)
-#  APT::Periodic::MinAge "2"; (new)
-#  - Set minimum age of a package file. If a file is younger it
-#    will not be deleted (0=disable). Usefull to prevent races 
-#    and to keep backups of the packages for emergency.
-#
-#  APT::Archives::MaxSize "0"; (old, deprecated)
-#  APT::Periodic::MaxSize "0"; (new)
-#  - Set maximum size of the cache in MB (0=disable). If the cache
-#    is bigger, cached package files are deleted until the size
-#    requirement is met (the biggest packages will be deleted 
-#    first).
-#
-#  APT::Periodic::Update-Package-Lists "0";
-#  - Do "apt-get update" automatically every n-days (0=disable)
-#    
-#  APT::Periodic::Download-Upgradeable-Packages "0";
-#  - Do "apt-get upgrade --download-only" every n-days (0=disable)
-#
-#  APT::Periodic::Download-Upgradeable-Packages-Debdelta "1";
-#  - Use debdelta-upgrade to download updates if available (0=disable)
-#
-#  APT::Periodic::Unattended-Upgrade "0";
-#  - Run the "unattended-upgrade" security upgrade script 
-#    every n-days (0=disabled)
-#    Requires the package "unattended-upgrades" and will write
-#    a log in /var/log/unattended-upgrades
-# 
-#  APT::Periodic::AutocleanInterval "0";
-#  - Do "apt-get autoclean" every n-days (0=disable)
-#
-#  APT::Periodic::Verbose "0";
-#  - Send report mail to root
-#      0:  no report             (or null string)
-#      1:  progress report       (actually any string)
-#      2:  + command outputs     (remove -qq, remove 2>/dev/null, add -d)
-#      3:  + trace on            
-
-check_stamp()
-{
-    stamp="$1"
-    interval="$2"
-
-    if [ $interval -eq 0 ]; then
-       debug_echo "check_stamp: interval=0"
-       # treat as no time has passed
-        return 1
-    fi
-
-    if [ ! -f $stamp ]; then
-       debug_echo "check_stamp: missing time stamp file: $stamp."
-       # treat as enough time has passed
-        return 0
-    fi
-
-    # compare midnight today to midnight the day the stamp was updated
-    stamp_file="$stamp"
-    stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null)
-    if [ "$?" != "0" ]; then
-        # Due to some timezones returning 'invalid date' for midnight on
-        # certain dates (eg America/Sao_Paulo), if date returns with error
-        # remove the stamp file and return 0. See coreutils bug:
-        # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html
-        rm -f "$stamp_file"
-        return 0
-    fi
-
-    now=$(date --date=$(date --iso-8601) +%s 2>/dev/null)
-    if [ "$?" != "0" ]; then
-        # As above, due to some timezones returning 'invalid date' for midnight
-        # on certain dates (eg America/Sao_Paulo), if date returns with error
-        # return 0.
-        return 0
-    fi
-
-    delta=$(($now-$stamp))
-
-    # intervall is in days, convert to sec.
-    interval=$(($interval*60*60*24))
-    debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)"
-
-    # remove timestamps a day (or more) in the future and force re-check
-    if [ $stamp -gt $(($now+86400)) ]; then
-         echo "WARNING: file $stamp_file has a timestamp in the future: $stamp"
-         rm -f "$stamp_file"
-         return 0
-    fi
-
-    if [ $delta -ge $interval ]; then
-        return 0
-    fi
-
-    return 1
-}
-
-update_stamp()
-{
-    stamp="$1"
-    touch $stamp
-}
-
-# we check here if autoclean was enough sizewise
-check_size_constraints()
-{
-    MaxAge=0
-    eval $(apt-config shell MaxAge APT::Archives::MaxAge)
-    eval $(apt-config shell MaxAge APT::Periodic::MaxAge)
-
-    MinAge=2
-    eval $(apt-config shell MinAge APT::Archives::MinAge)
-    eval $(apt-config shell MinAge APT::Periodic::MinAge)
-
-    MaxSize=0
-    eval $(apt-config shell MaxSize APT::Archives::MaxSize)
-    eval $(apt-config shell MaxSize APT::Periodic::MaxSize)
-
-    Cache="/var/cache/apt/archives/"
-    eval $(apt-config shell Cache Dir::Cache::archives/d)
-
-    # sanity check
-    if [ -z "$Cache" ]; then
-       echo "empty Dir::Cache::archives, exiting"
-       exit
-    fi
-
-    # check age
-    if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then
-       debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge and ctime>$MinAge and mtime>$MinAge"
-       find $Cache -name "*.deb"  \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f
-    elif [ ! $MaxAge -eq 0 ]; then
-       debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge only"
-       find $Cache -name "*.deb"  -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f
-    else
-       debug_echo "skip aging since MaxAge is 0"
-    fi
-    
-    # check size
-    if [ ! $MaxSize -eq 0 ]; then
-       # maxSize is in MB
-       MaxSize=$(($MaxSize*1024))
-
-       #get current time
-       now=$(date --date=$(date --iso-8601) +%s)
-       MinAge=$(($MinAge*24*60*60))
-
-       # reverse-sort by mtime
-       for file in $(ls -rt $Cache/*.deb 2>/dev/null); do 
-           du=$(du -s $Cache)
-           size=${du%%/*}
-           # check if the cache is small enough
-           if [ $size -lt $MaxSize ]; then
-               debug_echo "end remove by archive size:  size=$size < $MaxSize"
-               break
-           fi
-
-           # check for MinAge of the file
-           if [ $MinAge -ne 0 ]; then 
-               # check both ctime and mtime 
-               mtime=$(stat -c %Y $file)
-               ctime=$(stat -c %Z $file)
-               if [ $mtime -gt $ctime ]; then
-                   delta=$(($now-$mtime))
-               else
-                   delta=$(($now-$ctime))
-               fi
-               if [ $delta -le $MinAge ]; then
-                   debug_echo "skip remove by archive size:  $file, delta=$delta < $MinAgeSec"
-                   break
-               else
-                   # delete oldest file
-                   debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize"
-                   rm -f $file
-               fi
-           fi
-       done
-    fi
-}
-
-# deal with the Apt::Periodic::BackupArchiveInterval
-do_cache_backup()
-{
-    BackupArchiveInterval="$1"
-    if [ $BackupArchiveInterval -eq 0 ]; then
-       return
-    fi
-
-    # Set default values and normalize
-    CacheDir="/var/cache/apt"
-    eval $(apt-config shell CacheDir Dir::Cache/d)
-    CacheDir=${CacheDir%/}
-    if [ -z "$CacheDir" ]; then
-       debug_echo "practically empty Dir::Cache, exiting"
-       return 0
-    fi
-
-    Cache="${CacheDir}/archives/"
-    eval $(apt-config shell Cache Dir::Cache::Archives/d)
-    if [ -z "$Cache" ]; then
-       debug_echo "practically empty Dir::Cache::archives, exiting"
-       return 0
-    fi
-
-    BackupLevel=3
-    eval $(apt-config shell BackupLevel APT::Periodic::BackupLevel)
-    if [ $BackupLevel -le 1 ]; then 
-       BackupLevel=2 ; 
-    fi
-    
-    Back="${CacheDir}/backup/"
-    eval $(apt-config shell Back Dir::Cache::Backup/d)
-    if [ -z "$Back" ]; then
-       echo "practically empty Dir::Cache::Backup, exiting" 1>&2
-       return
-    fi
-
-    CacheArchive="$(basename "${Cache}")"
-    test -n "${CacheArchive}" || CacheArchive="archives"
-    BackX="${Back}${CacheArchive}/"
-    for x in $(seq 0 1 $((${BackupLevel}-1))); do 
-       eval "Back${x}=${Back}${x}/"
-    done
-    
-    # backup after n-days if archive contents changed.
-    # (This uses hardlink to save disk space)
-    BACKUP_ARCHIVE_STAMP=/var/lib/apt/periodic/backup-archive-stamp
-    if check_stamp $BACKUP_ARCHIVE_STAMP $BackupArchiveInterval; then
-       if [ $({(cd $Cache 2>/dev/null; find . -name "*.deb"); (cd $Back0 2>/dev/null;find . -name "*.deb") ;}| sort|uniq -u|wc -l) -ne 0 ]; then
-           mkdir -p $Back
-           rm -rf $Back$((${BackupLevel}-1))
-           for y in $(seq $((${BackupLevel}-1)) -1 1); do 
-               eval BackY=${Back}$y
-               eval BackZ=${Back}$(($y-1))
-               if [ -e $BackZ ]; then 
-                   mv -f $BackZ $BackY ; 
-               fi
-           done
-           cp -la $Cache $Back ; mv -f $BackX $Back0
-           update_stamp $BACKUP_ARCHIVE_STAMP
-           debug_echo "backup with hardlinks. (success)"
-       else
-           debug_echo "skip backup since same content."
-       fi
-    else
-       debug_echo "skip backup since too new."
-    fi
-}
-
-# sleep for a random interval of time (default 30min)
-# (some code taken from cron-apt, thanks)
-random_sleep()
-{
-    RandomSleep=1800
-    eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep)
-    if [ $RandomSleep -eq 0 ]; then
-       return
-    fi
-    if [ -z "$RANDOM" ] ; then
-        # A fix for shells that do not have this bash feature.
-       RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5")
-    fi
-    TIME=$(($RANDOM % $RandomSleep))
-    debug_echo "sleeping for $TIME seconds"
-    sleep $TIME
-}
-
-
-debug_echo()
-{
-    # Display message if $VERBOSE >= 1
-    if [ "$VERBOSE" -ge 1 ]; then
-       echo $1 1>&2
-    fi
-}
-
-check_power(){
-    # laptop check, on_ac_power returns:
-    #       0 (true)    System is on main power
-    #       1 (false)   System is not on main power
-    #       255 (false) Power status could not be determined
-    # Desktop systems always return 255 it seems
-    if which on_ac_power >/dev/null; then
-        on_ac_power
-        POWER=$?
-        if [ $POWER -eq 1 ]; then
-           debug_echo "exit: system NOT on main power"
-           return 1
-        elif [ $POWER -ne 0 ]; then
-           debug_echo "power status ($POWER) undetermined, continuing"
-        fi
-        debug_echo "system is on main power."
-    fi
-    return 0
-}
-
-# ------------------------ main ----------------------------
-
-if test -r /var/lib/apt/extended_states; then
-    # Backup the 7 last versions of APT's extended_states file
-    # shameless copy from dpkg cron
-    if cd /var/backups ; then
-       if ! cmp -s apt.extended_states.0 /var/lib/apt/extended_states; then
-           cp -p /var/lib/apt/extended_states apt.extended_states
-           savelog -c 7 apt.extended_states >/dev/null
-       fi
-    fi
-fi
-
-# check apt-config exstance
-if ! which apt-config >/dev/null ; then
-       exit 0
-fi
-
-# check if the user really wants to do something
-AutoAptEnable=1  # default is yes
-eval $(apt-config shell AutoAptEnable APT::Periodic::Enable)
-
-if [ $AutoAptEnable -eq 0 ]; then
-    exit 0
-fi
-
-# Set VERBOSE mode from  apt-config (or inherit from environment)
-VERBOSE=0
-eval $(apt-config shell VERBOSE APT::Periodic::Verbose)
-debug_echo "verbose level $VERBOSE"
-if [ "$VERBOSE" -le 2 ]; then
-    # quiet for 0,1,2
-    XSTDOUT=">/dev/null"
-    XSTDERR="2>/dev/null"
-    XAPTOPT="-qq"
-    XUUPOPT=""
-else
-    XSTDOUT=""
-    XSTDERR=""
-    XAPTOPT=""
-    XUUPOPT="-d"
-fi
-if [ "$VERBOSE" -ge 3 ]; then
-    # trace output
-    set -x
-fi
-
-check_power || exit 0
-
-# check if we can lock the cache and if the cache is clean
-if which apt-get >/dev/null && ! eval apt-get check -f $XAPTOPT $XSTDERR ; then
-    debug_echo "error encountered in cron job with \"apt-get check\"."
-    exit 0
-fi
-
-# Global current time in seconds since 1970-01-01 00:00:00 UTC
-now=$(date +%s)
-
-# Support old Archive for compatibility.
-# Document only Periodic for all controling parameters of this script.
-
-UpdateInterval=0
-eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists)
-
-DownloadUpgradeableInterval=0
-eval $(apt-config shell DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages)
-
-UnattendedUpgradeInterval=0
-eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
-
-AutocleanInterval=0
-eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval)
-
-BackupArchiveInterval=0
-eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval)
-
-Debdelta=1
-eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta)
-
-# check if we actually have to do anything that requires locking the cache
-if [ $UpdateInterval -eq 0 ] &&
-   [ $DownloadUpgradeableInterval -eq 0 ] &&
-   [ $UnattendedUpgradeInterval -eq 0 ] &&
-   [ $BackupArchiveInterval -eq 0 ] &&
-   [ $AutocleanInterval -eq 0 ]; then
-
-    # check cache size
-    check_size_constraints
-
-    exit 0
-fi
-
-# deal with BackupArchiveInterval
-do_cache_backup $BackupArchiveInterval
-
-# sleep random amount of time to avoid hitting the 
-# mirrors at the same time
-random_sleep
-check_power || exit 0
-
-# include default system language so that "apt-get update" will
-# fetch the right translated package descriptions
-if [ -r /etc/default/locale ]; then
-    . /etc/default/locale
-    export LANG LANGUAGE LC_MESSAGES LC_ALL
-fi
-
-# update package lists
-UPDATED=0
-UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
-if check_stamp $UPDATE_STAMP $UpdateInterval; then
-    if eval apt-get $XAPTOPT -y update $XSTDERR; then
-       debug_echo "download updated metadata (success)."
-       if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then
-           if dbus-send --system / app.apt.dbus.updated boolean:true ; then
-               debug_echo "send dbus signal (success)"
-           else
-               debug_echo "send dbus signal (error)"
-           fi
-       else
-           debug_echo "dbus signal not send (command not available)"
-       fi
-       update_stamp $UPDATE_STAMP
-       UPDATED=1
-    else
-       debug_echo "download updated metadata (error)"
-    fi
-else
-    debug_echo "download updated metadata (not run)."
-fi
-       
-# download all upgradeable packages (if it is requested)
-DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp
-if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
-    if [ $Debdelta -eq 1 ]; then
-        debdelta-upgrade >/dev/null 2>&1 || true
-    fi
-    if  eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then
-       update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
-       debug_echo "download upgradable (success)"
-    else
-       debug_echo "download upgradable (error)"
-    fi
-else
-    debug_echo "download upgradable (not run)"
-fi
-
-# auto upgrade all upgradeable packages
-UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
-if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
-    if unattended-upgrade $XUUPOPT; then
-       update_stamp $UPGRADE_STAMP
-       debug_echo "unattended-upgrade (success)"
-    else
-       debug_echo "unattended-upgrade (error)"
-    fi
-else
-    debug_echo "unattended-upgrade (not run)"
-fi
-
-# autoclean package archive
-AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
-if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
-    if  eval apt-get $XAPTOPT -y autoclean $XSTDERR; then
-       debug_echo "autoclean (success)."
-       update_stamp $AUTOCLEAN_STAMP
-    else
-       debug_echo "autoclean (error)"
-    fi
-else
-    debug_echo "autoclean (not run)"
-fi
-
-# check cache size 
-check_size_constraints
-
-#
-#     vim: set sts=4 ai :
-#
-
index 1608db061a33c15fa43bc1ada04f99f8da441d5f..5b11e4f21311424bc02c62ecd116ed015f030c92 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v2.0.2
-# Written by cupsd on 2015-06-07 20:19
+# Written by cupsd on 2015-06-26 23:45
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d
index d5551b127b7dbb002dd606dbe7b06aca475c00d8..bf53fb3caa6894e1fb151088f70b1306e86c18a6 100644 (file)
@@ -1,3 +1,11 @@
 # Subscription configuration file for CUPS v2.0.2
-# Written by cupsd on 2015-06-08 20:19
-NextSubscriptionId 217
+# Written by cupsd on 2015-06-26 23:45
+NextSubscriptionId 219
+<Subscription 218>
+Events printer-changed
+Owner root
+LeaseDuration 86400
+Interval 60
+ExpirationTime 1435441528
+NextEventId 1
+</Subscription>
index c4b113763a398a8707407973b5c34e32b2c2be1e..f9801015d7c49eab98b23791045545f0c746dd35 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $
 #
 # To populate all changes in this file you need to regenerate your
 # grub configuration file afterwards:
@@ -63,3 +63,14 @@ GRUB_DISABLE_LINUX_UUID=true
 
 # Uncomment to disable generation of recovery mode menu entries
 #GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"
index e825f4b624b642e97455074c8904b1d9ac464f95..1d2f713fd086490b00667d21baab222747a033be 100644 (file)
        <dir name="desktop">
                <dir name="ibus">
                        <dir name="panel">
-                               <entry name="auto-hide-timeout" mtime="1416805612" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
-                               <entry name="custom_font" mtime="1416805612" schema="/schemas/desktop/ibus/panel/custom_font"/>
-                               <entry name="use_custom_font" mtime="1416805612" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
-                               <entry name="show_im_name" mtime="1416805612" schema="/schemas/desktop/ibus/panel/show_im_name"/>
-                               <entry name="show_icon_on_systray" mtime="1416805612" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
-                               <entry name="lookup_table_orientation" mtime="1416805612" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
-                               <entry name="y" mtime="1416805612" schema="/schemas/desktop/ibus/panel/y"/>
-                               <entry name="x" mtime="1416805612" schema="/schemas/desktop/ibus/panel/x"/>
-                               <entry name="show" mtime="1416805612" schema="/schemas/desktop/ibus/panel/show"/>
+                               <entry name="auto-hide-timeout" mtime="1435047977" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
+                               <entry name="custom_font" mtime="1435047977" schema="/schemas/desktop/ibus/panel/custom_font"/>
+                               <entry name="use_custom_font" mtime="1435047977" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
+                               <entry name="show_im_name" mtime="1435047977" schema="/schemas/desktop/ibus/panel/show_im_name"/>
+                               <entry name="show_icon_on_systray" mtime="1435047977" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
+                               <entry name="lookup_table_orientation" mtime="1435047977" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
+                               <entry name="y" mtime="1435047977" schema="/schemas/desktop/ibus/panel/y"/>
+                               <entry name="x" mtime="1435047977" schema="/schemas/desktop/ibus/panel/x"/>
+                               <entry name="show" mtime="1435047977" schema="/schemas/desktop/ibus/panel/show"/>
                        </dir>
                        <dir name="general">
-                               <entry name="version" mtime="1416805612" schema="/schemas/desktop/ibus/general/version"/>
-                               <entry name="dconf_preserve_name_prefixes" mtime="1416805612" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
-                               <entry name="enable_by_default" mtime="1416805612" schema="/schemas/desktop/ibus/general/enable_by_default"/>
-                               <entry name="use_global_engine" mtime="1416805612" schema="/schemas/desktop/ibus/general/use_global_engine"/>
-                               <entry name="embed_preedit_text" mtime="1416805612" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
-                               <entry name="use_system_keyboard_layout" mtime="1416805612" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
-                               <entry name="switcher-delay-time" mtime="1416805612" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
-                               <entry name="engines_order" mtime="1416805612" schema="/schemas/desktop/ibus/general/engines_order"/>
-                               <entry name="preload_engines" mtime="1416805612" schema="/schemas/desktop/ibus/general/preload_engines"/>
+                               <entry name="version" mtime="1435047977" schema="/schemas/desktop/ibus/general/version"/>
+                               <entry name="dconf_preserve_name_prefixes" mtime="1435047977" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
+                               <entry name="enable_by_default" mtime="1435047977" schema="/schemas/desktop/ibus/general/enable_by_default"/>
+                               <entry name="use_global_engine" mtime="1435047977" schema="/schemas/desktop/ibus/general/use_global_engine"/>
+                               <entry name="embed_preedit_text" mtime="1435047977" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
+                               <entry name="use_system_keyboard_layout" mtime="1435047977" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
+                               <entry name="switcher-delay-time" mtime="1435047977" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
+                               <entry name="engines_order" mtime="1435047977" schema="/schemas/desktop/ibus/general/engines_order"/>
+                               <entry name="preload_engines" mtime="1435047977" schema="/schemas/desktop/ibus/general/preload_engines"/>
                                <dir name="hotkey">
-                                       <entry name="previous_engine" mtime="1416805612" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
-                                       <entry name="prev_engine" mtime="1416805612" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
-                                       <entry name="next_engine_in_menu" mtime="1416805612" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
-                                       <entry name="next_engine" mtime="1416805612" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
-                                       <entry name="disable_unconditional" mtime="1416805612" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
-                                       <entry name="enable_unconditional" mtime="1416805612" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
-                                       <entry name="triggers" mtime="1416805612" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
-                                       <entry name="trigger" mtime="1416805612" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
+                                       <entry name="previous_engine" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
+                                       <entry name="prev_engine" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
+                                       <entry name="next_engine_in_menu" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
+                                       <entry name="next_engine" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
+                                       <entry name="disable_unconditional" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
+                                       <entry name="enable_unconditional" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
+                                       <entry name="triggers" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
+                                       <entry name="trigger" mtime="1435047977" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
                                </dir>
                        </dir>
                </dir>
@@ -16525,14 +16525,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                <dir name="desktop">
                        <dir name="ibus">
                                <dir name="panel">
-                                       <entry name="auto-hide-timeout" mtime="1416805612" type="schema" stype="int" owner="ibus">
+                                       <entry name="auto-hide-timeout" mtime="1435047977" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="The milliseconds to show property panel">
                                                        <default type="int" value="10000"/>
                                                        <longdesc>The milliseconds to show property panel after focus-in or
                 properties are changed.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="custom_font" mtime="1416805612" type="schema" stype="string" owner="ibus">
+                                       <entry name="custom_font" mtime="1435047977" type="schema" stype="string" owner="ibus">
                                                <local_schema locale="C" short_desc="Custom font">
                                                        <default type="string">
                                                                <stringvalue>Sans 10</stringvalue>
@@ -16540,41 +16540,41 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Custom font name for language panel</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_custom_font" mtime="1416805612" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_custom_font" mtime="1435047977" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use custom font">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Use custom font name for language panel</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show_im_name" mtime="1416805612" type="schema" stype="bool" owner="ibus">
+                                       <entry name="show_im_name" mtime="1435047977" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Show input method name">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Show input method name on language bar</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show_icon_on_systray" mtime="1416805612" type="schema" stype="bool" owner="ibus">
+                                       <entry name="show_icon_on_systray" mtime="1435047977" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Show icon on system tray">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Show icon on system tray</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="lookup_table_orientation" mtime="1416805612" type="schema" stype="int" owner="ibus">
+                                       <entry name="lookup_table_orientation" mtime="1435047977" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Orientation of lookup table">
                                                        <default type="int" value="1"/>
                                                        <longdesc>Orientation of lookup table. 0 = Horizontal, 1 = Vertical</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="y" mtime="1416805612" type="schema" stype="int" owner="ibus">
+                                       <entry name="y" mtime="1435047977" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Language panel position">
                                                        <default type="int" value="-1"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="x" mtime="1416805612" type="schema" stype="int" owner="ibus">
+                                       <entry name="x" mtime="1435047977" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Language panel position">
                                                        <default type="int" value="-1"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show" mtime="1416805612" type="schema" stype="int" owner="ibus">
+                                       <entry name="show" mtime="1435047977" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Auto hide">
                                                        <default type="int" value="1"/>
                                                        <longdesc>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</longdesc>
@@ -16582,7 +16582,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="general">
-                                       <entry name="version" mtime="1416805612" type="schema" stype="string" owner="ibus">
+                                       <entry name="version" mtime="1435047977" type="schema" stype="string" owner="ibus">
                                                <local_schema locale="C" short_desc="Saved version number">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -16593,7 +16593,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
             </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="dconf_preserve_name_prefixes" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="dconf_preserve_name_prefixes" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="DConf preserve name prefixes">
                                                        <default type="list" ltype="string">
                                                                <li type="string">
@@ -16609,32 +16609,32 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Prefixes of DConf keys to stop name conversion</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable_by_default" mtime="1416805612" type="schema" stype="bool" owner="ibus">
+                                       <entry name="enable_by_default" mtime="1435047977" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Enable input method by default">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Enable input method by default when the application gets input
             focus</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_global_engine" mtime="1416805612" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_global_engine" mtime="1435047977" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use global input method">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Share the same input method among all applications</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="embed_preedit_text" mtime="1416805612" type="schema" stype="bool" owner="ibus">
+                                       <entry name="embed_preedit_text" mtime="1435047977" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Embed Preedit Text">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Embed Preedit Text in Application Window</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_system_keyboard_layout" mtime="1416805612" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_system_keyboard_layout" mtime="1435047977" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use system keyboard layout">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Use system keyboard (XKB) layout</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="switcher-delay-time" mtime="1416805612" type="schema" stype="int" owner="ibus">
+                                       <entry name="switcher-delay-time" mtime="1435047977" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Popup delay milliseconds for IME switcher window">
                                                        <default type="int" value="400"/>
                                                        <longdesc>Set popup delay milliseconds to show IME switcher window.
@@ -16645,14 +16645,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
             </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="engines_order" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="engines_order" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="Engines order">
                                                        <default type="list" ltype="string">
                                                        </default>
                                                        <longdesc>Saved engines order in input method list</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="preload_engines" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="preload_engines" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="Preload engines">
                                                        <default type="list" ltype="string">
                                                        </default>
@@ -16660,21 +16660,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                        </entry>
                                        <dir name="hotkey">
-                                               <entry name="previous_engine" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="previous_engine" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Prev engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for switching to the previous input method</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="prev_engine" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="prev_engine" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Prev engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for switching to the previous input method</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="next_engine_in_menu" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="next_engine_in_menu" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Next engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16684,7 +16684,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="next_engine" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="next_engine" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Next engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16694,21 +16694,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="disable_unconditional" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="disable_unconditional" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Disable shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for turning input method off</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable_unconditional" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="enable_unconditional" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Enable shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for turning input method on</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="triggers" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="triggers" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Trigger shortcut keys for gtk_accelerator_parse">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16718,7 +16718,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for turning input method on or off</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="trigger" mtime="1416805612" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="trigger" mtime="1435047977" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Trigger shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
index b2a1ee2f8b8157d1db55134e94a9c2762aac0715..e1ae34be76103d0b1e581314394e1df8ebecbad8 100755 (executable)
@@ -1,15 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.1 2014/10/18 17:00:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.3 2015/06/13 11:54:25 hwoarang Exp $
 
 CONTAINER=${SVCNAME#*.}
 
+LXC_PATH=`lxc-config lxc.lxcpath`
+
 lxc_get_configfile() {
-       if [ -f "/etc/lxc/${CONTAINER}.conf" ]; then
-               echo "/etc/lxc/${CONTAINER}.conf"
-       elif [ -f "/etc/lxc/${CONTAINER}/config" ]; then
-               echo "/etc/lxc/${CONTAINER}/config"
+       if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
+               echo "${LXC_PATH}/${CONTAINER}.conf"
+       elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
+               echo "${LXC_PATH}/${CONTAINER}/config"
        else
                eerror "Unable to find a suitable configuration file."
                eerror "If you set up the container in a non-standard"
diff --git a/logrotate.d/apt b/logrotate.d/apt
deleted file mode 100644 (file)
index 9a6e5d1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/var/log/apt/term.log {
-  rotate 12
-  monthly
-  compress
-  missingok
-  notifempty
-}
-
-/var/log/apt/history.log {
-  rotate 12
-  monthly
-  compress
-  missingok
-  notifempty
-}
-
index b2aba785eac9cb897f1f2490ec0c02e12b129a3b..c9837a0e223b62d37af541b4008c776d6285ef46 100644 (file)
@@ -3,7 +3,7 @@
 # All Parameters must be like "paramter=value" without blanks.
  
 # version of Config File
-version=1.76
+version=1.77
 
 # Selection of the ripping Title, look with "lsdvd".
 # With "titel=0" lxdvdrip selects automatically the longest Title.
@@ -54,7 +54,7 @@ dvdleser=/dev/sr0
 
 # Device for DVD-Burner.
 # growisofs: normally "/dev/sr0".
-# cdrecord: normally "0,0,0", test with "cdrecord -scanbus".
+# wodim: normally "0,0,0", test with "wodim -scanbus".
 # On the Commandline: "-db=".
 dvdbrenner=/dev/sr0
 
@@ -71,9 +71,9 @@ filmverzeichnis=/tmp/film-dvd
 file=0
 
 # Burning Program.
-# "1": growisofs, "2": cdrecord, "3": cdrecord on the fly,
-# "4": create ISO-Image "/tmp/dvdrip.img" with mkisofs.
-# "5": create ISO-Image with Name "Volume-ID.img" (=Name of DVD) with mkisofs.
+# "1": growisofs, "2": wodim, "3": wodim on the fly,
+# "4": create ISO-Image "/tmp/dvdrip.img" with genisoimage.
+# "5": create ISO-Image with Name "Volume-ID.img" (=Name of DVD) with genisoimage.
 # "0": no Burning.
 # On the Commandline: "-bp=".
 brennprogramm=1
@@ -148,7 +148,7 @@ playsound=1
 # On the Commandline: "-free="
 free=1
 
-# Burning Speed for growisofs and cdrecord.
+# Burning Speed for growisofs and wodim.
 # speed=0: Start without "-speed="
 speed=4
 
@@ -157,16 +157,16 @@ speed=4
 # For a Description see "man growisofs".
 dvdcompat=1
 
-# Extra-Parameter(s) for mkisofs.
+# Extra-Parameter(s) for genisoimage.
 # Parameter must be marked with apostrophes "xxx", i. E.:
-# mkisofs_param="-input-charset iso8859-1"
-# Parameter would be set by calling mkisofs or growisofs.
-mkisofs_param=""
+# genisoimage_param="-input-charset iso8859-1"
+# Parameter would be set by calling genisoimage or growisofs.
+genisoimage_param=""
 
-# Extra-Parameter(s) for cdrecord/growisofs.
+# Extra-Parameter(s) for wodim/growisofs.
 # Parameter must be marked with apostrophes "xxx", i. E.:
 # burn_param="-tao"
-# Parameter would be set by calling cdrecord or growisofs.
+# Parameter would be set by calling wodim or growisofs.
 burn_param=""
 
 # Eject DVD after Ripping
@@ -181,9 +181,9 @@ rw-format=1
 # Optional the full Path could be set, i. E.
 # "play_cell_name=/usr/local/bin/play_cell".
 dvdauthor_name=dvdauthor
-buffer_name=buffer_lxdvdrip
+#buffer_name=buffer
 #buffer_name=bfr
-#buffer_name=mbuffer
+buffer_name=mbuffer_lxdvdrip
 tccat_name=tccat
 tcextract_name=tcextract
 requant_name=requant_lxdvdrip
@@ -195,8 +195,8 @@ spumux_name=spumux
 spuunmux_name=spuunmux
 dvdbackup_name=dvdbackup_lxdvdrip
 # Alternative: dvdbackup_name=vobcopy
-mkisofs_name=mkisofs
-cdrecord_name=cdrecord
+genisoimage_name=genisoimage
+wodim_name=wodim
 growisofs_name=growisofs
 dvd+rw-format=dvd+rw-format
 dvdunauthor_name=dvdunauthor
@@ -212,7 +212,7 @@ lxdvdrip_wav_name=/usr/local/share/lxdvdrip.wav
 
 # Nice-Level for Programgroups
 # nice_rip for ripping (tccat, mplayer, spuunmux, vamps_play_cell)
-# nice_burn for burning (growisofs, cdrecord)
+# nice_burn for burning (growisofs, wodim)
 # Possible values from "-20" (high) to "19" (low), "off" without nice
 nice_rip=off
 nice_burn=off
index 0f4ff3e95e81e91b1b114890bad28a77de58bd1e..8582995a1de933e6fd683a6bdb431d7b60ac217d 100644 (file)
@@ -15,6 +15,7 @@
 ~app-editors/pluma-1.8.0
 
 ~app-emulation/docker-1.4.1
+~app-emulation/docker-1.6.1
 ~app-emulation/emul-linux-x86-baselibs-20120520
 ~app-emulation/emul-linux-x86-db-20120520
 ~app-emulation/emul-linux-x86-gtklibs-20120520
@@ -106,6 +107,7 @@ dev-python/pb-logging
 ~dev-python/pylint-0.28.0
 ~dev-python/PyQt4-4.11.3
 ~dev-python/python-debian-0.1.21_p2
+~dev-python/python-debian-0.1.27
 ~dev-python/pythonmagick-0.9.10
 ~dev-python/reportlab-2.6
 ~dev-python/setuptools-0.8
@@ -121,6 +123,7 @@ dev-python/pb-logging
 ~dev-python/virtualenvwrapper-3.7
 ~dev-python/virtualenvwrapper-4.1.1
 ~dev-python/virtualenvwrapper-4.3
+~dev-python/virtualenvwrapper-4.5.1
 
 #~dev-qt/qt3support-4.8.6
 #~dev-qt/qtdbus-4.8.6
@@ -241,6 +244,7 @@ mail-client/thunderbird
 
 # ~media-video/cheese-3.6.2
 ~media-video/lxdvdrip-1.76
+~media-video/lxdvdrip-1.77
 ~media-video/m2vrequantizer-0.0.2_pre20060306
 #~media-video/mplayer-1.2_pre20141011
 ~media-video/mplayer-1.2_pre20150214
index 7a104c01daa70a765ca02179c7e90d7f686ae513..8a53d6bf0deb49e002fa9e2a4d3954c925849b40 100644 (file)
@@ -1,7 +1,5 @@
-# Hand made by Frank Brehm
-domain home.brehm-online.com
-#search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local
-search home.brehm-online.com brehm-online.com uhu-banane.de pb.local dc1.de.profitbricks.net dc2.us.profitbricks.net dc3.de.profitbricks.net
-#nameserver 10.12.11.1
-nameserver 192.168.178.30
-nameserver 192.168.178.89
+# Generated by net-scripts for interface eth0
+domain brehm-online.com
+search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
+nameserver 10.12.11.254
+#nameserver 127.0.0.1