[Demudi-commits] r404 - in demudi-cfengine/trunk: . chunks debian scripts
Free Ekanayaka
free-guest@costa.debian.org
Sun, 06 Mar 2005 13:06:16 +0100
Author: free-guest
Date: 2005-03-06 13:06:13 +0100 (Sun, 06 Mar 2005)
New Revision: 404
Added:
demudi-cfengine/trunk/80demudi-cfengine
demudi-cfengine/trunk/scripts/xserver-xorg
Removed:
demudi-cfengine/trunk/scripts/sysv-rc
Modified:
demudi-cfengine/trunk/chunks/gnome-menus-etc_xdg_menus_applications.menu
demudi-cfengine/trunk/debian/changelog
demudi-cfengine/trunk/debian/install
demudi-cfengine/trunk/demudi-cfengine
demudi-cfengine/trunk/scripts/apt
demudi-cfengine/trunk/scripts/aterm
demudi-cfengine/trunk/scripts/gdm
demudi-cfengine/trunk/scripts/gnome-menus
demudi-cfengine/trunk/scripts/grub
Log:
demudi-cfengine:
* Added script to modify xdg gnome menus
* Added main component to the apt repository
* Force force-confnew and run cfagent through APT
* Run update-rc.d through debconf-preseed
* Turned off gdm beep
* Using demudi theme for gdm greeter
* Changing xorg keyboard rule to xfree86
Added: demudi-cfengine/trunk/80demudi-cfengine
===================================================================
--- demudi-cfengine/trunk/80demudi-cfengine 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/80demudi-cfengine 2005-03-06 12:06:13 UTC (rev 404)
@@ -0,0 +1,6 @@
+DPkg::Pre-Install-Pkgs { "cut -f 1 -d _ | xargs -n1 basename > /tmp/apt-packages 2>/dev/null"; };
+DPkg::Post-Invoke { "test -x /usr/sbin/demudi-cfengine && /usr/sbin/demudi-cfengine $(cat /tmp/apt-packages); rm /tmp/apt-packages"; };
+DPkg
+{
+ Options {"--force-confnew";}
+}
Modified: demudi-cfengine/trunk/chunks/gnome-menus-etc_xdg_menus_applications.menu
===================================================================
--- demudi-cfengine/trunk/chunks/gnome-menus-etc_xdg_menus_applications.menu 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/chunks/gnome-menus-etc_xdg_menus_applications.menu 2005-03-06 12:06:13 UTC (rev 404)
@@ -1,12 +1,56 @@
- <!-- Recordig -->
+ <!-- Audio -->
<Menu>
- <Name>Recording</Name>
- <Directory>Recording.directory</Directory>
+ <Name>Audio</Name>
+ <Directory>Audio.directory</Directory>
<Include>
<And>
- <Category>Recording</Category>
+ <Category>Audio</Category>
</And>
</Include>
- </Menu> <!-- End Recording -->
+ </Menu> <!-- End Audio -->
+ <!-- Midi -->
+ <Menu>
+ <Name>Midi</Name>
+ <Directory>Midi.directory</Directory>
+ <Include>
+ <And>
+ <Category>Midi</Category>
+ </And>
+ </Include>
+ </Menu> <!-- End Midi -->
+
+ <!-- Synthesis -->
+ <Menu>
+ <Name>Synthesis</Name>
+ <Directory>Synthesis.directory</Directory>
+ <Include>
+ <And>
+ <Category>Synthesis</Category>
+ </And>
+ </Include>
+ </Menu> <!-- End Synthesis -->
+
+ <!-- Utilities -->
+ <Menu>
+ <Name>Utilities</Name>
+ <Directory>Utilities.directory</Directory>
+ <Include>
+ <And>
+ <Category>Utilities</Category>
+ </And>
+ </Include>
+ </Menu> <!-- End Utilities -->
+
+ <!-- Effects -->
+ <Menu>
+ <Name>Effects</Name>
+ <Directory>Effects.directory</Directory>
+ <Include>
+ <And>
+ <Category>Effects</Category>
+ </And>
+ </Include>
+ </Menu> <!-- End Effects -->
+
Modified: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/debian/changelog 2005-03-06 12:06:13 UTC (rev 404)
@@ -1,6 +1,12 @@
demudi-cfengine (0.14) UNRELEASED; urgency=low
- * Added script to modify xdg GNOME menus
+ * Added script to modify xdg gnome menus
+ * Added main component to the apt repository
+ * Force force-confnew and run cfagent through APT
+ * Run update-rc.d through debconf-preseed
+ * Turned off gdm beep
+ * Using demudi theme for gdm greeter
+ * Changing xorg keyboard rule to xfree86
-- Free Ekanayaka <free@agnula.org> Sun, 16 Jan 2005 13:24:22 +0100
Modified: demudi-cfengine/trunk/debian/install
===================================================================
--- demudi-cfengine/trunk/debian/install 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/debian/install 2005-03-06 12:06:13 UTC (rev 404)
@@ -2,3 +2,4 @@
chunks/ usr/share/demudi-cfengine/
cfagent.conf usr/share/demudi-cfengine/
demudi-cfengine usr/sbin/
+80demudi-cfengine etc/apt/apt.conf.d/
Modified: demudi-cfengine/trunk/demudi-cfengine
===================================================================
--- demudi-cfengine/trunk/demudi-cfengine 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/demudi-cfengine 2005-03-06 12:06:13 UTC (rev 404)
@@ -1,5 +1,4 @@
#! /bin/sh
-
# This script configures an A/DeMuDi installation
set -e
@@ -8,19 +7,16 @@
basedir=/usr/share/demudi-cfengine
inputs=$basedir/scripts
config=$basedir/cfagent.conf
-new=
+pkgs=/tmp/apt-packages
+scripts=""
-if [ "$1" ]; then
- script=$1
- if [ "$1" == "new" ]; then
- script="all"
- new="-D new"
- fi
-else
- script="all"
-fi
+pkgs=$(echo $@ | tr -d "-")
+for pkg in $pkgs; do
+ scripts="$scripts -D $pkg"
+done
+
export CFINPUTS="$inputs"
-cd $inputs && $binary -v -f $config -D $script $new
+cd $inputs && $binary -v -f $config $scripts
exit 0
Modified: demudi-cfengine/trunk/scripts/apt
===================================================================
--- demudi-cfengine/trunk/scripts/apt 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/scripts/apt 2005-03-06 12:06:13 UTC (rev 404)
@@ -30,9 +30,6 @@
LocateLineMatching "$(begin)"
InsertLine "$(comment)"
InsertLine ""
- InsertLine "# Debian Sarge snapshot"
- InsertLine "#$(snapshot)"
- InsertLine ""
InsertLine "# A/DeMuDi packages"
InsertLine "#$(agnula)"
InsertLine ""
@@ -43,13 +40,5 @@
networked::
{ /etc/apt/sources.list
SetCommentStart "#"
- UnCommentLinesContaining "$(snapshot)"
UnCommentLinesContaining "$(agnula)"
}
-
-
-shellcommands:
-
- networked::
-
- "/usr/bin/apt-get update"
Modified: demudi-cfengine/trunk/scripts/aterm
===================================================================
--- demudi-cfengine/trunk/scripts/aterm 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/scripts/aterm 2005-03-06 12:06:13 UTC (rev 404)
@@ -1,3 +1,2 @@
shellcommands:
-
"/usr/sbin/update-alternatives --set x-terminal-emulator /usr/bin/aterm-xterm"
Modified: demudi-cfengine/trunk/scripts/gdm
===================================================================
--- demudi-cfengine/trunk/scripts/gdm 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/scripts/gdm 2005-03-06 12:06:13 UTC (rev 404)
@@ -3,4 +3,6 @@
{ /etc/gdm/gdm.conf
ReplaceAll "^#?Greeter=/usr/bin/gdmlogin" With "Greeter=/usr/bin/gdmgreeter"
ReplaceAll "^#?SecureSystemMenu=true" With "SecureSystemMenu=false"
+ ReplaceAll "^#?SoundOnLogin=true" With "SoundOnLogin=false"
+ ReplaceAll "^#?GraphicalTheme=circles" With "GraphicalTheme=demudi"
}
Modified: demudi-cfengine/trunk/scripts/gnome-menus
===================================================================
--- demudi-cfengine/trunk/scripts/gnome-menus 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/scripts/gnome-menus 2005-03-06 12:06:13 UTC (rev 404)
@@ -2,6 +2,20 @@
{ /etc/xdg/menus/applications.menu
#
+ # Delete Multimedia
+ #
+# LocateLineMatching ".*<!-- Multimedia -->"
+# DeleteToLineMatching ".*<!-- End Multimedia -->"
+# DeleteNLines "1"
+
+ #
+ # Delete Other
+ #
+# LocateLineMatching ".*<!-- Other -->"
+# DeleteToLineMatching ".*<!-- End Other -->"
+# DeleteNLines "1"
+
+ #
# Insert our chunk
#
BeginGroupIfNoLineContaining "<!-- DeMuDi-->"
@@ -17,16 +31,22 @@
InsertFile "$(chunks)/gnome-menus-etc_xdg_menus_applications.menu"
IncrementPointer "1"
DeleteToLineMatching ".*<!-- End DeMuDi-->"
+ }
- #
- # Delete Multimedia
- #
- LocateLineMatching ".*<!-- Multimedia -->"
- DeleteToLineMatching ".*<!-- End Multimedia -->"
+ { /usr/share/gnome/apps/Multimedia/ardour-gtk.desktop
+ AppendIfNoSuchLine "Categories=Application;AudioVideo;Audio;"
+ }
+ { /usr/share/gnome/apps/Multimedia/sweep.desktop
+ AppendIfNoSuchLine "Categories=Application;AudioVideo;Audio;"
+ }
+ { /usr/share/gnome/apps/Multimedia/zynaddsubfx.desktop
+ AppendIfNoSuchLine "Categories=Application;AudioVideo;Synthesis;"
+ }
+ { /usr/share/applications/jack-rack.desktop
+ AppendIfNoSuchLine "Categories=Application;AudioVideo;Synthesis;"
+ }
+ { /usr/share/applications/jamin.desktop
+ LocateLineMatching "Categories=.*"
+ AppendToLineIfNotContains "Audio;"
- #
- # Delete Other
- #
- LocateLineMatching ".*<!-- Other -->"
- DeleteToLineMatching ".*<!-- End Other -->"
}
Modified: demudi-cfengine/trunk/scripts/grub
===================================================================
--- demudi-cfengine/trunk/scripts/grub 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/scripts/grub 2005-03-06 12:06:13 UTC (rev 404)
@@ -32,5 +32,4 @@
/boot/grub/splash.xpm.gz -> /boot/grub/splashimages/agnula-romantic.xpm.gz
shellcommands:
-
- "/sbin/update-grub -y"
+ "/sbin/update-grub -y"
Deleted: demudi-cfengine/trunk/scripts/sysv-rc
===================================================================
--- demudi-cfengine/trunk/scripts/sysv-rc 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/scripts/sysv-rc 2005-03-06 12:06:13 UTC (rev 404)
@@ -1,6 +0,0 @@
-shellcommands:
-
- new::
-
- "/usr/sbin/update-rc.d -f cron remove"
- "/usr/sbin/update-rc.d -f anacron remove"
Added: demudi-cfengine/trunk/scripts/xserver-xorg
===================================================================
--- demudi-cfengine/trunk/scripts/xserver-xorg 2005-03-04 18:44:34 UTC (rev 403)
+++ demudi-cfengine/trunk/scripts/xserver-xorg 2005-03-06 12:06:13 UTC (rev 404)
@@ -0,0 +1,5 @@
+editfiles:
+
+ { /etc/X11/xorg.conf
+ ReplaceAll ".*Option.*\"XkbRules\".*\"xorg\"" With " Option \"XkbRules\" \"xfree86\""
+ }