[Trisquel-devel] Rev 6: Final updates and artwork for brigantia RC in file:///home/systems/makeiso/
Ruben Rodriguez
ruben at trisquel.info
Thu Apr 5 05:04:17 CEST 2012
At file:///home/systems/makeiso/
------------------------------------------------------------
revno: 6
revision-id: ruben en trisquel.info-20120405030358-r8k6yj4lty415e2w
parent: root en devel.trisquel.info-20120312154037-jj4c9vk44u51asbb
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: makeiso
timestamp: Thu 2012-04-05 05:03:58 +0200
message:
Final updates and artwork for brigantia RC
------------ pr�xima parte ------------
=== modified file 'files/artwork/brigantia/back-fsf.jpg'
Binary files a/files/artwork/brigantia/back-fsf.jpg 2012-03-12 02:17:23 +0000 and b/files/artwork/brigantia/back-fsf.jpg 2012-04-05 03:03:58 +0000 differ
=== modified file 'files/artwork/brigantia/back.jpg'
Binary files a/files/artwork/brigantia/back.jpg 2012-03-12 02:17:23 +0000 and b/files/artwork/brigantia/back.jpg 2012-04-05 03:03:58 +0000 differ
=== modified file 'files/artwork/brigantia/grub-fsf.png'
Binary files a/files/artwork/brigantia/grub-fsf.png 2012-03-12 02:17:23 +0000 and b/files/artwork/brigantia/grub-fsf.png 2012-04-05 03:03:58 +0000 differ
=== added file 'files/artwork/brigantia/grub.png'
Binary files a/files/artwork/brigantia/grub.png 1970-01-01 00:00:00 +0000 and b/files/artwork/brigantia/grub.png 2012-04-05 03:03:58 +0000 differ
=== modified file 'files/triskel.cfg'
--- a/files/triskel.cfg 2011-11-15 01:02:07 +0000
+++ b/files/triskel.cfg 2012-04-05 03:03:58 +0000
@@ -7,10 +7,6 @@
menu label ^Install Triskel
kernel /casper/vmlinuz
append file=/cdrom/preseed/trisquel.seed initrd=/casper/initrd boot=casper only-ubiquity splash quiet noprompt --
-label netinst
- menu label ^Install Triskel in text mode
- kernel /casper/vmlinuz
- append initrd=/casper/initrd.netinst --
label check
menu label ^Check disc for defects
kernel /casper/vmlinuz
=== added file 'files/user-settings.conf'
--- a/files/user-settings.conf 1970-01-01 00:00:00 +0000
+++ b/files/user-settings.conf 2012-04-05 03:03:58 +0000
@@ -0,0 +1,157 @@
+{
+ "pronunciations": {},
+ "keybindings": {},
+ "profiles": {
+ "default": {
+ "profile": [
+ "Default",
+ "default"
+ ],
+ "pronunciations": {},
+ "keybindings": {}
+ }
+ },
+ "general": {
+ "speakCellHeaders": true,
+ "magEdgeMargin": 0,
+ "brailleContractionTable": "",
+ "magPointerFollowsFocus": false,
+ "magTextTrackingMode": 2,
+ "magZoomerBorderSize": 1,
+ "brailleAlignmentStyle": 0,
+ "enableEchoByWord": false,
+ "enableMagZoomerColorInversion": false,
+ "magCursorSize": 32,
+ "magSmoothingMode": 0,
+ "magZoomerLeft": 840,
+ "showMainWindow": true,
+ "sayAllStyle": 1,
+ "brailleSelectorIndicator": 192,
+ "presentDateFormat": "%x",
+ "magContrastLevel": 0,
+ "magMouseTrackingMode": 0,
+ "speakCellSpan": true,
+ "progressBarUpdateInterval": 10,
+ "speakCellCoordinates": true,
+ "enablePauseBreaks": true,
+ "brailleEOLIndicator": " ",
+ "verbalizePunctuationStyle": 1,
+ "progressBarVerbosity": 1,
+ "enableSpeech": true,
+ "enableBraille": false,
+ "mouseDwellDelay": 0,
+ "enableBrailleGrouping": false,
+ "readTableCellRow": true,
+ "activeProfile": [
+ "Default",
+ "default"
+ ],
+ "textAttributesBrailleIndicator": 0,
+ "enableMagCursorExplicitSize": false,
+ "messageVerbosityLevel": 1,
+ "enableMagLiveUpdating": true,
+ "enableSpeechIndentation": false,
+ "enableKeyEcho": false,
+ "magHideCursor": false,
+ "magZoomerBorderColor": "#000000",
+ "magBrightnessLevelRed": 0,
+ "enableMagnifier": false,
+ "magZoomFactor": 4.0,
+ "speechServerFactory": "speechdispatcherfactory",
+ "enableMagZoomerBorder": false,
+ "flashVerbosityLevel": 1,
+ "enableFlashMessages": true,
+ "speechServerInfo": null,
+ "presentToolTips": false,
+ "flashIsPersistent": false,
+ "brailleRequiredStateString": "required",
+ "firstStart": false,
+ "largeObjectTextLength": 75,
+ "enableEchoBySentence": true,
+ "magContrastLevelBlue": 0,
+ "magContrastLevelRed": 0,
+ "enableContractedBraille": false,
+ "orcaModifierKeys": [
+ "Insert",
+ "KP_Insert"
+ ],
+ "enableMagCursor": true,
+ "speechRequiredStateString": "required",
+ "chatAnnounceBuddyTyping": false,
+ "quitOrcaNoConfirmation": false,
+ "magPointerFollowsZoomer": true,
+ "magCursorColor": "#000000",
+ "enablePositionSpeaking": false,
+ "magZoomerType": 0,
+ "onlySpeakDisplayedText": false,
+ "enableProgressBarUpdates": true,
+ "wrappedStructuralNavigation": true,
+ "chatRoomHistories": false,
+ "brailleVerbosityLevel": 1,
+ "enableFunctionKeys": true,
+ "skipBlankCells": false,
+ "enableModifierKeys": true,
+ "magCrossHairColor": "#000000",
+ "enableTutorialMessages": false,
+ "enableActionKeys": true,
+ "speakBlankLines": true,
+ "magColorFilteringMode": 0,
+ "magZoomerRight": 1680,
+ "keyboardLayout": 1,
+ "magTargetDisplay": "",
+ "disableBrailleEOL": false,
+ "magZoomerTop": 0,
+ "magSourceDisplay": "",
+ "enableDiacriticalKeys": false,
+ "enableMnemonicSpeaking": false,
+ "magContrastLevelGreen": 0,
+ "speechVerbosityLevel": 1,
+ "enableMagCrossHair": true,
+ "enableBrailleMonitor": false,
+ "voices": {
+ "default": {
+ "established": false
+ },
+ "uppercase": {
+ "average-pitch": 5.6
+ },
+ "system": {
+ "established": false
+ },
+ "hyperlink": {
+ "established": false
+ }
+ },
+ "enabledBrailledTextAttributes": "size:; family-name:; weight:400; indent:0; underline:none; strikethrough:false; justification:left; style:normal; text-spelling:none;",
+ "brailleFlashTime": 5000,
+ "magCrossHairSize": 16,
+ "enableMouseReview": false,
+ "enableNavigationKeys": false,
+ "magBrightnessLevelGreen": 0,
+ "chatSpeakRoomName": false,
+ "profile": [
+ "Default",
+ "default"
+ ],
+ "startingProfile": [
+ "Default",
+ "default"
+ ],
+ "enableLockingKeys": true,
+ "speakMultiCaseStringsAsWords": false,
+ "brailleRolenameStyle": 1,
+ "brailleLinkIndicator": 192,
+ "enableEchoByCharacter": false,
+ "magBrightnessLevelBlue": 0,
+ "enableBrailleContext": true,
+ "magControlTrackingMode": 2,
+ "magZoomerBottom": 1050,
+ "enablePrintableKeys": true,
+ "enabledSpokenTextAttributes": "size:; family-name:; weight:400; indent:0; underline:none; strikethrough:false; justification:left; style:normal; paragraph-style:; text-spelling:none;",
+ "chatMessageVerbosity": 0,
+ "presentTimeFormat": "%X",
+ "magBrightnessLevel": 0,
+ "presentRequiredState": false,
+ "enableMagCrossHairClip": false
+ }
+}
=== modified file 'makeiso.sh'
--- a/makeiso.sh 2012-03-12 15:40:37 +0000
+++ b/makeiso.sh 2012-04-05 03:03:58 +0000
@@ -342,6 +342,7 @@
echo "-- CLEANING UP ---------------------------------------------------------------"
+$C apt-get remove -y --force-yes --purge humanity-icon-theme || true
umount $CHROOT/proc
umount $CHROOT/dev/pts
@@ -402,6 +403,13 @@
## GDM #######################################################################
+if [ $DIST = "trisquel" ]
+then
+mkdir -p $CHROOT/var/lib/gdm/.local/share/orca/
+cp files/user-settings.conf $CHROOT/var/lib/gdm/.local/share/orca/
+fi
+
+
if [ $DIST = "trisquel-sugar" ]
then
@@ -577,20 +585,12 @@
$C dpkg -l|grep ^ii |awk '{print $2" "$3}' > master/casper/filesystem.manifest
df -B 1 $CHROOT |tail -n1|awk '{print $3}' > master/casper/filesystem.size
[ $i18n = "true" ] && du -bc $CHROOT |tail -n 1|cut -f1 > master/casper/filesystem.size
-sed -i '/^language-pack/d;
-/^language-support/d;
-/^hunspell/d;
-/^myspell/d;
-/^openoffice.org-hyphenation/d;
-/^openoffice.org-thesaurus/d;
-/^ubiquity/d;
-/^rdate/d;
-/^localechooser-data/d;
-/casper/d;
-/^user-setup/d;
-/^gparted/d;
-/^libdebconfclient0/d;
-/^libdebian-installer/d;' master/casper/filesystem.manifest
+
+for i in ubiquity language-pack language-support hunspell myspell libreoffice-hyphenation libreoffice-thesaurus rdate localechooser-data casper user-setup gparted libdebconfclient0 libdebian-installer abrowser-locale
+do
+grep $i master/casper/filesystem.manifest >> master/casper/filesystem.manifest-remove
+done
+
}
More information about the Trisquel-devel
mailing list