Changeset 2

Timestamp:

01/23/07 10:38:27 (23 months ago)

Author:

free

Message:

releasing version 0.9.8

Location:

64studio/trunk

Files:

• debian/64studio-themes.postinst (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (2 diffs)
• tasksel-data/64studio-tasks.desc (modified) (8 diffs)
• themes/icons/ardour-gtk.png (moved) (moved from 64studio/trunk/themes/icons/ardour.png)
• utils/64studio-config (modified) (1 diff)
• utils/64studio-upgrade (modified) (1 diff)

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

@@ -22 +22 @@
 case "$1" in
     configure)
-
-    # Add ardour icon
-    ARDOUR=/usr/share/applications/ardour-gtk.desktop
-    if ! grep -q "Icon=" $ARDOUR; then
-        echo "Icon=/usr/share/icons/ardour.png" >> $ARDOUR
-    fi
 
     # Place Bluefish in graphics
@@ -112 +106 @@
 # generated by other debhelper scripts.
 
-#DEBHELPER#
+# Automatically added by dh_gconf
+if [ "$1" = "configure" ] && which update-gconf-defaults >/dev/null 2>&1; then
+        update-gconf-defaults
+fi
+# End automatically added section
+
 
 exit 0

64studio/trunk/debian/changelog

@@ +1 @@
+64studio (0.9.8) unstable; urgency=low
+
+  * Fixed syntax error in 64studio-config
+
+ -- Free Ekanayaka <free@64studio.com>  Wed, 22 Nov 2006 20:26:21 +0100
+
+64studio (0.9.7) unstable; urgency=low
+
+  * Comment apt sources if the network is not present at
+    install time (closes #214)
+  * Added dummy 64studio package to be used for upgrades
+  * Clean up upgrade script (it should not be used, but
+    just in case we need a hook)
+
+ -- Free Ekanayaka <free@64studio.com>  Wed, 22 Nov 2006 20:15:05 +0100
+
+64studio (0.9.6) unstable; urgency=low
+
+  * Do not exit the config script with an error if apt-get
+    update fails (closes #259)
+  * Added pnm2ppa (closes #260)
+  * Removed dependency of the themes package on ardour-gtk
+  
+ -- Free Ekanayaka <free@64studio.com>  Mon, 20 Nov 2006 12:57:05 +0100
+
+64studio (0.9.5) unstable; urgency=low
+
+  * Fixed type in tasksel list (usb-view -> usbview)
+  * Added dcraw (closes #251)
+  * Don't modify ardour desktop file, it has been fixed in the
+    debian package
+  * Added mesa-utils and libgl1-mesa-dri (closes #242)
+  * Re-added kino, re-built from Ubuntu sources (closes #151)
+  * Added aspell, myspell, firefox and thunderbird locales for
+    German, French, Spanish and Italien (closes #240)
+  * Make sure that /proc is mounted before checking the network
+    at install time (closes #214)
+
+ -- Free Ekanayaka <free@64studio.com>  Mon,  2 Oct 2006 08:51:48 +0200
+
 64studio (0.9.4) unstable; urgency=low
 

64studio/trunk/debian/control

@@ -5 +5 @@
 Build-Depends: debhelper (>= 4.0.0)
 Standards-Version: 3.6.1
+
+Package: 64studio
+Architecture: all
+Depends: 64studio-utils, 64studio-tasksel-data, 64studio-skel, 64studio-themes, 64studio-apt
+Description: 64 Studio dummy package
+ This package is only meant for upgrades
 
 Package: 64studio-utils
@@ -29 +35 @@
 Package: 64studio-themes
 Architecture: all
-Depends: backgrounds, gnome-themes, polymer, ardour-gtk, bluefish, bug-buddy,
+Depends: backgrounds, gnome-themes, polymer, bluefish, bug-buddy,
  qjackctl,  evince, gnome-media, rosegarden4, timemachine, gnome-menus, gimp,
  xpad, tagtool, eog, kcontrol, grub

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

@@ -6 +6 @@
 Test-new-install: install skip
 Packages: list
+ 64studio
  64studio-apt
  64studio-skel
@@ -94 +95 @@
  cupsys-client
  cupsys-driver-gimpprint
+ pnm2ppa
  printconf
 
@@ -107 +109 @@
  gsfonts
  laptop-detect
+ libgl1-mesa-dri
  mdetect
+ mesa-utils
  ttf-freefont
  ttf-bitstream-vera
@@ -155 +159 @@
  cinepaint
  dia
+ dcraw
  foomatic-db-gimp-print
  gimp
@@ -165 +170 @@
  imagemagick
  inkscape
+ kino
  ktoon
  libwmf-bin
@@ -247 +253 @@
  aspell
  aspell-en
+ aspell-de
+ aspell-es
+ aspell-fr
+ aspell-it
  myspell-en-gb
+ myspell-de-de
+ myspell-es
+ myspell-fr
+ myspell-it
 
 Task: desktop
@@ -262 +276 @@
  firefox
  firefox-locale-en-gb
+ firefox-locale-de
+ firefox-locale-es-es
+ firefox-locale-fr
+ firefox-locale-it
  gnome-core
  gnome-utils
@@ -276 +294 @@
  thunderbird
  thunderbird-locale-en-gb
- usb-view
+ thunderbird-locale-de
+ thunderbird-locale-es-es
+ thunderbird-locale-fr
+ thunderbird-locale-it
+ usbview
  xpad
 

64studio/trunk/utils/64studio-config

@@ -48 +48 @@
 fi
 
-# If network is available, run apt-get update
+# If network is available, run apt-get update, otherwise
+# comment the source list
+APT_SOURCE=/etc/apt/sources.list.d/64studio.list
+if ! [ -e /proc/net/route ]; then
+        mount /proc
+fi
 if route -n | grep -q ^0.0.0.0; then
-    apt-get update
+    apt-get update || sed -i -e 's/^deb /#deb /g' $APT_SOURCE
+else
+    sed -i -e 's/^deb /#deb /g' $APT_SOURCE
 fi
+

64studio/trunk/utils/64studio-upgrade

@@ -1 +1 @@
 #!/bin/sh
 
-UNWANTED="\
-    at \
-    cinepaint \
-    courier-mta \
-    cron \
-    exim4 \
-    exim4-base \
-    exim4-config \
-    exim4-daemon-light \
-    fluxbox \
-    grip \
-    k3b \
-    kfilereplace \
-    klinkstatus \
-    kommander \
-    quanta \
-    nvu \
-    toolame \
-    xmms \
-    xmms-jack \
-    zynaddsubfx \
-"
-EXTRA=
-
-# Add xorg here as it hits etch
-for TASK in base kernel 64studio; do
-    EXTRA="$EXTRA $(tasksel --task-packages $TASK)"
-done
-
-echo SET debconf/priority high | debconf-communicate > /dev/null 2>&1
-
-apt-get install -y aptitude libsigc++-1.2-5c2
 apt-get dist-upgrade -y
-dpkg --force-all --purge xorg-common
-apt-get dist-upgrade -y
-apt-get install -f -y
-apt-get dist-upgrade -y
-apt-get install -f -y
-apt-get dist-upgrade -y
-aptitude remove -y $UNWANTED
-aptitude install -y $EXTRA
-
-apt-get install alsa-modules-2.6.13-1-multimedia-amd64-generic
-apt-get install ia32-libs
-
-CFG=/etc/bootsplash/themes/current/config/bootsplash-1024x768.cfg
-INITRD=/boot/initrd.img-2.6.13-1-multimedia-amd64-generic
-
-if [ -e $CFG ]; then
-        if [ -e $INITRD.orig ] ; then
-                mv $INITRD.orig $INITRD
-        fi
-        cp $INITRD $INITRD.orig
-        splash -s -f $CFG >> $INITRD
-fi
-
-SYSV="rc rcS"
-for RC in $SYSV; do
-        if [ -e /etc/init.d/$RC.orig ]; then
-                mv /etc/init.d/$RC.orig /etc/init.d/$RC
-        fi
-done
-
-/var/lib/dpkg/info/sysv-rc-bootsplash.postinst configure