From ac4d09acab539ad1a65a01e5e75a3379a528b096 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Jul 2009 23:21:32 +0200 Subject: [PATCH] Drop deprecated /etc/init.d/xfree86-common and debian/dirs --- debian/dirs | 3 -- debian/rules | 2 +- etc/init.d/xfree86-common | 81 ----------------------------------------------- 3 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 debian/dirs delete mode 100755 etc/init.d/xfree86-common diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ac07f15..0000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/zsh -etc/X11 -usr/bin diff --git a/debian/rules b/debian/rules index fe37378..9556cc3 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,7 @@ install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs etc/init.d usr/bin usr/share/grml + dh_installdirs usr/bin usr/share/grml # Add here commands to install the package into debian/grml-x. install -m 755 grml-x debian/grml-x/usr/bin/grml-x diff --git a/etc/init.d/xfree86-common b/etc/init.d/xfree86-common deleted file mode 100755 index 34310c6..0000000 --- a/etc/init.d/xfree86-common +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# $Id: xfree86-common.init 2186 2005-02-11 07:11:05Z branden $ - -# Copyright 2003, 2004 Branden Robinson . -# -# This is free software; you may redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, -# or (at your option) any later version. -# -# This is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License with -# the Debian operating system, in /usr/share/common-licenses/GPL; if -# not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA - -set -e - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -SOCKET_DIR=/tmp/.X11-unix -ICE_DIR=/tmp/.ICE-unix - -do_restorecon () { - # Restore file security context (SELinux). - if which restorecon >/dev/null 2>&1; then - restorecon "$1" - fi -} - -set_up_socket_dir () { - echo -n "Setting up X server socket directory $SOCKET_DIR..." - if [ -e $SOCKET_DIR ] && ! [ -d $SOCKET_DIR ]; then - mv $SOCKET_DIR $SOCKET_DIR.$$ - fi - mkdir -p $SOCKET_DIR - chown 0:0 $SOCKET_DIR - chmod 1777 $SOCKET_DIR - do_restorecon $SOCKET_DIR - echo "done." -} - -set_up_ice_dir () { - echo -n "Setting up ICE socket directory $ICE_DIR..." - if [ -e $ICE_DIR ] && ! [ -d $ICE_DIR ]; then - mv $ICE_DIR $ICE_DIR.$$ - fi - mkdir -p $ICE_DIR - chown 0:0 $ICE_DIR - chmod 1777 $ICE_DIR - do_restorecon $ICE_DIR - echo "done." -} - -case "$1" in - start) - set_up_socket_dir - set_up_ice_dir - ;; - - restart|reload|force-reload) - /etc/init.d/xfree86-common start - ;; - - stop) - : - ;; - - *) - echo "Usage: /etc/init.d/xfree86-common {start|stop|restart|reload|force-reload}" - exit 1 - ;; -esac - -exit 0 - -# vim:set ai et sts=2 sw=2 tw=80: -- 2.1.4