Changeset 279

Show
Ignore:
Timestamp:
10/01/07 09:22:08 (10 months ago)
Author:
free
Message:

* Use cdd-utils

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 64studio/trunk/debian/64studio-themes.postinst

    r215 r279  
    2020# 
    2121 
    22 tweak_desktop_files () { 
    23  
    24     # Place Bluefish in graphics 
    25     BLUEFISH=/usr/share/applications/bluefish.desktop 
    26     sed -i -e 's/^Categories=.*$/Categories=Application;Network;/g' $BLUEFISH 
    27  
    28     # Bug-Buddy in system 
    29     BUGBUDDY=/usr/share/applications/bug-buddy.desktop 
    30     sed -i -e 's/^Categories=.*$/Categories=Application;System;/g' $BUGBUDDY 
    31  
    32     # QJackCtl name and place 
    33     QJACKCTL=/usr/share/applications/qjackctl.desktop 
    34     sed -i -e 's/^Name=.*$/Name=JACK Control/g' $QJACKCTL 
    35     if grep -q Categories $QJACKCTL; then 
    36         sed -i -e 's/^Categories=.*$/Categories=Application;AudioVideo;/g' $QJACKCTL 
    37     else 
    38         echo "Categories=Application;AudioVideo;" >> $QJACKCTL 
    39     fi 
    40  
    41     # Evince in office 
    42     EVINCE=/usr/share/applications/evince.desktop 
    43     sed -i -e 's/^Categories=.*$/Categories=Application;Office;/g' $EVINCE 
    44     sed -i -e 's/^NoDisplay=.*$/NoDisplay=false/g' $EVINCE 
    45  
    46     # Add category to tagtool 
    47     TAGTOOL=/usr/share/applications/tagtool.desktop 
    48     if grep -q Categories $TAGTOOL; then 
    49         sed -i -e 's/^Categories=.*$/Categories=Application;AudioVideo;/g' $TAGTOOL 
    50     else 
    51         echo "Categories=Application;AudioVideo;" >> $TAGTOOL 
    52     fi 
    53  
    54     # Add timemachine icon 
    55     TM=/usr/share/gnome/apps/Multimedia/timemachine.desktop 
    56     if ! grep -q "Icon=" $TM; then 
    57         echo "Icon=/usr/share/timemachine/pixmaps/timemachine-icon.png" >> $TM 
    58     fi       
    59  
    60     # Add xpad icon 
    61     XPAD=/usr/share/applications/xpad.desktop 
    62     sed -i -e 's|^Icon=.*$|Icon=/usr/share/pixmaps/xpad/xpad.xpm|g' $XPAD 
    63  
    64     # Change avahi icon 
    65     AVAHI=/usr/share/applications/avahi-discover.desktop 
    66     sed -i -e 's|^Icon=.*$|Icon=network-wired|g' $AVAHI 
    67  
    68     # Add photoprint icon and change name 
    69     PHOTOPRINT=/usr/share/applications/photoprint.desktop 
    70     sed -i -e 's|^Icon=.*$|Icon=camera-photo22x22|g' $PHOTOPRINT 
    71     sed -i -e 's/^Name=.*$/Name=PhotoPrint/g' $PHOTOPRINT 
    72  
    73     # Change fmit title 
    74     FMIT=/usr/share/applications/fmit.desktop 
    75     sed -i -e 's|^Icon=.*$|Icon=fmit|g' $FMIT 
    76     sed -i -e 's/^Name=.*$/Name=Fmit Tuner/g' $FMIT 
    77  
    78     # Remove Audio category 
    79     STOPMOTION=/usr/share/applications/stopmotion.desktop 
    80     sed -i -e \ 
    81       's/^Categories=.*$/Categories=Application;Graphics;Video;AudioVideoEditing;KDE;Qt/g' \ 
    82       $STOPMOTION 
    83  
    84     # Show file-roller 
    85     FILEROLLER=/usr/share/applications/file-roller.desktop 
    86     sed -i -e 's|^NoDisplay=.*$|NoDisplay=false|g' $FILEROLLER 
    87  
    88     # Don't wrap system tools with gksu 
    89     SYSTEMTOOLS="network.desktop services.desktop shares.desktop time.desktop users.desktop" 
    90     for SYSTEMTOOL in $SYSTEMTOOLS; do 
    91         sed -i -e 's/^Exec=gksu \(.*\)/Exec=\1/g' /usr/share/applications/$SYSTEMTOOL 
    92     done 
    93  
    94 } 
    95  
    96 hide_menu_items () { 
    97  
    98     # Get rid of unwanted menu entries 
    99     GNOMEMEDIA="vumeter.desktop reclevel.desktop gnome-sound-recorder.desktop gnome-cd.desktop" 
    100     EOG="eog.desktop" 
    101     KNETATTACH="kde/knetattach.desktop" 
    102  
    103     for ITEM in $GNOMEMEDIA $EOG $KNETATTACH; do 
    104         ITEM=/usr/share/applications/$ITEM 
    105         sed -i -e 's/^Categories=.*$/Categories=None;/g' $ITEM 
    106     done 
    107  
    108 } 
    109  
    110 remove_debian_menu () { 
    111  
    112     # Remove Debian menu hierarchy from the Gnome menu 
    113     GNOME=/etc/xdg/menus/gnome-applications.menu 
    114     sed -i -e '/<MergeFile>debian-menu/ d' $GNOME 
    115  
    116 } 
    117  
    118 tweak_grub () { 
    119  
    120     # Grub timeout and directory 
    121     GRUB_TIMEOUT=5 
    122     sed -i -e "s|^timeout.*|timeout     $GRUB_TIMEOUT|g" /usr/sbin/update-grub 
    123     mkdir -p /boot/grub 
    124 } 
    125  
    126 fix_linux_kbuild () { 
    127  
    128     # Fix broken modpost script in linux-kbuild-2.6.19 
    129     MODPOST=/usr/src/linux-kbuild-2.6.19/scripts/Makefile.modpost 
    130     sed -i -e '/^[[:blank:]]*\$(if \$(KBUILD_EXTMOD)\$(KBUILD_MODPOST_WARN)/ d' $MODPOST 
    131  
    132     # Fix broken tsc.h include on i386 
    133     HEADERS=/usr/src/linux-headers-2.6.19-1-multimedia 
    134     if [ "$(dpkg --print-architecture)" == "i386" ]; then 
    135         mkdir -p $HEADERS/include/asm-x86_64 
    136         cp /usr/share/64studio/linux-2.6/tsc.h $HEADERS/include/asm-x86_64 
    137         mkdir -p ${HEADERS}-486/include/ 
    138         ln -sf  ../../linux-headers-2.6.19-1-multimedia/include/asm-x86_64 ${HEADERS}-486/include/asm-x86_64 
    139     fi 
    140  
    141 } 
    142  
    143 export_ladspa_path () { 
    144     PROFILE=/etc/profile 
    145     if ! grep -q "^export LADSPA_PATH" $PROFILE; then 
    146         sed -i -e 's|^export PATH|export PATH\nexport LADSPA_PATH=/usr/lib/ladspa/|g' $PROFILE 
    147     fi 
    148 } 
    149  
    15022case "$1" in 
    15123    configure) 
    …… 
    15325    # Only run these on new installs 
    15426    if [ "$2" == "" ]; then 
    155         remove_debian_menu      
    156         tweak_grub 
     27        cdd-config menu debian 
     28        cdd-config grub timeout 5 
    15729    fi 
    158     tweak_desktop_files 
    159     hide_menu_items 
     30    cdd-config menu tweak 
     31    cdd-config menu hide 
     32    cdd-config profile 
    16033    update-modules 
    161     export_ladspa_path 
    16234 
    16335    ;; 

  • 64studio/trunk/debian/changelog

    r270 r279  
    1414  * Added gnome mount 
    1515  * Added gnome-bluetooth, nautilus-sendto and obexpushd (closes #376) 
     16  * Use cdd-utils 
    1617 
    1718 -- Free Ekanayaka <freee@debian.org>  Wed, 26 Sep 2007 13:31:19 +0200 

  • 64studio/trunk/debian/control

    r252 r279  
    1515Package: 64studio-utils 
    1616Architecture: all 
     17Depends: cdd-utils 
    1718Description: 64 Studio scripts 
    1819 This package provides scripts to upgrade and configure 
    …… 
    3637Package: 64studio-themes 
    3738Architecture: all 
    38 Depends: backgrounds, gnome-themes, polymer, bluefish, bug-buddy, 
     39Depends: cdd-utils, backgrounds, gnome-themes, polymer, bluefish, bug-buddy, 
    3940 qjackctl,  evince, gnome-media, timemachine, gnome-menus, gimp, 
    4041 xpad, tagtool, eog, grub, module-init-tools, modutils, avahi-discover, 

  • 64studio/trunk/tasksel-data/64studio-tasks.desc

    r270 r279  
    178178 gimp-help-en 
    179179 gimp-print 
     180 gcolor2x 
    180181 gphoto2 
    181182 gthumb 
    …… 
    313314 nautilus-sendto 
    314315 gnome-bluetooth 
     316 bluetooth 
     317 bluez-cups 
     318 bluez-gnome 
     319 bluez-hcidump 
     320 bluez-pcmcia-support 
     321 bluez-utils 
     322 bluez-firmware 
     323 gnome-pilot 
     324 gnome-pilot-conduits 
    315325 gnome-user-guide 
    316326 update-manager 

  • 64studio/trunk/utils/64studio-config

    r235 r279  
    1111db_get passwd/username 
    1212USER=$RET 
    13 if [ -n "$USER" ]; then 
    14     if ! grep -q -e "^$USER" /etc/sudoers; then 
    15         echo "$USER     ALL=NOPASSWD: ALL" >> /etc/sudoers 
    16     fi 
    17     for group in disk camera scanner stb-admin adm; do 
    18         addgroup --system $group || true 
    19         adduser "$USER" $group 
    20     done 
    21 fi 
    22  
    23 # Configure bootsplash. We should have a working grub 
    24 # menu file now, if not it probably means that the user 
    25 # choose to skip the bootloader installation 
    26 GRUB_MENU=/boot/grub/menu.lst 
    27 if [ -e $GRUB_MENU ]; then 
    28     VGA_RES=791 
    29     KOPT=$(grep -e "^# kopt" /boot/grub/menu.lst | \ 
    30         sed -e 's/vga=[[:digit:]]\{3\}[[[:blank:]]\?//g'| \ 
    31         sed -e 's/silent=[[:digit:]]\{3\}[[[:blank:]]\?//g') 
    32     KOPT="$KOPT vga=$VGA_RES splash=silent" 
    33     sed -i -e "s|^# kopt=.*|$KOPT|g" $GRUB_MENU 
    34     update-grub 
    35 fi 
    36  
    37 # Disable services 
    38 SERVICES="samba rsync bittorrent nfs-common anacron cron" 
    39 for SERVICE in $SERVICES; do 
    40     update-rc.d -f $SERVICE remove 
    41 done 
    42  
    43 # Load snd-seq at boot 
    44 if [ -e /etc/modules ]; then 
    45     if ! grep -q snd-seq /etc/modules; then 
    46         echo snd-seq >>  /etc/modules 
    47     fi 
    48 fi 
    49  
    50 # If network is available, run apt-get update, otherwise 
    51 # comment the source list 
    52 APT_SOURCE=/etc/apt/sources.list.d/64studio.list 
    53 if ! [ -e /proc/net/route ]; then 
    54         mount /proc 
    55 fi 
    56 if route -n | grep -q ^0.0.0.0; then 
    57     apt-get update || sed -i -e 's/^deb /#deb /g' $APT_SOURCE 
    58  
    59     # Comment the cdrom source, we install from the internet 
    60     if [ -e /etc/apt/sources.list ]; then 
    61         sed -i -e 's/^\(deb cdrom:.*\)/#\1/g' /etc/apt/sources.list 
    62     fi 
    63 else 
    64     sed -i -e 's/^deb /#deb /g' $APT_SOURCE 
    65 fi 
     13cdd-config sudoers $USER 
     14cdd-config groups  $USER 
     15cdd-config bootsplash 791 
     16cdd-config services anacron bittorrent cron nfs-common rsync samba 
     17cdd-config modules snd-seq 
     18cdd-config apt 64studio 
    6619 
    6720# Make sure the .desktop is up-to-date