Author: freetz Date: Sun Dec 4 20:14:19 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- misc fixes
---- Files affected:
SOURCES:
scribes-desktop.patch (NONE -> 1.1) (NEW), scribes-schemas.patch (NONE ->
1.1) (NEW), scribes-setup.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/scribes-desktop.patch
diff -u /dev/null SOURCES/scribes-desktop.patch:1.1
--- /dev/null Sun Dec 4 21:14:19 2005
+++ SOURCES/scribes-desktop.patch Sun Dec 4 21:14:14 2005
@@ -0,0 +1,18 @@
+diff -aurN scribes-0.2.2.orig/data/scribes.desktop
scribes-0.2.2/data/scribes.desktop
+--- scribes-0.2.2.orig/data/scribes.desktop 2005-11-21 18:48:47.000000000
+0100
++++ scribes-0.2.2/data/scribes.desktop 2005-12-04 20:43:46.000000000 +0100
+@@ -1,10 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Scribes Text Editor
++Name[pl]=Edytor tekstu Scribes
+ Exec=scribes %f
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+ MimeType=text/plain;
+-Icon=scribes.svg
+-Categories=Application;Utility;TextEditor;
+\ Brak znaku nowej linii na końcu pliku
++Icon=scribes
++Categories=GTK;GNOME;;Utility;TextEditor;
================================================================
Index: SOURCES/scribes-schemas.patch
diff -u /dev/null SOURCES/scribes-schemas.patch:1.1
--- /dev/null Sun Dec 4 21:14:19 2005
+++ SOURCES/scribes-schemas.patch Sun Dec 4 21:14:14 2005
@@ -0,0 +1,13 @@
+diff -aurN scribes-0.2.2.orig/data/scribes.schemas
scribes-0.2.2/data/scribes.schemas
+--- scribes-0.2.2.orig/data/scribes.schemas 2005-11-14 10:55:17.000000000
+0100
++++ scribes-0.2.2/data/scribes.schemas 2005-12-04 21:10:09.000000000 +0100
+@@ -109,7 +109,8 @@
+ <applyto>/apps/scribes/encoding</applyto>
+ <owner>Scribes</owner>
+ <type>list</type>
+- <default>[]</default>
++ <list_type>string</list_type>
++ <default>[none]</default>
+ <locale name="C">
+ <short>Selected encodings</short>
+ <long>
================================================================
Index: SOURCES/scribes-setup.patch
diff -u /dev/null SOURCES/scribes-setup.patch:1.1
--- /dev/null Sun Dec 4 21:14:19 2005
+++ SOURCES/scribes-setup.patch Sun Dec 4 21:14:14 2005
@@ -0,0 +1,101 @@
+diff -aurN scribes-0.2.2.orig/setup.py scribes-0.2.2/setup.py
+--- scribes-0.2.2.orig/setup.py 2005-12-01 07:10:39.000000000 +0100
++++ scribes-0.2.2/setup.py 2005-12-04 20:41:11.000000000 +0100
+@@ -89,36 +89,6 @@
+ print "You need GNOME Python version 2.12 or later to run Scribes"
+ exit(1)
+
+- try:
+-
+- import gtksourceview
+-
+- except ImportError:
+-
+- print "You need the gtksourceview module in GNOME Python Extras
version"
+- print " 2.12 or later to run Scribes."
+- exit(1)
+-
+- try:
+-
+- import gtkspell
+-
+- except ImportError:
+-
+- print "You need the gtkspell module in GNOME Python Extras
version"
+- print " 2.12 or later to run Scribes."
+- exit(1)
+-
+- # Check to see if Yelp is installed on the host system
+-
+- cmd = "which yelp"
+- err, out = getstatusoutput(cmd)
+-
+- if err:
+-
+- print "You need Yelp version 2.12 or later to run Scribes."
+- exit(1)
+-
+ # Check to see if GConf is installed on the host system
+
+ cmd = "which gconftool-2"
+@@ -175,7 +145,7 @@
+ data_files=[
+ ("share/applications", ["data/scribes.desktop"]),
+ ("share/application-registry", ["data/scribes.application"]),
+- ("share/pixmaps", ["data/scribes.svg"]),
++ ("share/pixmaps", ["data/scribes.png"]),
+ ("share/scribes/", ["data/scribes_toolbar_ui.xml"]),
+ ("share/gnome/help/scribes/C", ["data/scribes.xml"]),
+ ("share/gnome/help/scribes/C", ["data/legal.xml"]),
+@@ -190,51 +160,3 @@
+ ],
+ scripts=["scribes"],)
+
+-
+-################################################################################
+-#
+-# GConf Installation
+-#
+-################################################################################
+-
+-# Get gconf's default source
+-
+-cmd = "gconftool-2 --get-default-source"
+-err, out = getstatusoutput(cmd)
+-
+-# Set up the gconf environment variable.
+-
+-putenv('GCONF_CONFIG_SOURCE', out)
+-
+-# Install gconf to the default source
+-
+-cmd = "gconftool-2 --makefile-install-rule data/scribes.schemas"
+-err, out = getstatusoutput(cmd)
+-
+-if out:
+-
+- print "installing GConf schema files"
+-
+-if err:
+-
+- print 'Error: installation of gconf schema files failed: %s' % out
+-
+-# Kill the GConf daemon
+-
+-cmd = "killall gconfd-2"
+-err, out = getstatusoutput(cmd)
+-
+-if err:
+-
+- print "Problem shutting down gconf."
+-
+-# Start the GConf daemon
+-
+-cmd = "gconftool-2 --spawn"
+-err, out = getstatusoutput(cmd)
+-
+-if err:
+-
+- print "Problem restarting down gconf."
+-
+-print "scribes installation complete"
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
