diff --git a/Makefile b/Makefile index 817ee94..e520ce6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for openmamba-desktop-base -# Copyright (C) 2004-2009 by Silvan Calarco +# Copyright (C) 2004-2011 by Silvan Calarco # Copyright (C) 2005-2007 by Davide Madrisan include VERSION @@ -54,8 +54,6 @@ kdeconfigdir = ${kdedatadir}/config kdewallpapersdir = ${kdedatadir}/wallpapers localesdir = ${datadir}/locale kdelocalesdir = ${kdedatadir}/locale -aptconfdir = ${sysconfdir}/apt/apt.conf.d -aptscriptsdir = ${datadir}/apt/scripts xdg_appsdir = ${datadir}/applications xdg_directorydir = ${datadir}/desktop-directories @@ -255,12 +253,6 @@ install-bootrecover: $(INSTALL_SCRIPT) bootrecover/bootrecover.sh $(DESTDIR)$(bootrecoverdatadir) $(INSTALL_DATA) bootrecover/openmamba-bootrecover.desktop $(DESTDIR)$(xdg_appsdir) -install-apt-extras: - @$(INSTALL_DIR) $(DESTDIR)$(aptconfdir) $(DESTDIR)$(aptscriptsdir) - $(INSTALL_DATA) apt/post-install.conf $(DESTDIR)$(aptconfdir) - $(INSTALL_SCRIPT) apt/post-install.lua $(DESTDIR)$(aptscriptsdir) - $(INSTALL_SCRIPT) apt/post-install.sh $(DESTDIR)$(aptscriptsdir) - install-usbinstall: @$(INSTALL_DIR) $(DESTDIR)$(usbinstalldatadir) $(INSTALL_SCRIPT) usbinstall/usbinstall.sh $(DESTDIR)$(usbinstalldatadir) @@ -282,8 +274,7 @@ install: $(pck_infiles:.in=) \ install-openmamba-update \ install-bootrecover \ install-locales \ - install-icons \ - install-apt-extras + install-icons dist: clean @git log > ChangeLog.git diff --git a/apt/post-install.conf b/apt/post-install.conf deleted file mode 100644 index 87b6d21..0000000 --- a/apt/post-install.conf +++ /dev/null @@ -1,2 +0,0 @@ -Scripts::PM::Post:: "post-install.lua"; -Apt::Get::post-install "true"; diff --git a/apt/post-install.lua b/apt/post-install.lua deleted file mode 100755 index c559999..0000000 --- a/apt/post-install.lua +++ /dev/null @@ -1,12 +0,0 @@ --- This script will perform operations after new packages have been installed --- --- Author: Silvan Calarco Copyright (c) 2009 --- - --- Allow someone to disable this without removing the script. -if confget("APT::Get::post-install/b", "true") == "false" then - return -end - -os.execute("/usr/share/apt/scripts/post-install.sh") -return diff --git a/apt/post-install.sh b/apt/post-install.sh deleted file mode 100755 index fc6f890..0000000 --- a/apt/post-install.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -[ -x /usr/bin/update-mime-database ] && update-mime-database /usr/share/mime >/dev/null -IFS=":" -for d in $XDG_DATA_DIRS; do - [ -x /usr/bin/update-desktop-database ] && update-desktop-database -q $d/applications/ >/dev/null -done -exit 0