[debian-edu-commits] debian-edu/ 92/183: Changed package to cope with conversion script
Alexander Alemayhu
ccscanf-guest at moszumanska.debian.org
Wed Jun 11 16:48:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.
commit eb831646d2a66eead96451ed04f6ea693af58643
Author: Bart Cornelis <cobaco at linux.be>
Date: Sat Oct 1 13:36:40 2005 +0000
Changed package to cope with conversion script
Added translations send in through BTS
---
README | 23 +++++-----
TODO | 6 ++-
debian/config | 2 +-
debian/listing | 8 ++--
debian/po/cs.po | 104 ++++++++++++++++++++++++++++++++++++++++++++
debian/po/fr.po | 110 ++++++++++++++++++++++++++++-------------------
debian/po/nl.po | 112 +++++++++++++++++++++++-------------------------
debian/po/pt_PT.po | 99 ++++++++++++++++++++++++++++++++++++++++++
debian/po/templates.pot | 66 ++++++++++++----------------
debian/po/vi.po | 106 +++++++++++++++++++++++++++------------------
debian/postinst | 14 +++++-
debian/preinst | 6 +++
debian/templates | 40 +++++++++--------
path2listing | 98 +++++++-----------------------------------
path2listing.1 | 8 ++--
15 files changed, 496 insertions(+), 306 deletions(-)
diff --git a/README b/README
index 0a98cd4..96a0e1b 100644
--- a/README
+++ b/README
@@ -27,17 +27,20 @@ way without having to mess with the conffile of another package (gconf2).
To get gconf profiles managed by desktop-profiles to work the system-wide
gconf path file (/etc/gconf/2/path) needs to include the following 2 directives
- include $(ENV_MANDATORY_PATH)
- include $(ENV_DEFAULTS_PATH)
-respectively before and after any user-controlled sources are included, which
-is enough to have sources controlled by desktop-profiles work.
-Of course only including those directives leaves you with 2 ways of managing
-gconf profiles (desktop-profiles, and hacking the path file manually), what you
-really want is to have all gconf profiles managed by desktop-profiles. In order
-to facilitate getting there, this package provides a conversion script
+'include $(ENV_MANDATORY_PATH)' and 'include $(ENV_DEFAULTS_PATH)' respectively
+before and after any user-controlled sources are included.
+
+Inclusion of the above two directives is the minimal change needed for
+configuration sources managed by desktop-profiles to work. But only adding
+these directives is suboptimal as it leaves you with 2 ways of managing gconf
+profiles (through desktop-profiles, and by hacking the path file manually).
+What you really want is to have all configuration sources managed by this
+package.
+
+To facilitate getting there, this package provides a conversion script
(/usr/sbin/path2listing) that will setup the necessary metadata for all your
-currently present gconf configuration sources, and change the systemwide gconf
-path file to the ideal (from this packages viewpoint in any case) state.
+currently used configuration sources, and that will change the systemwide gconf
+path file to the recommended state.
Running the conversion script doesn't result in any user-visible changes (if it
does there's a bug), still the script will make a backup of the current path
diff --git a/TODO b/TODO
index 1e8edc4..9d65159 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,13 @@
+Next Revision:
- Find out why the profile-manager.kmdr script doesn't work with the KDE 3.4 kommander package
+ -> done, new script needs to be checked on 3.3
+
- Find docs on the kiosk system of XFCE 4.2 available, sofar all I've found is
-> panel: http://www.loculus.nl/xfce/documentation/docs-4.2/xfce4-panel.html#panel-kiosk
-> xfce4-session:
- switch debian-edu-config + desktop-base to use desktop-profiles
-- talk to gconf-maintainers, to have gconf support this package
+- talk to gconf-maintainers, to have gconf support for this package built-in
(current system-wide gconf path file needs replacing with the one from this package)
- -> in progress see bug #310065
- build usefull (example) profiles and point to them in docu (for accessibility?)
- make call for translation + add translations to package
diff --git a/debian/config b/debian/config
index 51a09af..2c10822 100755
--- a/debian/config
+++ b/debian/config
@@ -4,7 +4,7 @@
. /usr/share/debconf/confmodule
# if gconf path file is present and doesn't include the generated path file
-# then ask the user wether to activate gnome profiles (defaults to no)
+# then ask the user whether to activate gnome profiles (defaults to no)
if (test -e /etc/gconf/2/path) ; then
if ! ( (grep '/var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/2/path > /dev/null) ||
(grep '/var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/2/path > /dev/null) ); then
diff --git a/debian/listing b/debian/listing
index 812f209..30160df 100644
--- a/debian/listing
+++ b/debian/listing
@@ -12,6 +12,9 @@
# (NOTE: if the ROX profile with the highest precedence isn't writeable
# there could be problems)
#
+# NOTE: to activate gnome profiles you need to run the path2listing script
+# included in this package
+#
# See the desktop-profiles (7) man page for details about the format of this
# file, and how it will be used
################################################################################
@@ -29,8 +32,3 @@ gnustep-user-domain;GNUSTEP;${GNUSTEP_USER_ROOT};30;;Default location of user do
gnustep-local-domain;GNUSTEP;${GNUSTEP_LOCAL_ROOT};20;;Default location of local domain, evaluates to /usr/local/lib/GNUstep/Local by default
gnustep-network-domain;GNUSTEP;${GNUSTEP_NETWORK_ROOT};10;;Default location of network domain, evaluates to /usr/local/lib/GNUstep/Network by default
gnustep-system-domain;GNUSTEP;${GNUSTEP_SYSTEM_ROOT};0;;Default location of system domain, evaluates to /usr/lib/GNUstep/System by default
-
-gconf-mandatory;GCONF;xml:readonly:/etc/gconf/gconf.xml.mandatory;100;;Configuration source with the mandatory system-wide settings
-gconf-user-path;GCONF;include "$(HOME)/.gconf.path";50;;The normal user configuration source
-gconf-user;GCONF;xml:readwrite:$(HOME)/.gconf;0;;The normal user configuration source
-gconf-defaults;GCONF;xml:readonly:/etc/gconf/gconf.xml.defaults;-50;;Configuration source with the default systemwide settings
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 0000000..f3cbc4b
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,104 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: desktop-profiles\n"
+"Report-Msgid-Bugs-To: cobaco at linux.be\n"
+"POT-Creation-Date: 2005-10-01 15:07+0200\n"
+"PO-Revision-Date: 2005-06-25 14:43+0200\n"
+"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+"configuration sources managed by desktop-profiles. The system wide path file "
+"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
+"work."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"This package includes a conversion script (/usr/sbin/path2listing) that wil "
+"create the necessary changes to have all your configuration sources managed "
+"by desktop-profiles. Running this script should not result in user-visible "
+"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
+"for more information on this script, or for info on changing the path file "
+"manually."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:18
+msgid "Global gconf path file needs to be changed!"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:18
+msgid ""
+"The include directives used by desktop-profiles have changed (in response "
+"to bug 309978, see the bug report and corresponding entry in the changelog "
+"of version 1.4.6 of this package for details)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:18
+msgid ""
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows: "
+"- 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
+"'include *\\$(ENV_MANDATORY_PATH)' - and 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include *\\$(ENV_DEFAULTS_PATH)'"
+msgstr ""
+
+#~ msgid "Replace the default system-wide 'path' file?"
+#~ msgstr "Nahradit systémový soubor 'path'?"
+
+#~ msgid ""
+#~ "The default gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "profiles for certain groups only. The approach used by this package does. "
+#~ "To have gconf use the approach of this package the system-wide gconf "
+#~ "'path' file needs to be replaced by one provided by this package."
+#~ msgstr ""
+#~ "Výchozí nastavení gconfu (t.j. GNOME) nevyužívá možnosti mít profily "
+#~ "pouze pro určité skupiny. Tento balíček ano. Aby gconf používal stejný "
+#~ "přístup jako tento balíček, musí se nahradit systémový gconf soubor "
+#~ "'path' verzí z tohoto balíku."
+
+#~ msgid ""
+#~ "Doing so won't change the default behaviour of gconf but it will allow "
+#~ "the subsequent installation and activation of gconf profiles. Thus it is "
+#~ "recommended that you let me replace the default system-wide gconf 'path' "
+#~ "file."
+#~ msgstr ""
+#~ "Tím se nezmění výchozí chování gconfu, ale umožní následnou instalaci a "
+#~ "konfiguraci gconf profilů. Proto doporučujeme systémový gconf soubor "
+#~ "'path' nahradit."
+
+#~ msgid ""
+#~ "You can always do this later by running `dpkg-reconfigure desktop-"
+#~ "profiles', or by manually replacing /etc/gconf/<gconf-version>/path with /"
+#~ "usr/share/doc/desktop-profiles/examples/path."
+#~ msgstr ""
+#~ "To můžete učinit kdykoliv později příkazem `dpkg-reconfigure desktop-"
+#~ "profiles', nebo ručním nahrazením /etc/gconf/<verze-gconfu>/path "
+#~ "souborem /usr/share/doc/desktop-profiles/examples/path."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 7ec4e80..9d0da11 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -12,8 +12,8 @@
msgid ""
msgstr ""
"Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-28 14:36+0200\n"
+"Report-Msgid-Bugs-To: cobaco at linux.be\n"
+"POT-Creation-Date: 2005-10-01 15:07+0200\n"
"PO-Revision-Date: 2005-07-22 17:13+0200\n"
"Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org@traduc.org>\n"
@@ -24,40 +24,24 @@ msgstr ""
#. Type: note
#. Description
#: ../templates:3
-msgid "Global gconf path file needs to be changed!"
-msgstr "Fichier ��path�� de gconf chang� pour l'ensemble du syst�me"
-
-#. Type: note
-#. Description
-#: ../templates:3
msgid ""
"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles (either because you "
-"haven't made the necessary changes yet, or because you had a version "
-"previous to 1.4.6 of this package installed which used a different path-"
-"file). In order to rectify this situation your global gconf 'path' file (/"
-"etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata needed "
-"by desktop-profiles for your current configuration sources needs to be "
-"available."
+"configuration sources managed by desktop-profiles. The system wide path file "
+"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
+"work."
msgstr ""
-"Votre configuration actuelle de gconf (par exemple celle de GNOME) rend "
-"difficile l'utilisation de sources de configuration g�r�es par desktop-"
-"profiles (soit parce que vous n'avez pas encore fait les modifications "
-"n�cessaires, soit parce que la version utilis�e est ant�rieure � 1.4.6 et "
-"utilise un fichier ��path�� diff�rent). Pour corriger cela, le fichier "
-"��path�� utilis� pour l'ensemble du syst�me (/etc/gconf/<version-gconf>/"
-"path) doit �tre ajust�, et les m�tadonn�es dont a besoin desktop-profiles "
-"pour vos sources de configuration actuelles doivent �tre disponibles."
#. Type: note
#. Description
#: ../templates:3
+#, fuzzy
msgid ""
-"This package includes a conversion script that wil create the necessary "
-"metadata to have all your configuration sources managed by desktop-profiles "
-"(/usr/sbin/path2listing). It will also replace the global path file with one "
-"that is setup for managing all configuration sources through desktop-"
-"profiles."
+"This package includes a conversion script (/usr/sbin/path2listing) that wil "
+"create the necessary changes to have all your configuration sources managed "
+"by desktop-profiles. Running this script should not result in user-visible "
+"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
+"for more information on this script, or for info on changing the path file "
+"manually."
msgstr ""
"Ce paquet comporte un script de conversion qui va cr�er les m�tadonn�es "
"n�cessaires pour que toutes vos sources de configuration soient g�r�es par "
@@ -68,25 +52,65 @@ msgstr ""
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:18
+msgid "Global gconf path file needs to be changed!"
+msgstr "Fichier ��path�� de gconf chang� pour l'ensemble du syst�me"
+
+#. Type: note
+#. Description
+#: ../templates:18
msgid ""
-"Running this script shouldn't create any user-visible differences, it will "
-"allow you to manage all configuration sources through desktop-profiles. The "
-"script will make backup copies of all files it touches, so you can always go "
-"back to the previous situation."
+"The include directives used by desktop-profiles have changed (in response "
+"to bug 309978, see the bug report and corresponding entry in the changelog "
+"of version 1.4.6 of this package for details)."
msgstr ""
-"Le lancement de ce script ne procurera pas de diff�rence visible pour "
-"l'utilisateur. Mais il vous permettra de g�rer toutes les sources de "
-"configuration par l'interm�diaire de desktop-profiles. Le script effectuera "
-"des copies de sauvegarde de tous les fichiers qu'il va modifier, il vous "
-"sera donc toujours possible de revenir � la situation ant�rieure."
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:18
msgid ""
-"If you want to do the conversion manually this is off course possible, see /"
-"usr/share/doc/desktop-profiles/README for more information."
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows: "
+"- 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
+"'include *\\$(ENV_MANDATORY_PATH)' - and 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include *\\$(ENV_DEFAULTS_PATH)'"
msgstr ""
-"Vous pouvez faire cette conversion vous-m�me�; rapportez vous alors au "
-"fichier /usr/share/doc/desktop-profiles/README pour davantage d'informations."
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles (either because you "
+#~ "haven't made the necessary changes yet, or because you had a version "
+#~ "previous to 1.4.6 of this package installed which used a different path-"
+#~ "file). In order to rectify this situation your global gconf 'path' file (/"
+#~ "etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata "
+#~ "needed by desktop-profiles for your current configuration sources needs "
+#~ "to be available."
+#~ msgstr ""
+#~ "Votre configuration actuelle de gconf (par exemple celle de GNOME) rend "
+#~ "difficile l'utilisation de sources de configuration g�r�es par desktop-"
+#~ "profiles (soit parce que vous n'avez pas encore fait les modifications "
+#~ "n�cessaires, soit parce que la version utilis�e est ant�rieure � 1.4.6 et "
+#~ "utilise un fichier ��path�� diff�rent). Pour corriger cela, le fichier "
+#~ "��path�� utilis� pour l'ensemble du syst�me (/etc/gconf/<version-gconf>/"
+#~ "path) doit �tre ajust�, et les m�tadonn�es dont a besoin desktop-profiles "
+#~ "pour vos sources de configuration actuelles doivent �tre disponibles."
+
+#~ msgid ""
+#~ "Running this script shouldn't create any user-visible differences, it "
+#~ "will allow you to manage all configuration sources through desktop-"
+#~ "profiles. The script will make backup copies of all files it touches, so "
+#~ "you can always go back to the previous situation."
+#~ msgstr ""
+#~ "Le lancement de ce script ne procurera pas de diff�rence visible pour "
+#~ "l'utilisateur. Mais il vous permettra de g�rer toutes les sources de "
+#~ "configuration par l'interm�diaire de desktop-profiles. Le script "
+#~ "effectuera des copies de sauvegarde de tous les fichiers qu'il va "
+#~ "modifier, il vous sera donc toujours possible de revenir � la situation "
+#~ "ant�rieure."
+
+#~ msgid ""
+#~ "If you want to do the conversion manually this is off course possible, "
+#~ "see /usr/share/doc/desktop-profiles/README for more information."
+#~ msgstr ""
+#~ "Vous pouvez faire cette conversion vous-m�me�; rapportez vous alors au "
+#~ "fichier /usr/share/doc/desktop-profiles/README pour davantage "
+#~ "d'informations."
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 693e9b6..9b3c825 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,9 +14,9 @@
msgid ""
msgstr ""
"Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-28 14:36+0200\n"
-"PO-Revision-Date: 2005-06-02 19:13+0100\n"
+"Report-Msgid-Bugs-To: cobaco at linux.be\n"
+"POT-Creation-Date: 2005-10-01 15:07+0200\n"
+"PO-Revision-Date: 2005-10-01 15:07+0100\n"
"Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -27,75 +27,71 @@ msgstr ""
#. Type: note
#. Description
#: ../templates:3
-msgid "Global gconf path file needs to be changed!"
-msgstr "Het systeemwijde gconf 'path'-bestand dient aangepast te worden!"
+msgid "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of configuration sources managed by desktop-profiles. The system wide path file (/etc/gconf/2/path) needs to be changed to get such configuration sources to work."
+msgstr "Uw huidige gconf (i.e. GNOME) opzet ondersteund het gebruik van configuratiebronnen die door desktop-profiles beheerd worden niet. Het systeemwijde 'path'-bestand (/etc/gconf/2/path) dient aangepast te worden om zo'n configuratiebronnen te ondersteunen."
#. Type: note
#. Description
#: ../templates:3
-msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles (either because you "
-"haven't made the necessary changes yet, or because you had a version "
-"previous to 1.4.6 of this package installed which used a different path-"
-"file). In order to rectify this situation your global gconf 'path' file (/"
-"etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata needed "
-"by desktop-profiles for your current configuration sources needs to be "
-"available."
-msgstr ""
-"Uw huidige gconf (en dus Gnome) instellingen ondersteunen geen door desktop-"
-"profiles beheerde configuratiebronnen. (of omdat u de nodige aanpassingen "
-"nog niet gedaan heeft; of omdat u een versie van dit pakket eerder dan 1.4.6 "
-"geinstalleerd had, deze gebruikte een ander 'path'-bestand). Om gebruik van "
-"door desktop-profiles beheerde configuratiebronnen mogelijk te maken dient "
-"enerzijds uw systeemwijde gconf 'path'-bestand aangepast te worden, en "
-"anderzijds de door desktop-profiles benodigde metadata betreffende de door "
-"dit bestand gebruikte configuratiebronnen beschikbaar gemaakt te worden."
+msgid "This package includes a conversion script (/usr/sbin/path2listing) that wil create the necessary changes to have all your configuration sources managed by desktop-profiles. Running this script should not result in user-visible changes to the system. See the README in /usr/share/doc/desktop-profiles/ for more information on this script, or for info on changing the path file manually."
+msgstr "Dit pakket bevat een conversie-script (/usr/sbin/path2listing) dat de veranderingen nodig om alle uw configuratiebronnen via desktop-profiles te beheren uitvoerd. Het uitvoeren van dit script heeft geen voor gewone gebruikers zichtbare gevolgen. Zie het 'README'-bestand in de map /usr/share/doc/desktop-profiles/ voor meer informatie over dit script, of informatie over hoe het 'path'-bestand handmatig aan te passen."
#. Type: note
#. Description
-#: ../templates:3
-msgid ""
-"This package includes a conversion script that wil create the necessary "
-"metadata to have all your configuration sources managed by desktop-profiles "
-"(/usr/sbin/path2listing). It will also replace the global path file with one "
-"that is setup for managing all configuration sources through desktop-"
-"profiles."
-msgstr ""
-"Dit pakket bevat een conversie-script. Het script (/usr/sbin/path2listing) "
-"genereert de metadata die nodig is om alle configuratiebronnen te beheren "
-"via desktop-profiles, en vervangt het globale 'path'-bestand met een 'path'-"
-"bestand dat reflecteerd dat alle configuratiebronnen beheerd worden via "
-"desktop-profiles."
+#: ../templates:18
+msgid "Global gconf path file needs to be changed!"
+msgstr "Het systeemwijde gconf 'path'-bestand dient aangepast te worden!"
#. Type: note
#. Description
-#: ../templates:3
-msgid ""
-"Running this script shouldn't create any user-visible differences, it will "
-"allow you to manage all configuration sources through desktop-profiles. The "
-"script will make backup copies of all files it touches, so you can always go "
-"back to the previous situation."
-msgstr ""
-"Het uitvoeren van dit script geeft geen voor gebruikers zichtbare "
-"veranderingen, maar laat u toe om alle configuratiebronnen te beheren via "
-"desktop-profiles. Dit script maakt een reservekopie van alle bestanden waar "
-"het veranderingen in aanbrengt, u kunt dus altijd terug naar de vorige "
-"situatie."
+#: ../templates:18
+msgid "The include directives used by desktop-profiles have changed (in response to bug 309978, see the bug report and corresponding entry in the changelog of version 1.4.6 of this package for details)."
+msgstr "De door dit pakket gebruikte include-ingangen zijn veranderd (in opvolging van bug #309978, zie het bugrapport, of de overeenkomstige ingang in het changelog van versie 1.4.6 van dit pakket voor meer informatie)."
#. Type: note
#. Description
-#: ../templates:3
-msgid ""
-"If you want to do the conversion manually this is off course possible, see /"
-"usr/share/doc/desktop-profiles/README for more information."
-msgstr ""
-"Deze conversie handmatig uitvoeren is natuurlijk ook mogelijk, zie /usr/"
-"share/doc/desktop-profiles/README voor meer informatie."
+#: ../templates:18
+msgid "To reenable gconf profiles you need to change /etc/gconf/2/path as follows: - 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be 'include *\\$(ENV_MANDATORY_PATH)' - and 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' should be 'include *\\$(ENV_DEFAULTS_PATH)'"
+msgstr "Om gconf-profielen opnieuw te activeren dient u het bestand '/etc/gconf/2/path' als volgt te veranderen: 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' moet worden 'include *\\$(ENV_MANDATORY_PATH)' en 'include /var/cache/desktop-profiles/\\$(USER)_defaults.path' moet worden 'include *\\$(ENV_DEFAULTS_PATH)'"
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles (either because you "
+#~ "haven't made the necessary changes yet, or because you had a version "
+#~ "previous to 1.4.6 of this package installed which used a different path-"
+#~ "file). In order to rectify this situation your global gconf 'path' file (/"
+#~ "etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata "
+#~ "needed by desktop-profiles for your current configuration sources needs "
+#~ "to be available."
+#~ msgstr ""
+#~ "Uw huidige gconf (en dus Gnome) instellingen ondersteunen geen door "
+#~ "desktop-profiles beheerde configuratiebronnen. (of omdat u de nodige "
+#~ "aanpassingen nog niet gedaan heeft; of omdat u een versie van dit pakket "
+#~ "eerder dan 1.4.6 geinstalleerd had, deze gebruikte een ander 'path'-"
+#~ "bestand). Om gebruik van door desktop-profiles beheerde "
+#~ "configuratiebronnen mogelijk te maken dient enerzijds uw systeemwijde "
+#~ "gconf 'path'-bestand aangepast te worden, en anderzijds de door desktop-"
+#~ "profiles benodigde metadata betreffende de door dit bestand gebruikte "
+#~ "configuratiebronnen beschikbaar gemaakt te worden."
+#~ msgid ""
+#~ "Running this script shouldn't create any user-visible differences, it "
+#~ "will allow you to manage all configuration sources through desktop-"
+#~ "profiles. The script will make backup copies of all files it touches, so "
+#~ "you can always go back to the previous situation."
+#~ msgstr ""
+#~ "Het uitvoeren van dit script geeft geen voor gebruikers zichtbare "
+#~ "veranderingen, maar laat u toe om alle configuratiebronnen te beheren via "
+#~ "desktop-profiles. Dit script maakt een reservekopie van alle bestanden "
+#~ "waar het veranderingen in aanbrengt, u kunt dus altijd terug naar de "
+#~ "vorige situatie."
+#~ msgid ""
+#~ "If you want to do the conversion manually this is off course possible, "
+#~ "see /usr/share/doc/desktop-profiles/README for more information."
+#~ msgstr ""
+#~ "Deze conversie handmatig uitvoeren is natuurlijk ook mogelijk, zie /usr/"
+#~ "share/doc/desktop-profiles/README voor meer informatie."
#~ msgid "gconf profiles won't work by default"
#~ msgstr "gconf-profielen werken standaard niet"
-
#~ msgid ""
#~ "The default gconf (i.e. GNOME) setup doesn't facilitate the use of "
#~ "profiles for certain groups only. This package provides an alternative "
@@ -110,10 +106,8 @@ msgstr ""
#~ "ondersteund. Om ervoor te zorgen dat gconf de aanpak van dit pakket "
#~ "gebruikt dient het systeemwijde 'path'-bestand (/etc/gconf.<gconf-"
#~ "version>/path) aangepast te worden."
-
#~ msgid "Replace the default system-wide 'path' file?"
#~ msgstr "Systeemwijd 'path'-bestand vervangen?"
-
#~ msgid ""
#~ "This package includes an replacement system-wide gconf 'path' file that "
#~ "will reproduce the default behaviour of gconf, but will also allow the "
@@ -126,7 +120,6 @@ msgstr ""
#~ "installatie van extra configuratiebronnen via desktop-profiles toelaat. U "
#~ "wordt aangeraden om het standaard systeem-wijde gconf 'path'-bestand te "
#~ "vervangen."
-
#~ msgid ""
#~ "If you choose not to replace the default gconf 'path' file at this point, "
#~ "you can always do this later by running `dpkg-reconfigure desktop-"
@@ -140,3 +133,4 @@ msgstr ""
#~ "version>path te vervangen door /usr/share/desktop-profiles/path, of een "
#~ "ander 'path'-bestand zoals beschreven in /usr/share/doc/desktop-profiles/"
#~ "README"
+
diff --git a/debian/po/pt_PT.po b/debian/po/pt_PT.po
new file mode 100644
index 0000000..d7985cc
--- /dev/null
+++ b/debian/po/pt_PT.po
@@ -0,0 +1,99 @@
+# Portuguese translation of desktop-profiles's debconf messages.
+# 2005, Rui Branco <ruipb at netcabo.pt>>
+#
+# 2005-09-26 - Rui Branco <ruipb at netcabo.pt>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: desktop-profiles 1.4.5\n"
+"Report-Msgid-Bugs-To: cobaco at linux.be\n"
+"POT-Creation-Date: 2005-10-01 15:07+0200\n"
+"PO-Revision-Date: 2005-09-26 14:17+0100\n"
+"Last-Translator: Rui Branco <ruipb at netcabo.pt>\n"
+"Language-Team: Portuguese <traduz at debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+"configuration sources managed by desktop-profiles. The system wide path file "
+"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
+"work."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"This package includes a conversion script (/usr/sbin/path2listing) that wil "
+"create the necessary changes to have all your configuration sources managed "
+"by desktop-profiles. Running this script should not result in user-visible "
+"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
+"for more information on this script, or for info on changing the path file "
+"manually."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:18
+msgid "Global gconf path file needs to be changed!"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:18
+msgid ""
+"The include directives used by desktop-profiles have changed (in response "
+"to bug 309978, see the bug report and corresponding entry in the changelog "
+"of version 1.4.6 of this package for details)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:18
+msgid ""
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows: "
+"- 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
+"'include *\\$(ENV_MANDATORY_PATH)' - and 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include *\\$(ENV_DEFAULTS_PATH)'"
+msgstr ""
+
+#~ msgid "Replace the default system-wide 'path' file?"
+#~ msgstr "Substituir o 'caminho' do ficheiro por omissão para todo o sistema?"
+
+#~ msgid ""
+#~ "The default gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "profiles for certain groups only. The approach used by this package does. "
+#~ "To have gconf use the approach of this package the system-wide gconf "
+#~ "'path' file needs to be replaced by one provided by this package."
+#~ msgstr ""
+#~ "O modo de configurar por omissão do gconf (p.e. GNOME) não facilita o uso "
+#~ "para apenas certos grupos. A aproximação utilizada por este pacote "
+#~ "permite-lhe. Para o gconf ter este modo de funcionamento, o caminho de "
+#~ "ficheiro gconf para todo o sistema precisa de ser substituído poe este "
+#~ "pacote."
+
+#~ msgid ""
+#~ "Doing so won't change the default behaviour of gconf but it will allow "
+#~ "the subsequent installation and activation of gconf profiles. Thus it is "
+#~ "recommended that you let me replace the default system-wide gconf 'path' "
+#~ "file."
+#~ msgstr ""
+#~ "Ao efectuar esta operação não irá modificar o comportamento por omissão "
+#~ "do gconf, mas irá permitir a futura instalação e activação de perfis de "
+#~ "utilizador. Assim é recomendado que me permita modificar 'caminho' do "
+#~ "ficheiro gconf por omissão para todo o sistema."
+
+#~ msgid ""
+#~ "You can always do this later by running `dpkg-reconfigure desktop-"
+#~ "profiles', or by manually replacing /etc/gconf/<gconf-version>/path with /"
+#~ "usr/share/doc/desktop-profiles/examples/path."
+#~ msgstr ""
+#~ "Pode sempre efectuar a operação posteriormente ao correr `dpkg-"
+#~ "reconfigure desktop-profiles', ou manualmente substituíndo /etc/gconf/"
+#~ "<gconf-version>/caminho com /usr/share/doc/desktop-profiles/examples/"
+#~ "caminho."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index e9e36fc..a77615b 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,22 +1,14 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-28 14:36+0200\n"
+"Report-Msgid-Bugs-To: cobaco at linux.be\n"
+"POT-Creation-Date: 2005-10-01 15:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -27,48 +19,46 @@ msgstr ""
#. Type: note
#. Description
#: ../templates:3
-msgid "Global gconf path file needs to be changed!"
+msgid ""
+"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+"configuration sources managed by desktop-profiles. The system wide path file "
+"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
+"work."
msgstr ""
#. Type: note
#. Description
#: ../templates:3
msgid ""
-"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles (either because you "
-"haven't made the necessary changes yet, or because you had a version "
-"previous to 1.4.6 of this package installed which used a different path-"
-"file). In order to rectify this situation your global gconf 'path' file (/"
-"etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata needed "
-"by desktop-profiles for your current configuration sources needs to be "
-"available."
+"This package includes a conversion script (/usr/sbin/path2listing) that wil "
+"create the necessary changes to have all your configuration sources managed "
+"by desktop-profiles. Running this script should not result in user-visible "
+"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
+"for more information on this script, or for info on changing the path file "
+"manually."
msgstr ""
#. Type: note
#. Description
-#: ../templates:3
-msgid ""
-"This package includes a conversion script that wil create the necessary "
-"metadata to have all your configuration sources managed by desktop-profiles "
-"(/usr/sbin/path2listing). It will also replace the global path file with one "
-"that is setup for managing all configuration sources through desktop-"
-"profiles."
+#: ../templates:18
+msgid "Global gconf path file needs to be changed!"
msgstr ""
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:18
msgid ""
-"Running this script shouldn't create any user-visible differences, it will "
-"allow you to manage all configuration sources through desktop-profiles. The "
-"script will make backup copies of all files it touches, so you can always go "
-"back to the previous situation."
+"The include directives used by desktop-profiles have changed (in response "
+"to bug 309978, see the bug report and corresponding entry in the changelog "
+"of version 1.4.6 of this package for details)."
msgstr ""
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:18
msgid ""
-"If you want to do the conversion manually this is off course possible, see /"
-"usr/share/doc/desktop-profiles/README for more information."
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows: "
+"- 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
+"'include *\\$(ENV_MANDATORY_PATH)' - and 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include *\\$(ENV_DEFAULTS_PATH)'"
msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index cb720e5..504823f 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: desktop-profiles\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-28 14:36+0200\n"
+"Report-Msgid-Bugs-To: cobaco at linux.be\n"
+"POT-Creation-Date: 2005-10-01 15:07+0200\n"
"PO-Revision-Date: 2005-06-16 18:39+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -18,40 +18,24 @@ msgstr ""
#. Type: note
#. Description
#: ../templates:3
-msgid "Global gconf path file needs to be changed!"
-msgstr "• Cần phải thay đổi tập tin đường dẫn gconf. •"
-
-#. Type: note
-#. Description
-#: ../templates:3
msgid ""
"Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
-"configuration sources managed by desktop-profiles (either because you "
-"haven't made the necessary changes yet, or because you had a version "
-"previous to 1.4.6 of this package installed which used a different path-"
-"file). In order to rectify this situation your global gconf 'path' file (/"
-"etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata needed "
-"by desktop-profiles for your current configuration sources needs to be "
-"available."
+"configuration sources managed by desktop-profiles. The system wide path file "
+"(/etc/gconf/2/path) needs to be changed to get such configuration sources to "
+"work."
msgstr ""
-"Thiết lập gconf (tức là GNOME) hiện thời của bạn không làm cho dễ dàng dùng "
-"những nguồn cấu hình do trình desktop-profiles quản lý (hoặc vì bạn chưa sửa "
-"đổi nó như cần thiết, hoặc vì bạn có cài đặt một phiên bản trước 1.4.6 mà "
-"dùng một tập tin đường dẫn khác). Để sửa trường hợp này, cần phải sửa đổi "
-"tập tin «path» (đường dẫn) toàn cầu của bạn («/etc/gconf/<gconf-version>/"
-"path»), và bạn cần phải kiểm tra xem các thông tin về thông tin thuộc về "
-"những nguồn cấu hình hiện thời của bạn có phải sẵn sàng cho trình desktop-"
-"profiles."
#. Type: note
#. Description
#: ../templates:3
+#, fuzzy
msgid ""
-"This package includes a conversion script that wil create the necessary "
-"metadata to have all your configuration sources managed by desktop-profiles "
-"(/usr/sbin/path2listing). It will also replace the global path file with one "
-"that is setup for managing all configuration sources through desktop-"
-"profiles."
+"This package includes a conversion script (/usr/sbin/path2listing) that wil "
+"create the necessary changes to have all your configuration sources managed "
+"by desktop-profiles. Running this script should not result in user-visible "
+"changes to the system. See the README in /usr/share/doc/desktop-profiles/ "
+"for more information on this script, or for info on changing the path file "
+"manually."
msgstr ""
"Gói tin này bao gồm một tập lệnh chuyển đổi sẽ tạo thông tin về thông tin "
"cần thiết để cho phép trình desktop-profiles quản lý các nguồn cấu hình của "
@@ -61,24 +45,62 @@ msgstr ""
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:18
+msgid "Global gconf path file needs to be changed!"
+msgstr "• Cần phải thay đổi tập tin đường dẫn gconf. •"
+
+#. Type: note
+#. Description
+#: ../templates:18
msgid ""
-"Running this script shouldn't create any user-visible differences, it will "
-"allow you to manage all configuration sources through desktop-profiles. The "
-"script will make backup copies of all files it touches, so you can always go "
-"back to the previous situation."
+"The include directives used by desktop-profiles have changed (in response "
+"to bug 309978, see the bug report and corresponding entry in the changelog "
+"of version 1.4.6 of this package for details)."
msgstr ""
-"Chạy tập lệnh này nên không tạo thay đổi nào mà người dùng có thể thấy. Tuy "
-"nhiên, nó sẽ cho phép bạn quản lý các nguồn cấu hình thông qua trình desktop-"
-"profiles. Tập lệnh này sẽ tạo bản sao của mọi tập tin mà nó xử lý, thì bạn "
-"luôn có thể trở về trường hợp trước."
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:18
msgid ""
-"If you want to do the conversion manually this is off course possible, see /"
-"usr/share/doc/desktop-profiles/README for more information."
+"To reenable gconf profiles you need to change /etc/gconf/2/path as follows: "
+"- 'include /var/cache/desktop-profiles/\\$(USER)_mandatory.path' should be "
+"'include *\\$(ENV_MANDATORY_PATH)' - and 'include /var/cache/desktop-"
+"profiles/\\$(USER)_defaults.path' should be 'include *\\$(ENV_DEFAULTS_PATH)'"
msgstr ""
-"Hoặc bạn có thể tự chuyển đổi như thế. Hãy xem tập tin «/usr/share/doc/"
-"desktop-profiles/README» để tìm thông tin thêm."
+
+#~ msgid ""
+#~ "Your current gconf (i.e. GNOME) setup doesn't facilitate the use of "
+#~ "configuration sources managed by desktop-profiles (either because you "
+#~ "haven't made the necessary changes yet, or because you had a version "
+#~ "previous to 1.4.6 of this package installed which used a different path-"
+#~ "file). In order to rectify this situation your global gconf 'path' file (/"
+#~ "etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata "
+#~ "needed by desktop-profiles for your current configuration sources needs "
+#~ "to be available."
+#~ msgstr ""
+#~ "Thiết lập gconf (tức là GNOME) hiện thời của bạn không làm cho dễ dàng "
+#~ "dùng những nguồn cấu hình do trình desktop-profiles quản lý (hoặc vì bạn "
+#~ "chưa sửa đổi nó như cần thiết, hoặc vì bạn có cài đặt một phiên bản trước "
+#~ "1.4.6 mà dùng một tập tin đường dẫn khác). Để sửa trường hợp này, cần "
+#~ "phải sửa đổi tập tin «path» (đường dẫn) toàn cầu của bạn («/etc/gconf/"
+#~ "<gconf-version>/path»), và bạn cần phải kiểm tra xem các thông tin về "
+#~ "thông tin thuộc về những nguồn cấu hình hiện thời của bạn có phải sẵn "
+#~ "sàng cho trình desktop-profiles."
+
+#~ msgid ""
+#~ "Running this script shouldn't create any user-visible differences, it "
+#~ "will allow you to manage all configuration sources through desktop-"
+#~ "profiles. The script will make backup copies of all files it touches, so "
+#~ "you can always go back to the previous situation."
+#~ msgstr ""
+#~ "Chạy tập lệnh này nên không tạo thay đổi nào mà người dùng có thể thấy. "
+#~ "Tuy nhiên, nó sẽ cho phép bạn quản lý các nguồn cấu hình thông qua trình "
+#~ "desktop-profiles. Tập lệnh này sẽ tạo bản sao của mọi tập tin mà nó xử "
+#~ "lý, thì bạn luôn có thể trở về trường hợp trước."
+
+#~ msgid ""
+#~ "If you want to do the conversion manually this is off course possible, "
+#~ "see /usr/share/doc/desktop-profiles/README for more information."
+#~ msgstr ""
+#~ "Hoặc bạn có thể tự chuyển đổi như thế. Hãy xem tập tin «/usr/share/doc/"
+#~ "desktop-profiles/README» để tìm thông tin thêm."
diff --git a/debian/postinst b/debian/postinst
index 8e22da6..5c89dbe 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -10,12 +10,22 @@
if (test -e /etc/gconf/2/path) ; then
if ! ( (grep 'include *\$(ENV_MANDATORY_PATH)' /etc/gconf/2/path 2>&1 > /dev/null ) ||
(grep 'include *\$(ENV_DEFAULTS_PATH)' /etc/gconf/2/path 2>&1 > /dev/null ) ); then
- db_get desktop-profiles/replace-gconf-system-wide-path-file || true
+ if ! ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/2/path 2>&1 > /dev/null ) ||
+ (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/2/path 2>&1 > /dev/null ) ); then
+ db_get desktop-profiles/replace-gconf-system-wide-path-file || true;
+ else
+ db_get desktop-profiles/replace-old-vars || true;
+ fi;
fi;
elif (test -e /etc/gconf/1/path) ; then
if ! ( (grep 'include *\$(ENV_MANDATORY_PATH)' /etc/gconf/1/path 2>&1 > /dev/null ) ||
(grep 'include *\$(ENV_DEFAULTS_PATH)' /etc/gconf/1/path 2>&1 > /dev/null ) ); then
- db_get desktop-profiles/replace-gconf-system-wide-path-file || true
+ if ! ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/1/path 2>&1 > /dev/null ) ||
+ (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/1/path 2>&1 > /dev/null ) ); then
+ db_get desktop-profiles/replace-gconf-system-wide-path-file || true;
+ else
+ db_get desktop-profiles/replace-old-vars || true;
+ fi;
fi;
fi;
diff --git a/debian/preinst b/debian/preinst
index c0b684a..547e005 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -11,4 +11,10 @@ if( (test "$1" = "upgrade") && (dpkg --compare-versions "$2" lt "1.4") ); then
done;
fi;
+# if we're upgrading from a version that didn't have the path2listing script
+# ensure we don't loose the old defaults
+if( (test "$1" = "upgrade") && (dpkg --compare-versions "$2" lt "1.4.6") ); then
+ cat desktop-profiles.listing | grep ';GCONF;' > /etc/desktop-profiles/desktop-profiles_path2listing.listing
+fi;
+
#DEBHELPER#
diff --git a/debian/templates b/debian/templates
index 73e8aac..0ed5848 100644
--- a/debian/templates
+++ b/debian/templates
@@ -2,23 +2,27 @@ Template: desktop-profiles/replace-gconf-system-wide-path-file
Type: note
_Description: Global gconf path file needs to be changed!
Your current gconf (i.e. GNOME) setup doesn't facilitate the use of
- configuration sources managed by desktop-profiles (either because
- you haven't made the necessary changes yet, or because you had a version
- previous to 1.4.6 of this package installed which used a different path-file).
- In order to rectify this situation your global gconf 'path' file
- (/etc/gconf/<gconf-version>/path) needs to be adapted, and the metadata
- needed by desktop-profiles for your current configuration sources needs to be
- available.
+ configuration sources managed by desktop-profiles. The system wide path file
+ (/etc/gconf/2/path) needs to be changed to get such configuration sources to
+ work.
.
- This package includes a conversion script that wil create the necessary
- metadata to have all your configuration sources managed by desktop-profiles
- (/usr/sbin/path2listing). It will also replace the global path file with one
- that is setup for managing all configuration sources through desktop-profiles.
- .
- Running this script shouldn't create any user-visible differences, it will
- allow you to manage all configuration sources through desktop-profiles.
- The script will make backup copies of all files it touches, so you can always
- go back to the previous situation.
+ This package includes a conversion script (/usr/sbin/path2listing) that wil
+ create the necessary changes to have all your configuration sources managed
+ by desktop-profiles. Running this script should not result in user-visible
+ changes to the system. See the README in /usr/share/doc/desktop-profiles/
+ for more information on this script, or for info on changing the path file
+ manually.
+
+Template: desktop-profiles/replace-old-vars
+Type: note
+_Description: Global gconf path file needs to be changed!
+ The include directives used by desktop-profiles have changed (in response to
+ bug 309978, see the bug report and corresponding entry in the changelog of
+ version 1.4.6 of this package for details).
.
- If you want to do the conversion manually this is off course possible, see
- /usr/share/doc/desktop-profiles/README for more information.
+ To reenable gconf profiles you need to change /etc/gconf/2/path as follows:
+ - 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' should be
+ 'include *\$(ENV_MANDATORY_PATH)'
+ - and 'include /var/cache/desktop-profiles/\$(USER)_defaults.path' should be
+ 'include *\$(ENV_DEFAULTS_PATH)'
+
diff --git a/path2listing b/path2listing
index 9b5fb77..f5e94e7 100644
--- a/path2listing
+++ b/path2listing
@@ -12,13 +12,18 @@
#########################################################################
ROOT_PATH_FILE=/etc/gconf/2/path
-CUSTOM_LISTINGS=/etc/desktop-profiles/path2listing_generated.listing
+CUSTOM_LISTINGS=/etc/desktop-profiles/desktop-profiles_path2listing.listing
DEFAULT_LISTINGS=/etc/desktop-profiles/desktop-profiles.listing
# default distance to leave between 2 successive priority sources
# we're leaving some distance to allow the easy insertion of later profiles
SOURCE_DISTANCE=50;
+# we're processing the global path file by default
+# -> so unless asked not to we'll want to replace it
+GLOBAL_PATH_FILE=true;
+REPLACE_PATH_FILE=true;
+
print_help () {
cat <<EOF
Usage: path2listing [OPTIONS]
@@ -69,7 +74,8 @@ list_sources_in_path_file () {
# strip out comments & empty lines, leave only config sources and includes
tac "$1" | sed -e "s/^[[:space:]]*//g" -e "s/[[:space:]]*$//g" | \
grep -v "^#.*\|^$" | while read CONFIG_SOURCE; do
- # ignore desktop-profiles hooks (new and old) as they don't need metadata
+ # ignore desktop-profiles hooks (both the pre and post 1.4.6 versions)
+ # because we don't want metadata for them to be generated
if ( (test "$CONFIG_SOURCE" = 'include $(ENV_MANDATORY_PATH)') ||
(test "$CONFIG_SOURCE" = 'include *\$(ENV_DEFAULTS_PATH)') ||
(test "$CONFIG_SOURCE" = 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path') ||
@@ -104,30 +110,15 @@ add_as_profile () {
declare -i default_number=1;
fi;
- if (test 0 -lt $2 ); then
+ if (test 0 -lt $2); then
echo "mandatory_$mandatory_number;GCONF;$1;$2;;" >> "$3";
- else
+ elif (test 0 -gt $2);then
echo "default_$default_number;GCONF;$1;$2;;" >> "$3";
- fi;
-}
-
-# $1 is the configuration source whose metadata we want to update
-# $2 is the new precedence value
-# $3 is the file where the configuration sources' metadata is to be found
-update_precedence () {
- if (test -w "$3"); then
- sed -i "s|\(.*\);GCONF;$1;.*;\(.*\);\(.*\)|\1;GCONF;$1;$2;\2;\3|" "$3";
else
- echo "Don't have sufficient permissions to adapt the precedence of $1 in $3 to $2";
+ echo "gconf-user-settings;GCONF;$1;$2;;Default location of user settings" >> $3;
fi;
}
-# $1 is the configuration source of the profile we want to deactivate
-# $2 is the file where the configuration sources' metadata is to be found
-set_inactive () {
- sed -i "s|\(.*\);GCONF;$1;\(.*\);\(.*\);\(.*\)|\1;GCONF;$1;\2;! \3;\4|" "$2";
-}
-
# $1 is the file to backup
# $2 is the reason
make_backup_of () {
@@ -142,11 +133,6 @@ make_backup_of () {
fi;
}
-# we're processing the global path file by default
-# -> so unless asked not to we'll want to replace it
-GLOBAL_PATH_FILE=true;
-REPLACE_PATH_FILE=true;
-
#####################
# Parse command line
#####################
@@ -209,9 +195,9 @@ done;
# Check if we need to do anything,
# and communicate that with the admin
######################################
- # Check if ROOT_PATH_FILE is same as path file we want
+ # Check if ROOT_PATH_FILE is equal to ideal path file state
if (diff $ROOT_PATH_FILE /usr/share/desktop-profiles/path 2>&1 > /dev/null); then
- #same -> nothing to do
+ #equal -> nothing to do
echo "$ROOT_PATH_FILE file is already converted to desktop-profiles:";
echo " -> nothing to do";
echo " -> exiting";
@@ -243,19 +229,10 @@ done;
USER_SOURCE_RANK=$(list_sources_in_path_file $ROOT_PATH_FILE | nl | \
grep 'xml:readwrite:\$(HOME)/.gconf' | sed "s/^[[:space:]]*//g" | cut --fields 1);
- # flags indicating wether we've encountered the default sources yet puth in
- # tempfile, as we need to change them from within a pipe, which means subshell,
- # which means setting a variable doesn't carry outside of loop
- export AID_TMP=$(tempfile);
- echo SEEN_GCONF_MANDATORY="false" >> "$AID_TMP";
- echo SEEN_GCONF_DEFAULTS="false" >> "$AID_TMP";
- echo SEEN_GCONF_USER_PATH="false" >> "$AID_TMP";
- echo SEEN_GCONF_USER="false" >> "$AID_TMP";
-
# check if file, we'll be messing with already exists, if so create backup
make_backup_of "$CUSTOM_LISTINGS" regenerate
- # iterate over all confguration sources, listed directly or indirectly by the
+ # iterate over all configuration sources, listed directly or indirectly by the
# $ROOT_PATH_FILE (by default = /etc/gconf/2/path)
list_sources_in_path_file $ROOT_PATH_FILE | nl | sed "s/^[[:space:]]*//g" | \
while read ITEM; do
@@ -265,53 +242,10 @@ done;
declare -i PRECEDENCE="$(echo "$ITEM" | cut --fields 1) * $SOURCE_DISTANCE - $USER_SOURCE_RANK * $SOURCE_DISTANCE";
CONFIG_SOURCE="$(echo "$ITEM" | cut --fields 2)";
- # If one of the default source -> update precedence
- # else add a profile-metadata entry for this configuration source
- if (test "$CONFIG_SOURCE" = "xml:readonly:/etc/gconf/gconf.xml.mandatory") ; then
- echo 'SEEN_GCONF_MANDATORY="true"' >> "$AID_TMP";
- update_precedence "$CONFIG_SOURCE" "$PRECEDENCE" "$DEFAULT_LISTINGS";
- elif (test "$CONFIG_SOURCE" = 'include "$(HOME)/.gconf.path"'); then
- echo 'SEEN_GCONF_USER_PATH="true"' >> "$AID_TMP";
- update_precedence "$CONFIG_SOURCE" "$PRECEDENCE" "$DEFAULT_LISTINGS";
- elif (test "$CONFIG_SOURCE" = 'xml:readwrite:$(HOME)/.gconf'); then
- echo 'SEEN_GCONF_USER="true"' >> "$AID_TMP";
- update_precedence "$CONFIG_SOURCE" "$PRECEDENCE" "$DEFAULT_LISTINGS";
- elif (test "$CONFIG_SOURCE" = "xml:readonly:/etc/gconf/gconf.xml.defaults"); then
- echo 'SEEN_GCONF_DEFAULTS="true"' >> "$AID_TMP";
- update_precedence "$CONFIG_SOURCE" "$PRECEDENCE" "$DEFAULT_LISTINGS";
- else
- add_as_profile "$CONFIG_SOURCE" "$PRECEDENCE" "$CUSTOM_LISTINGS";
- fi;
+ # add a profile-metadata entry for this configuration source
+ add_as_profile "$CONFIG_SOURCE" "$PRECEDENCE" "$CUSTOM_LISTINGS";
done;
- # Activate/Deactivate default sources as requiered
- # If and only if, we're processing the global path file
- if (test "$GLOBAL_PATH_FILE" = true); then
- # deactivate any of the default configuration sources we didn't encounter
- . "$AID_TMP";#get seen flags
- if (test "$SEEN_GCONF_MANDATORY" = false) || (test "$SEEN_GCONF_USER_PATH" = false) ||
- (test "$SEEN_GCONF_USER" = false) || (test "$SEEN_GCONF_DEFAULTS" = false); then
- make_backup_of "$DEFAULT_LISTING" "make changes to"
- fi;
-
- if (test "$SEEN_GCONF_MANDATORY" = false); then
- set_inactive "xml:readonly:/etc/gconf/gconf.xml.mandatory" "$DEFAULT_LISTINGS";
- fi;
- if (test "$SEEN_GCONF_USER_PATH" = false); then
- set_inactive 'include "$(HOME)/.gconf.path"' "$DEFAULT_LISTINGS";
- fi;
- if (test "$SEEN_GCONF_USER" = false); then
- set_inactive 'xml:readwrite:$(HOME)/.gconf' "$DEFAULT_LISTINGS";
- fi;
- if (test "$SEEN_GCONF_DEFAULTS" = false); then
- set_inactive "xml:readonly:/etc/gconf/gconf.xml.defaults" "$DEFAULT_LISTINGS";
- fi;
- fi;
-
- # cleanup
- rm "$AID_TMP";
- unset AID_TMP;
-
######################################
# Deal with changing global path file
######################################
diff --git a/path2listing.1 b/path2listing.1
index dcd6c09..d1896ed 100644
--- a/path2listing.1
+++ b/path2listing.1
@@ -7,7 +7,7 @@ path2listing \- script facilitating the conversion to managing gconf configurati
path2listing [options]
.SH DESCRIPTION
-This script takes a single gconf path file (the systemwide one, i.e. /etc/gconf/2/path, when not told otherwise) and reads through it in order to create an ordered list of known configuration sources (it will recurse into included path files when necessary). Using that ordered list it will then create a path2listing_generated.listing file containing metadata for all known configuration sources, assigning a precedence value to each encountered configuration source so that:
+This script takes a single gconf path file (the systemwide one, i.e. /etc/gconf/2/path, when not told otherwise) and reads through it in order to create an ordered list of known configuration sources (it will recurse into included path files when necessary). Using that ordered list it will then create a desktop-profiles_path2listing.listing file containing metadata for all known configuration sources, assigning a precedence value to each encountered configuration source so that:
.IP
a) the order of sources is the same
.IP
@@ -15,7 +15,7 @@ b) there is space between the precedence values of the various sources to allow
.IP
c) all mandatory sources have a positive precedence value, and all non-mandatory sources have a negative precedence value
.PP
-In addition to generating the path2listing_generated.listing file, this script will also replace the converted path file by one that assumes that desktop-profiles manages all configuration sources (NOTE: a backup copy of all changed files is made, so you can always go back to the previous situation).
+In addition to generating the desktop-profiles_path2listing.listing file, this script will also replace the converted path file by one that assumes that desktop-profiles manages all configuration sources (NOTE: a backup copy of all changed files is made, so you can always go back to the previous situation).
.SH OPTIONS
.PP
@@ -33,7 +33,7 @@ display the help message
.PP
-o, --output-file
.IP
-file to put the generated metadata in (defaults to /etc/desktop-profiles/path2listing_generated.listing). If this file exists a backup copy will be made prior to overwriting it.
+file to put the generated metadata in (defaults to /etc/desktop-profiles/desktop-profiles_path2listing.listing). If this file exists a backup copy will be made prior to overwriting it.
.PP
--no-replace-file
.IP
@@ -42,7 +42,7 @@ don't replace the path file we're converted with one assuming desktop-profiles m
.SH FILES
/etc/gconf/2/path - systemwide gconf path file, default path file to convert
.PP
-/etc/desktop-profiles/path2listing_generated.listing - default name for the file containing the generated metadata
+/etc/desktop-profiles/desktop-profiles_path2listing.listing - default name for the file containing the generated metadata
.SH AUTHOR
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git
More information about the debian-edu-commits
mailing list