diff -Nru driconf-0.9.1/PKG-INFO driconf-0.9.1/PKG-INFO --- driconf-0.9.1/PKG-INFO 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/PKG-INFO 2006-09-18 02:10:15.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: driconf -Version: 0.9.0 +Version: 0.9.1 Summary: A configuration applet for DRI drivers Home-page: http://dri.freedesktop.org/wiki/DriConf Author: Felix Kuehling diff -Nru driconf-0.9.1/debian/changelog driconf-0.9.1/debian/changelog --- driconf-0.9.1/debian/changelog 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/changelog 2014-01-22 11:20:55.000000000 +0000 @@ -1,14 +1,28 @@ -driconf (0.9.1-2ubuntu1) gutsy; urgency=low +driconf (0.9.1-4) unstable; urgency=medium - * Merge from Debian unstable. Remaining Ubuntu changes: - + Fix FTBFS, build-depend on python-dev - + debian/rules: include simple-patchsys.mk to patch the desktop file - (#57993) - + 01_fix-desktop-file.patch: update patch part-applied in Debian - + Update Maintainer field to match Debian-Maintainer-Spec - * debian/rules: keep debian changes to install desktop file + * Adopt package. (Closes: #721967) + * Use source format "3.0 (quilt). + * Split patch into multiple small patchsets with DEP-3 headers. + * Include Italian translation. (Closes: #472179) + * Switch from cdbs to short-style dh debian/rules. + * Remove dependencies on obsolete packages: xbase-clients, xlibmesa-gl. + - Replace with dependency on x11-utils. + * Add build-dep on python-dev. (Closes: #406727) + * Add HardwareSettings to categories for desktop launcher. (Closes: #444626) + * Add Homepage field to debian/control. (Closes: #615284, LP: #822483) + * Add missing Vcs-* fields. + * Update Standards version to 3.9.5. + * Update dh compat level from 4 to 9. + * Update debian/copyright to DEP-5/copyright format 1.0. + * Add watch file. - -- Arthur Loiret Wed, 27 Jun 2007 12:20:58 +0200 + -- Vincent Cheng Wed, 22 Jan 2014 02:23:51 -0800 + +driconf (0.9.1-3) unstable; urgency=low + + * Orphaning package. + + -- Michel Dänzer Thu, 05 Sep 2013 19:15:45 +0200 driconf (0.9.1-2) unstable; urgency=low @@ -19,17 +33,6 @@ -- Michel Dänzer Tue, 19 Jun 2007 11:33:37 +0200 -driconf (0.9.1-1ubuntu1) gutsy; urgency=low - - * Merge with Debian Unstable, remaining Ubuntu changes: - - Fix FTBFS, build-depend on python-dev. - * debian/control: adhere to DebianMaintainerField. - * debian/rules: include simple-patchsys.mk and install the desktop file. - (LP: #57993) - * debian/patches/01_fix-desktop-file.patch: fix the category and icon path. - - -- Lionel Le Folgoc Sat, 09 Jun 2007 00:08:48 +0200 - driconf (0.9.1-1) unstable; urgency=low * New upstream release. @@ -43,12 +46,6 @@ -- Michel Dänzer Thu, 07 Jun 2007 13:29:18 +0200 -driconf (0.9.0-2ubuntu1) feisty; urgency=low - - * Fix FTBFS, build-depend on python-dev. - - -- Matthias Klose Sat, 13 Jan 2007 13:41:26 +0100 - driconf (0.9.0-2) unstable; urgency=low * debian/control: Add Suggests: mesa-utils | xbase-clients (<< 7.0.0) for diff -Nru driconf-0.9.1/debian/clean driconf-0.9.1/debian/clean --- driconf-0.9.1/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/clean 2014-01-22 10:51:01.000000000 +0000 @@ -0,0 +1,5 @@ +de/LC_MESSAGES/*.mo +es/LC_MESSAGES/*.mo +it/LC_MESSAGES/*.mo +nl/LC_MESSAGES/*.mo +ru/LC_MESSAGES/*.mo diff -Nru driconf-0.9.1/debian/compat driconf-0.9.1/debian/compat --- driconf-0.9.1/debian/compat 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/compat 2014-01-22 10:26:44.000000000 +0000 @@ -1 +1 @@ -4 +9 diff -Nru driconf-0.9.1/debian/control driconf-0.9.1/debian/control --- driconf-0.9.1/debian/control 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/control 2014-01-22 11:20:48.000000000 +0000 @@ -1,19 +1,24 @@ Source: driconf Section: x11 Priority: optional -Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Michel Dänzer -Build-Depends: cdbs, debhelper (>= 5.0.37.1), python-dev (>= 2.3.5-7) -Build-Depends-Indep: python-support (>= 0.6), python-gtk2-dev (>> 2.4.0) -Standards-Version: 3.7.2.0 +Maintainer: Python Applications Packaging Team +Uploaders: Vincent Cheng +Build-Depends: debhelper (>= 9), gettext, python-dev +Standards-Version: 3.9.5 +X-Python-Version: >= 2.4 +Homepage: http://dri.freedesktop.org/wiki/DriConf +Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/driconf/trunk/ +Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/driconf/trunk/ Package: driconf Architecture: all -Depends: xdriinfo | xbase-clients (>> 6.8.0), python-gtk2 (>> 2.4.0), +Depends: + python-gtk2 (>> 2.4.0), + x11-utils, + ${misc:Depends}, ${python:Depends} -Recommends: libgl1-mesa-dri | xlibmesa-gl (>> 6.8.0), - libgl1-mesa-dri | xlibmesa-dri (>> 6.8.0) -Suggests: mesa-utils | xbase-clients (<< 7.0.0) +Recommends: libgl1-mesa-dri +Suggests: mesa-utils Description: DRI configuration applet Driconf is a configuration applet for the Direct Rendering Infrastructure (DRI). It allows customizing performance and visual quality settings of OpenGL @@ -22,5 +27,3 @@ Driconf is implemented in Python. It uses the GTK+ toolkit bindings and the xdriinfo program (from the xdriinfo or xbase-clients package) to retrieve configuration information from OpenGL drivers. - . - Homepage: http://dri.freedesktop.org/wiki/DriConf diff -Nru driconf-0.9.1/debian/copyright driconf-0.9.1/debian/copyright --- driconf-0.9.1/debian/copyright 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/copyright 2014-01-22 10:37:05.000000000 +0000 @@ -1,25 +1,29 @@ -This package was originally debianized by Michel Dänzer - on Mon, 1 Mar 2004 - -It was downloaded from http://dri.sourceforge.net/cgi-bin/moin.cgi/DriConf - -Upstream Author: Felix Kühling - -Copyright 2003-2007 Felix Kühling - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - -On Debian systems, the complete text of the GNU General Public License, -version 2, can be found in /usr/share/common-licenses/GPL-2. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: driconf +Source: http://dri.sourceforge.net/cgi-bin/moin.cgi/DriConf + +Files: * +Copyright: 2003-2007 Felix Kühling +License: GPL-2.0+ + +Files: debian/* +Copyright: 2004-2007 Michel Dänzer + 2014 Vincent Cheng +License: GPL-2.0+ + +License: GPL-2.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru driconf-0.9.1/debian/docs driconf-0.9.1/debian/docs --- driconf-0.9.1/debian/docs 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/docs 2014-01-22 10:31:22.000000000 +0000 @@ -1 +1,2 @@ +README TODO diff -Nru driconf-0.9.1/debian/driconf.install driconf-0.9.1/debian/driconf.install --- driconf-0.9.1/debian/driconf.install 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/driconf.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -driconf.desktop usr/share/applications/ diff -Nru driconf-0.9.1/debian/driconf.manpages driconf-0.9.1/debian/driconf.manpages --- driconf-0.9.1/debian/driconf.manpages 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/driconf.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/driconf.1 diff -Nru driconf-0.9.1/debian/install driconf-0.9.1/debian/install --- driconf-0.9.1/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/install 2014-01-22 10:37:05.000000000 +0000 @@ -0,0 +1 @@ +driconf.desktop usr/share/applications/ diff -Nru driconf-0.9.1/debian/manpages driconf-0.9.1/debian/manpages --- driconf-0.9.1/debian/manpages 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/manpages 2014-01-22 09:04:27.000000000 +0000 @@ -0,0 +1 @@ +debian/driconf.1 diff -Nru driconf-0.9.1/debian/menu driconf-0.9.1/debian/menu --- driconf-0.9.1/debian/menu 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/menu 2014-01-22 10:35:18.000000000 +0000 @@ -1,5 +1,5 @@ ?package(driconf):needs="X11" \ - section="Apps/Tools" \ + section="Applications/System/Hardware" \ title="Driconf" \ longtitle="DRI configuration GUI" \ command="/usr/bin/driconf" diff -Nru driconf-0.9.1/debian/patches/01_fix-desktop-file.patch driconf-0.9.1/debian/patches/01_fix-desktop-file.patch --- driconf-0.9.1/debian/patches/01_fix-desktop-file.patch 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/patches/01_fix-desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -diff -Nur driconf-0.9.1/driconf.desktop driconf-0.9.1.new/driconf.desktop ---- driconf-0.9.1/driconf.desktop 2007-06-26 16:59:40.000000000 +0200 -+++ driconf-0.9.1.new/driconf.desktop 2007-06-27 12:09:09.000000000 +0200 -@@ -5,5 +5,5 @@ - Exec=driconf - Icon=/usr/share/driconf/driconf-icon.png - Type=Application --Categories=GNOME;Application;Settings;AdvancedSettings; -+Categories=GNOME;Settings; - StartupNotify=true diff -Nru driconf-0.9.1/debian/patches/fix-desktop-file.patch driconf-0.9.1/debian/patches/fix-desktop-file.patch --- driconf-0.9.1/debian/patches/fix-desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/patches/fix-desktop-file.patch 2014-01-22 11:07:19.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Fix path to icon file, and fix list of valid categories +Forwarded: not-yet +Author: Michel Dänzer +Last-Upload: 2013-01-22 + +diff -Nru driconf-0.9.1/driconf.desktop driconf-0.9.1-deb/driconf.desktop +--- driconf-0.9.1/driconf.desktop 2006-09-17 18:41:45.000000000 -0700 ++++ driconf-0.9.1-deb/driconf.desktop 2014-01-22 01:04:27.000000000 -0800 +@@ -3,7 +3,7 @@ + Name=3D Acceleration + Comment=Change 3D Acceleration options + Exec=driconf +-Icon=/usr/local/share/driconf/driconf-icon.png ++Icon=/usr/share/driconf/driconf-icon.png + Type=Application +-Categories=GNOME;Application;Settings;AdvancedSettings; ++Categories=GNOME;Settings;HardwareSettings; + StartupNotify=true diff -Nru driconf-0.9.1/debian/patches/fix-unboundlocalerror.patch driconf-0.9.1/debian/patches/fix-unboundlocalerror.patch --- driconf-0.9.1/debian/patches/fix-unboundlocalerror.patch 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/patches/fix-unboundlocalerror.patch 2014-01-22 10:22:01.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Fix uninitialized variable +Forwarded: not-yet +Author: Michel Dänzer +Bug: http://sourceforge.net/p/driconf/bugs/3/ +Last-Upload: 2013-01-22 + +diff -Nru driconf-0.9.1/driconf_simpleui.py driconf-0.9.1-deb/driconf_simpleui.py +--- driconf-0.9.1/driconf_simpleui.py 2006-09-17 17:49:54.000000000 -0700 ++++ driconf-0.9.1-deb/driconf_simpleui.py 2014-01-22 01:04:27.000000000 -0800 +@@ -266,8 +266,8 @@ + j = i + break + i = i - 1 +- if i < chars/3: +- i = chars ++ else: ++ i = j = chars + head, tail = head + tail[:i] + '\n', tail[j:] + return head + diff -Nru driconf-0.9.1/debian/patches/l10n.patch driconf-0.9.1/debian/patches/l10n.patch --- driconf-0.9.1/debian/patches/l10n.patch 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/patches/l10n.patch 2014-01-22 11:11:56.000000000 +0000 @@ -0,0 +1,604 @@ +Description: l10n updates +Forwarded: not-yet +Last-Upload: 2013-01-22 + +diff -Nru driconf-0.9.1/nl.po driconf-0.9.1-deb/nl.po +--- driconf-0.9.1/nl.po 2006-09-17 18:15:44.000000000 -0700 ++++ driconf-0.9.1-deb/nl.po 2014-01-22 01:04:27.000000000 -0800 +@@ -1,18 +1,19 @@ +-# Translation of driconf-0.9.0 to Dutch. ++# Translation of driconf-0.9.1 to Dutch. + # Benno Schulenberg , 2006. + # + msgid "" + msgstr "" +-"Project-Id-Version: driconfr 0.9.0\n" ++"Project-Id-Version: driconf 0.9.1\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-09-17 21:00-0400\n" +-"PO-Revision-Date: 2006-09-17 21:09-0400\n" ++"PO-Revision-Date: 2006-09-28 22:54+0200\n" + "Last-Translator: Benno Schulenberg \n" + "Language-Team: Dutch \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" + + #: driconf.py:62 + #, python-format +@@ -53,18 +54,18 @@ + "There are no usable DRI configuration files and a new one could not be " + "created. Exiting now." + msgstr "" +-"Er zijn geen bruikbare DRI-configuratiebestanden gevonden, en een nieuw " +-"bestand kon niet aangemaakt worden. Het programma wordt nu afgesloten." ++"Er zijn geen bruikbare DRI-configuratiebestanden gevonden en een nieuw " ++"bestand kon niet aangemaakt worden. DRIconf wordt nu afgesloten." + + #: driconf.py:148 + #, python-format + msgid "Created a new DRI configuration file \"%s\" for you." +-msgstr "Een nieuw configuratiebestand \"%s\" werd voor u aangemaakt." ++msgstr "Een nieuw configuratiebestand \"%s\" is voor u aangemaakt." + + #: driconf.py:156 + #, python-format + msgid "Created new DRI configuration files %s for you." +-msgstr "Nieuwe configuratiebestanden \"%s\" werden voor u aangemaakt." ++msgstr "Nieuwe configuratiebestanden \"%s\" zijn voor u aangemaakt." + + #: driconf_commonui.py:319 + msgid "Remove" +@@ -88,8 +89,8 @@ + "Unless you're using the same configuration file on another computer with a " + "different driver version, it is safe to remove these settings." + msgstr "" +-"Deze tab toont instellingen die het 3D-stuurprogramma niet langer kent. U " +-"kunt deze instellingen simpelweg verwijderen, tenzij u ditzelfde " ++"Dit tabblad toont instellingen die het 3D-stuurprogramma niet langer kent. " ++"U kunt deze instellingen simpelweg verwijderen, tenzij u ditzelfde " + "configuratiebestand op een andere computer met een andere versie van het " + "stuurprogramma gebruikt." + +@@ -110,7 +111,7 @@ + + #: driconf_commonui.py:721 driconf_commonui.py:740 + msgid "A configuration applet for DRI drivers" +-msgstr "Configuratiegereedschap voor DRI-stuurprogramma's" ++msgstr "Configureren van DRI-stuurprogramma's" + + #: driconf_commonui.py:742 + msgid "Translated by" +@@ -122,11 +123,11 @@ + + #: driconf_complexui.py:39 + msgid "Application" +-msgstr "Applicatie" ++msgstr "Programma" + + #: driconf_complexui.py:46 + msgid "Apply only to this executable" +-msgstr "Alleen op dit uitvoerbare programma toepassen" ++msgstr "Alleen op dit programmabestand toepassen" + + #: driconf_complexui.py:49 + msgid "" +@@ -134,9 +135,9 @@ + "Beware that some applications or games are just a shell script that starts a " + "real executable with a different name." + msgstr "" +-"Als dit uitstaat, gelden de instellingen voor alle applicaties.\n" +-"Wees erop bedacht dat sommige applicaties slechts een shellscript zijn en " +-"dat het uiteindelijk gestarte programma een andere naam heeft." ++"Als dit uitstaat, gelden de instellingen voor alle programma's.\n" ++"Houd er rekening mee dat sommige programma's slechts een shellscript zijn en " ++"dat het uiteindelijk gestarte programmabestand een andere naam heeft." + + #: driconf_complexui.py:73 + msgid "Unknown" +@@ -151,13 +152,13 @@ + "Enter the name of the application below. This just serves as a description " + "for you. Don't forget to set the executable afterwards." + msgstr "" +-"Geef hieronder een naam voor de applicatie op. Dit dient slechts als een " +-"omschrijving voor uzelf. Vergeet niet verderop de naam van het uitvoerbare " +-"programma vast te leggen." ++"Geef hieronder een naam voor het programma op. Dit dient slechts als een " ++"omschrijving voor uzelf. Vergeet niet verderop de naam van het eigenlijke " ++"programmabestand vast te leggen." + + #: driconf_complexui.py:170 driconf_simpleui.py:282 + msgid "Application Name" +-msgstr "Naam van applicatie" ++msgstr "Programmanaam" + + #: driconf_complexui.py:205 + msgid "Describe the device that you would like to configure." +@@ -169,7 +170,7 @@ + + #: driconf_complexui.py:221 + msgid "Driver Name" +-msgstr "Stuurprogrammanaam" ++msgstr "Stuurprogramma" + + #: driconf_complexui.py:344 + #, python-format +@@ -183,34 +184,33 @@ + + #: driconf_complexui.py:354 + msgid "Unspecified device" +-msgstr "Ongespecificeerd apparaat" ++msgstr "Niet-gespecificeerd apparaat" + + #: driconf_complexui.py:578 + #, python-format + msgid "Parsing the driver's configuration information: %s" +-msgstr "Tijdens het ontleden van stuurprogramma-configuratiegegevens: %s" ++msgstr "Fout tijdens het ontleden van de configuratiegegevens: %s" + + #: driconf_complexui.py:616 + #, python-format + msgid "Really delete application \"%s\"?" +-msgstr "Configuratie voor applicatie \"%s\" echt wissen?" ++msgstr "Wilt u de configuratie voor programma \"%s\" verwijderen?" + + #: driconf_complexui.py:622 + msgid "Really delete device and all applications in it?" +-msgstr "" +-"Dit apparaat en alle bijbehorende configuratiegegevens echt verwijderen?" ++msgstr "Wilt u dit apparaat en alle bijbehorende configuratiegegevens verwijderen?" + + #: driconf_complexui.py:643 + msgid "Rename Application" +-msgstr "Applicatie hernoemen" ++msgstr "Programma hernoemen" + + #: driconf_complexui.py:646 + msgid "Device Properties" +-msgstr "Apparaateigenschappen" ++msgstr "Eigenschappen van apparaat" + + #: driconf_complexui.py:653 + msgid "New Application" +-msgstr "Nieuwe applicatie" ++msgstr "Nieuw programma" + + #: driconf_complexui.py:656 + msgid "New Device" +@@ -228,12 +228,12 @@ + #: driconf_complexui.py:710 + #, python-format + msgid "Really reload \"%s\" from disk?" +-msgstr "Bestand \"%s\" echt opnieuw laden?" ++msgstr "Wilt u bestand \"%s\" opnieuw inlezen?" + + #: driconf_complexui.py:721 + #, python-format + msgid "Couldn't open \"%s\" for reading. The file was not reloaded." +-msgstr "Kan \"%s\" niet lezen. Het bestand is niet opnieuw geladen." ++msgstr "Kan \"%s\" niet openen. Het bestand is niet opnieuw ingelezen." + + #: driconf_complexui.py:733 + #, python-format +@@ -244,7 +244,7 @@ + msgstr "" + "Configuratiebestand \"%s\" bevat fouten:\n" + "%s\n" +-"Het bestand is niet opnieuw geladen." ++"Het bestand is niet opnieuw ingelezen." + + #: driconf_complexui.py:842 + msgid "Save selected configuration file" +@@ -252,15 +252,15 @@ + + #: driconf_complexui.py:845 + msgid "Reload selected configuration file" +-msgstr "Geselecteerd configuratiebestand opnieuw laden" ++msgstr "Geselecteerd configuratiebestand opnieuw inlezen" + + #: driconf_complexui.py:849 + msgid "Create a new device or application" +-msgstr "Nieuw apparaat of applicatie toevoegen" ++msgstr "Nieuw apparaat of programma toevoegen" + + #: driconf_complexui.py:852 + msgid "Remove selected device or application" +-msgstr "Geselecteerd apparaat of applicatie verwijderen" ++msgstr "Geselecteerd apparaat of programma verwijderen" + + #: driconf_complexui.py:855 + msgid "Move selected item up" +@@ -272,7 +272,7 @@ + + #: driconf_complexui.py:861 + msgid "Properties of selected device or application" +-msgstr "Eigenschappen van geselecteerd apparaat of applicatie" ++msgstr "Eigenschappen van geselecteerd apparaat of programma" + + #: driconf_complexui.py:875 + msgid "Exit DRIconf" +@@ -284,7 +284,7 @@ + + #: driconf_simpleui.py:294 + msgid "Executable Name" +-msgstr "Naam van uitvoerbare programma" ++msgstr "Naam van programmabestand" + + #: driconf_simpleui.py:314 + msgid "" +@@ -293,19 +293,19 @@ + "started by a shell script, that has a different name than the real " + "executable." + msgstr "" +-"De naam van het uitvoerbare programma is belangrijk voor het herkennen van " +-"de applicatie. Als u een verkeerde naam opgeeft, worden uw applicatie-" +-"instellingen niet toegepast. Wees erop bedacht dat sommige applicaties door " +-"een script gestart worden en dat het uiteindelijk uitgevoerde programma een " +-"andere naam heeft." ++"De naam van het programmabestand is belangrijk voor het herkennen van het " ++"programma. Houd er rekening mee dat sommige programma's door een script " ++"gestart worden en dat het uiteindelijk uitgevoerde programmabestand een " ++"andere naam heeft. Als de bestandsnaam niet precies klopt, worden uw " ++"instellingen voor dit programma niet gebruikt." + + #: driconf_simpleui.py:377 + msgid "Add setting" +-msgstr "Instelling toevoegen" ++msgstr "Toe te voegen instelling:" + + #: driconf_simpleui.py:428 + msgid "Direct Rendering Preferences" +-msgstr "Instellingen voor Direct Rendering" ++msgstr "DRI-instellingen" + + #: driconf_simpleui.py:441 driconf_simpleui.py:444 driconf_simpleui.py:456 + msgid "Screen" +@@ -317,7 +317,7 @@ + + #: driconf_simpleui.py:493 + msgid "Application settings" +-msgstr "Applicatie-instellingen" ++msgstr "Instellingen voor specifieke programma's" + + #: driconf_simpleui.py:556 driconf_simpleui.py:630 + msgid "Unknown options" +@@ -329,39 +329,36 @@ + + #: driconf_simpleui.py:708 + msgid "You must enter both an application name and an executable name." +-msgstr "" +-"U dient zowel een applicatienaam als de naam van het uitvoerbare programma " +-"op te geven." ++msgstr "Geef zowel een programmanaam als de naam van het programmabestand op." + + #: driconf_simpleui.py:713 + msgid "" + "There exists an application configuration with the same name. Please enter a " + "different name." + msgstr "" +-"Er bestaat al een applicatieconfiguratie met deze naam. Geef alstublieft " +-"een andere naam op." ++"Er bestaat al een programmaconfiguratie met deze naam. Geef een andere " ++"naam op." + + #: driconf_simpleui.py:718 + msgid "" + "There exists an application configuration for the same executable. You can't " + "create multiple application configurations for the same executable." + msgstr "" +-"Er bestaat al een applicatieconfiguratie voor dat programma. U kunt niet " +-"meerdere configuraties voor hetzelfde programma aanmaken." ++"Er bestaat al een configuratie voor dat programmabestand.\n" ++"Meerdere configuraties voor hetzelfde bestand zijn niet mogelijk." + + #: driconf_simpleui.py:734 + msgid "Add Application" +-msgstr "Applicatie toevoegen" ++msgstr "Programma toevoegen" + + #: driconf_simpleui.py:755 + msgid "Application Properties" +-msgstr "Applicatie-eigenschappen" ++msgstr "Eigenschappen van programma" + + #: driconf_simpleui.py:837 + #, python-format + msgid "The DRI configuration file \"%s\" is broken or could not be created." +-msgstr "" +-"DRI-configuratiebestand \"%s\" is beschadigd of kan niet aangemaakt worden." ++msgstr "DRI-configuratiebestand \"%s\" is beschadigd of kan niet aangemaakt worden." + + #: driconf_simpleui.py:848 + #, python-format +@@ -375,6 +372,7 @@ + "bug with the original configuration file attached. The file will be treated " + "as read-only for now." + msgstr "" +-"Normalisering van DRI-configuratiebestand \"%s\" is mislukt. Stuur " +-"alstublieft een foutrapportage op inclusief het configuratiebestand. Dit " +-"bestand wordt zolang als alleen-lezen behandeld." ++"Normalisering van DRI-configuratiebestand \"%s\" is mislukt. Stuur a.u.b. " ++"een foutrapportage op inclusief het configuratiebestand. Dit bestand wordt " ++"zolang als alleen-lezen behandeld." ++ +diff -Nru driconf-0.9.1/ru.po driconf-0.9.1-deb/ru.po +--- driconf-0.9.1/ru.po 2006-09-17 18:17:31.000000000 -0700 ++++ driconf-0.9.1-deb/ru.po 2014-01-22 01:04:27.000000000 -0800 +@@ -2,15 +2,17 @@ + msgstr "" + "Project-Id-Version: driconf\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-09-17 21:00-0400\n" +-"PO-Revision-Date: 2006-09-17 21:17-0400\n" ++"POT-Creation-Date: 2007-01-08 13:00+0300\n" ++"PO-Revision-Date: 2007-01-07 20:39+0000\n" + "Last-Translator: Konstantin A. Lepikhov \n" + "Language-Team: Russian \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Generated-By: pygettext.py 1.5\n" +-"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" ++"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"X-Generator: Pootle 0.10.1\n" + + #: driconf.py:62 + #, python-format +@@ -50,7 +52,7 @@ + "There are no usable DRI configuration files and a new one could not be " + "created. Exiting now." + msgstr "" +-"Невозмжно создать и прочитать файлы с конфигурацией DRI. Аварийное " ++"Невозможно создать и прочитать файлы с конфигурацией DRI. Аварийное " + "завершение работы программы." + + #: driconf.py:148 +@@ -71,15 +73,15 @@ + msgid "Reset to default value" + msgstr "Применить настройки по-умолчанию" + +-#: driconf_commonui.py:587 ++#: driconf_commonui.py:593 + msgid "Option" + msgstr "Опция" + +-#: driconf_commonui.py:592 ++#: driconf_commonui.py:598 + msgid "Value" + msgstr "Значение" + +-#: driconf_commonui.py:671 ++#: driconf_commonui.py:677 + msgid "" + "This tab shows settings that are no longer supported by the 3D driver. " + "Unless you're using the same configuration file on another computer with a " +@@ -89,7 +91,7 @@ + "драйвером. Лучше удалить эти настройки, если вы не пользуетесь другой " + "версией драйвера и тем же файлом конфигурации." + +-#: driconf_commonui.py:676 ++#: driconf_commonui.py:682 + msgid "" + "The driver for this device could not be determined or does not support " + "configuration. You can still change the settings but it cannot be verified " +@@ -99,20 +101,20 @@ + "возможности конфигурирования. Вы все равно сможете изменить настройки, но " + "нет гарантии, что они будут правильными и будут поддерживаться." + +-#: driconf_commonui.py:714 driconf_commonui.py:732 driconf_commonui.py:743 ++#: driconf_commonui.py:720 driconf_commonui.py:738 driconf_commonui.py:749 + msgid "translator-credits" + msgstr "Konstantin A. Lepikhov " + +-#: driconf_commonui.py:721 driconf_commonui.py:740 ++#: driconf_commonui.py:727 driconf_commonui.py:746 + #, fuzzy + msgid "A configuration applet for DRI drivers" + msgstr "Графическая среда для настройки DRI драйверов" + +-#: driconf_commonui.py:742 ++#: driconf_commonui.py:748 + msgid "Translated by" + msgstr "Переводчики" + +-#: driconf_commonui.py:748 driconf_complexui.py:871 ++#: driconf_commonui.py:754 driconf_complexui.py:871 + msgid "About DRIconf" + msgstr "О DRIconf" + +@@ -143,6 +145,7 @@ + msgstr "(нет описания)" + + #: driconf_complexui.py:163 ++#, fuzzy + msgid "" + "Enter the name of the application below. This just serves as a description " + "for you. Don't forget to set the executable afterwards." +@@ -373,3 +376,7 @@ + "bug with the original configuration file attached. The file will be treated " + "as read-only for now." + msgstr "" ++"Нормализация вашего конфигурационного файла \"%s\" закончилась неудачей. " ++"Пожалуйста, сообщите об этом разработчикам, добавив в отчёт файл " ++"конфигурации, где произошла ошибка. Сейчас ваш файл конфигурации доступен " ++"только для чтения." +diff -Nru driconf-0.9.1/it.po driconf-0.9.1-deb/it.po +--- driconf-0.9.1/it.po 2006-09-17 18:15:44.000000000 -0700 ++++ driconf-0.9.1-deb/it.po 2014-01-22 03:08:41.329223783 -0800 +@@ -1,20 +1,22 @@ ++# translation of driconf_0.9.1-2_it.po to + # Italian Translation for driconf package + # Traduzione italiana per driconf + # ++# Alessandro Zito , 2008. + msgid "" + msgstr "" +-"Project-Id-Version: it\n" ++"Project-Id-Version: driconf_0.9.1-2_it\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-09-17 21:00-0400\n" +-"PO-Revision-Date: 2006-09-17 21:07-0400\n" +-"Last-Translator: Giampaolo Bozzali \n" +-"Language-Team: \n" ++"PO-Revision-Date: 2008-03-22 15:13+0100\n" ++"Last-Translator: Alessandro Zito \n" ++"Language-Team: \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Generated-By: pygettext.py 1.5\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: KBabel 1.10\n" ++"X-Generator: KBabel 1.11.4\n" + "X-Poedit-Language: Italian\n" + "X-Poedit-Country: ITALY\n" + +@@ -27,17 +29,16 @@ + msgstr "" + "Ci sono degli errori nelle informazioni sulla configurazione di un driver:\n" + "%s\n" +-"Questo non dovrebbe accadere. Probabilmente significa che devi aggiornare " +-"DRIconf." ++"Questo non dovrebbe accadere. Probabilmente significa che devi aggiornare DRIconf." + + #: driconf.py:75 + msgid "Could not detect any configurable direct-rendering capable devices." +-msgstr "" ++msgstr "Impossibile trovare dispositivi configurabili con funzione direct-rendering" + + #: driconf.py:76 driconf_simpleui.py:839 driconf_simpleui.py:850 + #: driconf_simpleui.py:863 + msgid "DRIconf will be started in expert mode." +-msgstr "" ++msgstr "DRIconf verrà avviato in modalità esperto." + + #: driconf.py:114 + #, python-format +@@ -56,7 +57,7 @@ + msgid "" + "There are no usable DRI configuration files and a new one could not be " + "created. Exiting now." +-msgstr "" ++msgstr "Non ci sono file di configurazione DRI utilizzabili e non ne può essere creato uno nuovo. Uscita forzata dal programma." + + #: driconf.py:148 + #, python-format +@@ -70,11 +71,11 @@ + + #: driconf_commonui.py:319 + msgid "Remove" +-msgstr "" ++msgstr "Rimuovi" + + #: driconf_commonui.py:322 + msgid "Reset to default value" +-msgstr "" ++msgstr "Ripristina al valore predefinito" + + #: driconf_commonui.py:587 + msgid "Option" +@@ -90,6 +91,8 @@ + "Unless you're using the same configuration file on another computer with a " + "different driver version, it is safe to remove these settings." + msgstr "" ++"Questa sezione mostra impostazioni che non sono più supportate dal driver 3D. " ++"A meno che tu non debba utilizzare lo stesso file di configurazione su altri computer con versioni diverse del driver, è meglio rimuovere queste impostazioni." + + #: driconf_commonui.py:676 + msgid "" +@@ -104,7 +107,9 @@ + + #: driconf_commonui.py:714 driconf_commonui.py:732 driconf_commonui.py:743 + msgid "translator-credits" +-msgstr "Giampaolo Bozzali " ++msgstr "" ++"Giampaolo Bozzali " ++"Alessandro Zito " + + #: driconf_commonui.py:721 driconf_commonui.py:740 + #, fuzzy +@@ -282,7 +287,7 @@ + + #: driconf_simpleui.py:294 + msgid "Executable Name" +-msgstr "" ++msgstr "Nome dell'eseguibile" + + #: driconf_simpleui.py:314 + msgid "" +@@ -291,14 +296,16 @@ + "started by a shell script, that has a different name than the real " + "executable." + msgstr "" ++"Il nome dell'eseguibile è importante per identificare l'applicazione; se lo scrivi in modo sbagliato le tue impostazioni non verranno applicate. " ++"Ricorda che alcune applicazioni vengono avviate da uno shell script, che ha un nome diverso dall'eseguibile vero e proprio." + + #: driconf_simpleui.py:377 + msgid "Add setting" +-msgstr "" ++msgstr "Aggiungi impostazione" + + #: driconf_simpleui.py:428 + msgid "Direct Rendering Preferences" +-msgstr "" ++msgstr "Preferenze sul Direct Rendering" + + #: driconf_simpleui.py:441 driconf_simpleui.py:444 driconf_simpleui.py:456 + #, fuzzy +@@ -307,7 +314,7 @@ + + #: driconf_simpleui.py:473 + msgid "Expert Mode" +-msgstr "" ++msgstr "Modalità esperto" + + #: driconf_simpleui.py:493 + #, fuzzy +@@ -321,23 +328,27 @@ + + #: driconf_simpleui.py:635 + msgid "Known options" +-msgstr "" ++msgstr "Opzioni conosciute" + + #: driconf_simpleui.py:708 + msgid "You must enter both an application name and an executable name." +-msgstr "" ++msgstr "Devi inserire sia il nome dell'applicazione che il nome dell'eseguibile." + + #: driconf_simpleui.py:713 + msgid "" + "There exists an application configuration with the same name. Please enter a " + "different name." + msgstr "" ++"Esiste già un file di configurazione con lo stesso nome. " ++"Inserisci un nome diverso." + + #: driconf_simpleui.py:718 + msgid "" + "There exists an application configuration for the same executable. You can't " + "create multiple application configurations for the same executable." + msgstr "" ++"Esiste già un file di configurazione per questo eseguibile. " ++"Non puoi creare più file di configurazione per lo stesso eseguibile." + + #: driconf_simpleui.py:734 + #, fuzzy +@@ -366,12 +377,6 @@ + "bug with the original configuration file attached. The file will be treated " + "as read-only for now." + msgstr "" ++"Controllo fallito sul file di configurazione \"%s\". Se possibile segnala il bug con il file di configurazione originale allegato. " ++"Il file verrà utilizzato in sola lettura per il momento." + +-#~ msgid "" +-#~ "Some settings in this application configuration are unknown to the " +-#~ "driver. Maybe the driver version changed and does not support these " +-#~ "options any more. It is probably safe to delete these settings." +-#~ msgstr "" +-#~ "Alcune impostazioni in questa applicazione non sono riconosciute dal " +-#~ "driver. Potrebbe darsi che una versione più recente del driver non " +-#~ "supporti più queste opzioni. E' più sicuro rimuovere queste impostazioni." diff -Nru driconf-0.9.1/debian/patches/remove-usr-local.patch driconf-0.9.1/debian/patches/remove-usr-local.patch --- driconf-0.9.1/debian/patches/remove-usr-local.patch 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/patches/remove-usr-local.patch 2014-01-22 10:23:12.000000000 +0000 @@ -0,0 +1,63 @@ +Description: /usr/local --> /usr +Forwarded: no +Author: Michel Dänzer +Last-Upload: 2013-01-22 + +diff -Nru driconf-0.9.1/driconf driconf-0.9.1-deb/driconf +--- driconf-0.9.1/driconf 2005-08-11 12:07:12.000000000 -0700 ++++ driconf-0.9.1-deb/driconf 2014-01-22 01:04:27.000000000 -0800 +@@ -21,8 +21,6 @@ + # Contact: http://fxk.de.vu/ + + import sys +-sys.path.append("/usr/local/lib/driconf") +- + import driconf + + driconf.main() +diff -Nru driconf-0.9.1/driconf_commonui.py driconf-0.9.1-deb/driconf_commonui.py +--- driconf-0.9.1/driconf_commonui.py 2006-09-17 19:03:43.000000000 -0700 ++++ driconf-0.9.1-deb/driconf_commonui.py 2014-01-22 01:04:27.000000000 -0800 +@@ -30,7 +30,7 @@ + + # Install translations. Search in the current directory first (for + # easy testing). Then search in the default location and in +-# /usr/local/share/locale. If all this fails fall back to the null ++# /usr/share/locale. If all this fails fall back to the null + # translation. + try: + _ = gettext.translation ("driconf", ".").ugettext +@@ -38,7 +38,7 @@ + try: + _ = gettext.translation ("driconf").ugettext + except IOError: +- _ = gettext.translation ("driconf", "/usr/local/share/locale", ++ _ = gettext.translation ("driconf", "/usr/share/locale", + fallback=True).ugettext + + # global variable: lang +@@ -66,13 +66,9 @@ + # Find a file that should have been installed in .../shared/driconf + # Prefixes of __file__ are tried. And the current directory as a fallback. + def findInShared (name): +- # try all /share/driconf/name for all prefixes of __file__ +- head,tail = os.path.split (__file__) +- while head and tail: +- f = os.path.join (head, "share/driconf", name) +- if os.path.isfile (f): +- return f +- head,tail = os.path.split (head) ++ f = os.path.join ("/usr/share/driconf", name) ++ if os.path.isfile (f): ++ return f + # try name in the current directory + if os.path.isfile (name): + return name +diff -Nru driconf-0.9.1/setup.cfg driconf-0.9.1-deb/setup.cfg +--- driconf-0.9.1/setup.cfg 2005-08-11 12:07:12.000000000 -0700 ++++ driconf-0.9.1-deb/setup.cfg 2014-01-22 01:04:27.000000000 -0800 +@@ -1,3 +1,2 @@ + [install] +-prefix=/usr/local +-install-purelib=/usr/local/lib/driconf ++prefix=/usr diff -Nru driconf-0.9.1/debian/patches/rev284.patch driconf-0.9.1/debian/patches/rev284.patch --- driconf-0.9.1/debian/patches/rev284.patch 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/patches/rev284.patch 2014-01-22 10:23:39.000000000 +0000 @@ -0,0 +1,72 @@ +Description: Update to upstream revision 284 +Origin: upstream +Author: Michel Dänzer +Last-Upload: 2013-01-22 + +diff -Nru driconf-0.9.1/driconf_commonui.py driconf-0.9.1-deb/driconf_commonui.py +--- driconf-0.9.1/driconf_commonui.py 2006-09-17 19:03:43.000000000 -0700 ++++ driconf-0.9.1-deb/driconf_commonui.py 2014-01-22 01:04:27.000000000 -0800 +@@ -348,6 +348,12 @@ + if type == "bool": + self.widget = gtk.ToggleButton () + self.widget.set_use_stock (True) ++ # Make sure the button doesn't change size when toggled ++ self.widget.set_label ("gtk-yes") ++ wYes = self.widget.size_request()[0] ++ self.widget.set_label ("gtk-no") ++ wNo = self.widget.size_request()[0] ++ self.widget.set_size_request (max(wYes, wNo), -1) + if value: + self.widget.set_label ("gtk-yes") + else: +diff -Nru driconf-0.9.1/dri.py driconf-0.9.1-deb/dri.py +--- driconf-0.9.1/dri.py 2006-01-24 21:23:44.000000000 -0800 ++++ driconf-0.9.1-deb/dri.py 2014-01-22 01:04:27.000000000 -0800 +@@ -21,6 +21,7 @@ + import os + import string + import re ++import locale + import xml.parsers.expat + + class Error (Exception): +@@ -328,6 +329,29 @@ + return optSection.options[name] + return None + ++def _GLXInfoToUnicode(string): ++ """ Smart way to convert strings to unicode. ++ ++ This should give the expected result in most cases that are interesting ++ for glxinfo output. ++ """ ++ # Try a number of popular encodings starting with the locale's default. ++ # Try utf-8 before latin1, since latin1 will almost always succeed ++ # but not necessarily be correct. ++ lang,defenc = locale.getlocale(locale.LC_MESSAGES) ++ if not defenc: ++ encodings = ('utf-8', 'iso8859-1') ++ else: ++ encodings = (defenc, 'utf-8', 'iso8859-1') ++ for encoding in encodings: ++ try: ++ return unicode(string, encoding, 'strict') ++ except ValueError: ++ continue ++ # If we get here, all encodings failed. Use ascii with replacement ++ # of illegal characters as a failsafe fallback. ++ return unicode(string, 'ascii', 'replace') ++ + class GLXInfo: + def __init__ (self, screen, dpy): + if dpy == None: +@@ -359,6 +383,9 @@ + self.renderer = rMatch and rMatch.group(1) + if not self.vendor or not self.renderer: + raise DRIError ("unable to parse glxinfo output.") ++ # Make sure we end up with valid unicode ++ self.vendor = _GLXInfoToUnicode(self.vendor) ++ self.renderer = _GLXInfoToUnicode(self.renderer) + + class ScreenInfo: + """ References a DriverInfo object with the real config info. """ diff -Nru driconf-0.9.1/debian/patches/series driconf-0.9.1/debian/patches/series --- driconf-0.9.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/patches/series 2014-01-22 10:17:04.000000000 +0000 @@ -0,0 +1,5 @@ +remove-usr-local.patch +fix-unboundlocalerror.patch +rev284.patch +fix-desktop-file.patch +l10n.patch diff -Nru driconf-0.9.1/debian/pycompat driconf-0.9.1/debian/pycompat --- driconf-0.9.1/debian/pycompat 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/pycompat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2 diff -Nru driconf-0.9.1/debian/pyversions driconf-0.9.1/debian/pyversions --- driconf-0.9.1/debian/pyversions 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/pyversions 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2.3- diff -Nru driconf-0.9.1/debian/rules driconf-0.9.1/debian/rules --- driconf-0.9.1/debian/rules 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/debian/rules 2014-01-22 10:52:58.000000000 +0000 @@ -1,15 +1,8 @@ #!/usr/bin/make -f -DEB_DH_INSTALLCHANGELOGS_ARGS=CHANGELOG +%: + dh $@ --with python2 --buildsystem=python_distutils -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk - -DEB_PYTHON_SYSTEM=pysupport - -include /usr/share/cdbs/1/class/python-distutils.mk - -DEB_PYTHON_PRIVATE_MODULES_DIRS=debian/driconf/usr/share/python-support/driconf - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - dh_desktop -pdriconf +override_dh_auto_build: + $(MAKE) mo + dh_auto_build diff -Nru driconf-0.9.1/debian/source/format driconf-0.9.1/debian/source/format --- driconf-0.9.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/source/format 2014-01-22 21:55:15.200401771 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru driconf-0.9.1/debian/watch driconf-0.9.1/debian/watch --- driconf-0.9.1/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ driconf-0.9.1/debian/watch 2014-01-22 10:26:17.000000000 +0000 @@ -0,0 +1,3 @@ +version=3 +http://dri.sourceforge.net/cgi-bin/moin.cgi/DriConf \ +(?:|.*/)driconf(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) diff -Nru driconf-0.9.1/dri.py driconf-0.9.1/dri.py --- driconf-0.9.1/dri.py 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/dri.py 2006-01-25 05:23:44.000000000 +0000 @@ -21,7 +21,6 @@ import os import string import re -import locale import xml.parsers.expat class Error (Exception): @@ -329,29 +328,6 @@ return optSection.options[name] return None -def _GLXInfoToUnicode(string): - """ Smart way to convert strings to unicode. - - This should give the expected result in most cases that are interesting - for glxinfo output. - """ - # Try a number of popular encodings starting with the locale's default. - # Try utf-8 before latin1, since latin1 will almost always succeed - # but not necessarily be correct. - lang,defenc = locale.getlocale(locale.LC_MESSAGES) - if not defenc: - encodings = ('utf-8', 'iso8859-1') - else: - encodings = (defenc, 'utf-8', 'iso8859-1') - for encoding in encodings: - try: - return unicode(string, encoding, 'strict') - except ValueError: - continue - # If we get here, all encodings failed. Use ascii with replacement - # of illegal characters as a failsafe fallback. - return unicode(string, 'ascii', 'replace') - class GLXInfo: def __init__ (self, screen, dpy): if dpy == None: @@ -383,9 +359,6 @@ self.renderer = rMatch and rMatch.group(1) if not self.vendor or not self.renderer: raise DRIError ("unable to parse glxinfo output.") - # Make sure we end up with valid unicode - self.vendor = _GLXInfoToUnicode(self.vendor) - self.renderer = _GLXInfoToUnicode(self.renderer) class ScreenInfo: """ References a DriverInfo object with the real config info. """ diff -Nru driconf-0.9.1/driconf driconf-0.9.1/driconf --- driconf-0.9.1/driconf 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/driconf 2005-08-11 19:07:12.000000000 +0000 @@ -21,6 +21,8 @@ # Contact: http://fxk.de.vu/ import sys +sys.path.append("/usr/local/lib/driconf") + import driconf driconf.main() diff -Nru driconf-0.9.1/driconf.desktop driconf-0.9.1/driconf.desktop --- driconf-0.9.1/driconf.desktop 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/driconf.desktop 2006-09-18 01:41:45.000000000 +0000 @@ -3,7 +3,7 @@ Name=3D Acceleration Comment=Change 3D Acceleration options Exec=driconf -Icon=/usr/share/driconf/driconf-icon.png +Icon=/usr/local/share/driconf/driconf-icon.png Type=Application Categories=GNOME;Application;Settings;AdvancedSettings; StartupNotify=true diff -Nru driconf-0.9.1/driconf_commonui.py driconf-0.9.1/driconf_commonui.py --- driconf-0.9.1/driconf_commonui.py 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/driconf_commonui.py 2006-09-18 02:03:43.000000000 +0000 @@ -30,7 +30,7 @@ # Install translations. Search in the current directory first (for # easy testing). Then search in the default location and in -# /usr/share/locale. If all this fails fall back to the null +# /usr/local/share/locale. If all this fails fall back to the null # translation. try: _ = gettext.translation ("driconf", ".").ugettext @@ -38,7 +38,7 @@ try: _ = gettext.translation ("driconf").ugettext except IOError: - _ = gettext.translation ("driconf", "/usr/share/locale", + _ = gettext.translation ("driconf", "/usr/local/share/locale", fallback=True).ugettext # global variable: lang @@ -66,9 +66,13 @@ # Find a file that should have been installed in .../shared/driconf # Prefixes of __file__ are tried. And the current directory as a fallback. def findInShared (name): - f = os.path.join ("/usr/share/driconf", name) - if os.path.isfile (f): - return f + # try all /share/driconf/name for all prefixes of __file__ + head,tail = os.path.split (__file__) + while head and tail: + f = os.path.join (head, "share/driconf", name) + if os.path.isfile (f): + return f + head,tail = os.path.split (head) # try name in the current directory if os.path.isfile (name): return name @@ -348,12 +352,6 @@ if type == "bool": self.widget = gtk.ToggleButton () self.widget.set_use_stock (True) - # Make sure the button doesn't change size when toggled - self.widget.set_label ("gtk-yes") - wYes = self.widget.size_request()[0] - self.widget.set_label ("gtk-no") - wNo = self.widget.size_request()[0] - self.widget.set_size_request (max(wYes, wNo), -1) if value: self.widget.set_label ("gtk-yes") else: diff -Nru driconf-0.9.1/driconf_simpleui.py driconf-0.9.1/driconf_simpleui.py --- driconf-0.9.1/driconf_simpleui.py 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/driconf_simpleui.py 2006-09-18 00:49:54.000000000 +0000 @@ -266,8 +266,8 @@ j = i break i = i - 1 - else: - i = j = chars + if i < chars/3: + i = chars head, tail = head + tail[:i] + '\n', tail[j:] return head diff -Nru driconf-0.9.1/nl.po driconf-0.9.1/nl.po --- driconf-0.9.1/nl.po 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/nl.po 2006-09-18 01:15:44.000000000 +0000 @@ -1,19 +1,18 @@ -# Translation of driconf-0.9.1 to Dutch. +# Translation of driconf-0.9.0 to Dutch. # Benno Schulenberg , 2006. # msgid "" msgstr "" -"Project-Id-Version: driconf 0.9.1\n" +"Project-Id-Version: driconfr 0.9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-17 21:00-0400\n" -"PO-Revision-Date: 2006-09-28 22:54+0200\n" +"PO-Revision-Date: 2006-09-17 21:09-0400\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: driconf.py:62 #, python-format @@ -54,18 +53,18 @@ "There are no usable DRI configuration files and a new one could not be " "created. Exiting now." msgstr "" -"Er zijn geen bruikbare DRI-configuratiebestanden gevonden en een nieuw " -"bestand kon niet aangemaakt worden. DRIconf wordt nu afgesloten." +"Er zijn geen bruikbare DRI-configuratiebestanden gevonden, en een nieuw " +"bestand kon niet aangemaakt worden. Het programma wordt nu afgesloten." #: driconf.py:148 #, python-format msgid "Created a new DRI configuration file \"%s\" for you." -msgstr "Een nieuw configuratiebestand \"%s\" is voor u aangemaakt." +msgstr "Een nieuw configuratiebestand \"%s\" werd voor u aangemaakt." #: driconf.py:156 #, python-format msgid "Created new DRI configuration files %s for you." -msgstr "Nieuwe configuratiebestanden \"%s\" zijn voor u aangemaakt." +msgstr "Nieuwe configuratiebestanden \"%s\" werden voor u aangemaakt." #: driconf_commonui.py:319 msgid "Remove" @@ -89,8 +88,8 @@ "Unless you're using the same configuration file on another computer with a " "different driver version, it is safe to remove these settings." msgstr "" -"Dit tabblad toont instellingen die het 3D-stuurprogramma niet langer kent. " -"U kunt deze instellingen simpelweg verwijderen, tenzij u ditzelfde " +"Deze tab toont instellingen die het 3D-stuurprogramma niet langer kent. U " +"kunt deze instellingen simpelweg verwijderen, tenzij u ditzelfde " "configuratiebestand op een andere computer met een andere versie van het " "stuurprogramma gebruikt." @@ -111,7 +110,7 @@ #: driconf_commonui.py:721 driconf_commonui.py:740 msgid "A configuration applet for DRI drivers" -msgstr "Configureren van DRI-stuurprogramma's" +msgstr "Configuratiegereedschap voor DRI-stuurprogramma's" #: driconf_commonui.py:742 msgid "Translated by" @@ -123,11 +122,11 @@ #: driconf_complexui.py:39 msgid "Application" -msgstr "Programma" +msgstr "Applicatie" #: driconf_complexui.py:46 msgid "Apply only to this executable" -msgstr "Alleen op dit programmabestand toepassen" +msgstr "Alleen op dit uitvoerbare programma toepassen" #: driconf_complexui.py:49 msgid "" @@ -135,9 +134,9 @@ "Beware that some applications or games are just a shell script that starts a " "real executable with a different name." msgstr "" -"Als dit uitstaat, gelden de instellingen voor alle programma's.\n" -"Houd er rekening mee dat sommige programma's slechts een shellscript zijn en " -"dat het uiteindelijk gestarte programmabestand een andere naam heeft." +"Als dit uitstaat, gelden de instellingen voor alle applicaties.\n" +"Wees erop bedacht dat sommige applicaties slechts een shellscript zijn en " +"dat het uiteindelijk gestarte programma een andere naam heeft." #: driconf_complexui.py:73 msgid "Unknown" @@ -152,13 +151,13 @@ "Enter the name of the application below. This just serves as a description " "for you. Don't forget to set the executable afterwards." msgstr "" -"Geef hieronder een naam voor het programma op. Dit dient slechts als een " -"omschrijving voor uzelf. Vergeet niet verderop de naam van het eigenlijke " -"programmabestand vast te leggen." +"Geef hieronder een naam voor de applicatie op. Dit dient slechts als een " +"omschrijving voor uzelf. Vergeet niet verderop de naam van het uitvoerbare " +"programma vast te leggen." #: driconf_complexui.py:170 driconf_simpleui.py:282 msgid "Application Name" -msgstr "Programmanaam" +msgstr "Naam van applicatie" #: driconf_complexui.py:205 msgid "Describe the device that you would like to configure." @@ -170,7 +169,7 @@ #: driconf_complexui.py:221 msgid "Driver Name" -msgstr "Stuurprogramma" +msgstr "Stuurprogrammanaam" #: driconf_complexui.py:344 #, python-format @@ -184,33 +183,34 @@ #: driconf_complexui.py:354 msgid "Unspecified device" -msgstr "Niet-gespecificeerd apparaat" +msgstr "Ongespecificeerd apparaat" #: driconf_complexui.py:578 #, python-format msgid "Parsing the driver's configuration information: %s" -msgstr "Fout tijdens het ontleden van de configuratiegegevens: %s" +msgstr "Tijdens het ontleden van stuurprogramma-configuratiegegevens: %s" #: driconf_complexui.py:616 #, python-format msgid "Really delete application \"%s\"?" -msgstr "Wilt u de configuratie voor programma \"%s\" verwijderen?" +msgstr "Configuratie voor applicatie \"%s\" echt wissen?" #: driconf_complexui.py:622 msgid "Really delete device and all applications in it?" -msgstr "Wilt u dit apparaat en alle bijbehorende configuratiegegevens verwijderen?" +msgstr "" +"Dit apparaat en alle bijbehorende configuratiegegevens echt verwijderen?" #: driconf_complexui.py:643 msgid "Rename Application" -msgstr "Programma hernoemen" +msgstr "Applicatie hernoemen" #: driconf_complexui.py:646 msgid "Device Properties" -msgstr "Eigenschappen van apparaat" +msgstr "Apparaateigenschappen" #: driconf_complexui.py:653 msgid "New Application" -msgstr "Nieuw programma" +msgstr "Nieuwe applicatie" #: driconf_complexui.py:656 msgid "New Device" @@ -228,12 +228,12 @@ #: driconf_complexui.py:710 #, python-format msgid "Really reload \"%s\" from disk?" -msgstr "Wilt u bestand \"%s\" opnieuw inlezen?" +msgstr "Bestand \"%s\" echt opnieuw laden?" #: driconf_complexui.py:721 #, python-format msgid "Couldn't open \"%s\" for reading. The file was not reloaded." -msgstr "Kan \"%s\" niet openen. Het bestand is niet opnieuw ingelezen." +msgstr "Kan \"%s\" niet lezen. Het bestand is niet opnieuw geladen." #: driconf_complexui.py:733 #, python-format @@ -244,7 +244,7 @@ msgstr "" "Configuratiebestand \"%s\" bevat fouten:\n" "%s\n" -"Het bestand is niet opnieuw ingelezen." +"Het bestand is niet opnieuw geladen." #: driconf_complexui.py:842 msgid "Save selected configuration file" @@ -252,15 +252,15 @@ #: driconf_complexui.py:845 msgid "Reload selected configuration file" -msgstr "Geselecteerd configuratiebestand opnieuw inlezen" +msgstr "Geselecteerd configuratiebestand opnieuw laden" #: driconf_complexui.py:849 msgid "Create a new device or application" -msgstr "Nieuw apparaat of programma toevoegen" +msgstr "Nieuw apparaat of applicatie toevoegen" #: driconf_complexui.py:852 msgid "Remove selected device or application" -msgstr "Geselecteerd apparaat of programma verwijderen" +msgstr "Geselecteerd apparaat of applicatie verwijderen" #: driconf_complexui.py:855 msgid "Move selected item up" @@ -272,7 +272,7 @@ #: driconf_complexui.py:861 msgid "Properties of selected device or application" -msgstr "Eigenschappen van geselecteerd apparaat of programma" +msgstr "Eigenschappen van geselecteerd apparaat of applicatie" #: driconf_complexui.py:875 msgid "Exit DRIconf" @@ -284,7 +284,7 @@ #: driconf_simpleui.py:294 msgid "Executable Name" -msgstr "Naam van programmabestand" +msgstr "Naam van uitvoerbare programma" #: driconf_simpleui.py:314 msgid "" @@ -293,19 +293,19 @@ "started by a shell script, that has a different name than the real " "executable." msgstr "" -"De naam van het programmabestand is belangrijk voor het herkennen van het " -"programma. Houd er rekening mee dat sommige programma's door een script " -"gestart worden en dat het uiteindelijk uitgevoerde programmabestand een " -"andere naam heeft. Als de bestandsnaam niet precies klopt, worden uw " -"instellingen voor dit programma niet gebruikt." +"De naam van het uitvoerbare programma is belangrijk voor het herkennen van " +"de applicatie. Als u een verkeerde naam opgeeft, worden uw applicatie-" +"instellingen niet toegepast. Wees erop bedacht dat sommige applicaties door " +"een script gestart worden en dat het uiteindelijk uitgevoerde programma een " +"andere naam heeft." #: driconf_simpleui.py:377 msgid "Add setting" -msgstr "Toe te voegen instelling:" +msgstr "Instelling toevoegen" #: driconf_simpleui.py:428 msgid "Direct Rendering Preferences" -msgstr "DRI-instellingen" +msgstr "Instellingen voor Direct Rendering" #: driconf_simpleui.py:441 driconf_simpleui.py:444 driconf_simpleui.py:456 msgid "Screen" @@ -317,7 +317,7 @@ #: driconf_simpleui.py:493 msgid "Application settings" -msgstr "Instellingen voor specifieke programma's" +msgstr "Applicatie-instellingen" #: driconf_simpleui.py:556 driconf_simpleui.py:630 msgid "Unknown options" @@ -329,36 +329,39 @@ #: driconf_simpleui.py:708 msgid "You must enter both an application name and an executable name." -msgstr "Geef zowel een programmanaam als de naam van het programmabestand op." +msgstr "" +"U dient zowel een applicatienaam als de naam van het uitvoerbare programma " +"op te geven." #: driconf_simpleui.py:713 msgid "" "There exists an application configuration with the same name. Please enter a " "different name." msgstr "" -"Er bestaat al een programmaconfiguratie met deze naam. Geef een andere " -"naam op." +"Er bestaat al een applicatieconfiguratie met deze naam. Geef alstublieft " +"een andere naam op." #: driconf_simpleui.py:718 msgid "" "There exists an application configuration for the same executable. You can't " "create multiple application configurations for the same executable." msgstr "" -"Er bestaat al een configuratie voor dat programmabestand.\n" -"Meerdere configuraties voor hetzelfde bestand zijn niet mogelijk." +"Er bestaat al een applicatieconfiguratie voor dat programma. U kunt niet " +"meerdere configuraties voor hetzelfde programma aanmaken." #: driconf_simpleui.py:734 msgid "Add Application" -msgstr "Programma toevoegen" +msgstr "Applicatie toevoegen" #: driconf_simpleui.py:755 msgid "Application Properties" -msgstr "Eigenschappen van programma" +msgstr "Applicatie-eigenschappen" #: driconf_simpleui.py:837 #, python-format msgid "The DRI configuration file \"%s\" is broken or could not be created." -msgstr "DRI-configuratiebestand \"%s\" is beschadigd of kan niet aangemaakt worden." +msgstr "" +"DRI-configuratiebestand \"%s\" is beschadigd of kan niet aangemaakt worden." #: driconf_simpleui.py:848 #, python-format @@ -372,7 +375,6 @@ "bug with the original configuration file attached. The file will be treated " "as read-only for now." msgstr "" -"Normalisering van DRI-configuratiebestand \"%s\" is mislukt. Stuur a.u.b. " -"een foutrapportage op inclusief het configuratiebestand. Dit bestand wordt " -"zolang als alleen-lezen behandeld." - +"Normalisering van DRI-configuratiebestand \"%s\" is mislukt. Stuur " +"alstublieft een foutrapportage op inclusief het configuratiebestand. Dit " +"bestand wordt zolang als alleen-lezen behandeld." diff -Nru driconf-0.9.1/ru.po driconf-0.9.1/ru.po --- driconf-0.9.1/ru.po 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/ru.po 2006-09-18 01:17:31.000000000 +0000 @@ -2,17 +2,15 @@ msgstr "" "Project-Id-Version: driconf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-08 13:00+0300\n" -"PO-Revision-Date: 2007-01-07 20:39+0000\n" +"POT-Creation-Date: 2006-09-17 21:00-0400\n" +"PO-Revision-Date: 2006-09-17 21:17-0400\n" "Last-Translator: Konstantin A. Lepikhov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 0.10.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: driconf.py:62 #, python-format @@ -52,7 +50,7 @@ "There are no usable DRI configuration files and a new one could not be " "created. Exiting now." msgstr "" -"Невозможно создать и прочитать файлы с конфигурацией DRI. Аварийное " +"Невозмжно создать и прочитать файлы с конфигурацией DRI. Аварийное " "завершение работы программы." #: driconf.py:148 @@ -73,15 +71,15 @@ msgid "Reset to default value" msgstr "Применить настройки по-умолчанию" -#: driconf_commonui.py:593 +#: driconf_commonui.py:587 msgid "Option" msgstr "Опция" -#: driconf_commonui.py:598 +#: driconf_commonui.py:592 msgid "Value" msgstr "Значение" -#: driconf_commonui.py:677 +#: driconf_commonui.py:671 msgid "" "This tab shows settings that are no longer supported by the 3D driver. " "Unless you're using the same configuration file on another computer with a " @@ -91,7 +89,7 @@ "драйвером. Лучше удалить эти настройки, если вы не пользуетесь другой " "версией драйвера и тем же файлом конфигурации." -#: driconf_commonui.py:682 +#: driconf_commonui.py:676 msgid "" "The driver for this device could not be determined or does not support " "configuration. You can still change the settings but it cannot be verified " @@ -101,20 +99,20 @@ "возможности конфигурирования. Вы все равно сможете изменить настройки, но " "нет гарантии, что они будут правильными и будут поддерживаться." -#: driconf_commonui.py:720 driconf_commonui.py:738 driconf_commonui.py:749 +#: driconf_commonui.py:714 driconf_commonui.py:732 driconf_commonui.py:743 msgid "translator-credits" msgstr "Konstantin A. Lepikhov " -#: driconf_commonui.py:727 driconf_commonui.py:746 +#: driconf_commonui.py:721 driconf_commonui.py:740 #, fuzzy msgid "A configuration applet for DRI drivers" msgstr "Графическая среда для настройки DRI драйверов" -#: driconf_commonui.py:748 +#: driconf_commonui.py:742 msgid "Translated by" msgstr "Переводчики" -#: driconf_commonui.py:754 driconf_complexui.py:871 +#: driconf_commonui.py:748 driconf_complexui.py:871 msgid "About DRIconf" msgstr "О DRIconf" @@ -145,7 +143,6 @@ msgstr "(нет описания)" #: driconf_complexui.py:163 -#, fuzzy msgid "" "Enter the name of the application below. This just serves as a description " "for you. Don't forget to set the executable afterwards." @@ -376,7 +373,3 @@ "bug with the original configuration file attached. The file will be treated " "as read-only for now." msgstr "" -"Нормализация вашего конфигурационного файла \"%s\" закончилась неудачей. " -"Пожалуйста, сообщите об этом разработчикам, добавив в отчёт файл " -"конфигурации, где произошла ошибка. Сейчас ваш файл конфигурации доступен " -"только для чтения." diff -Nru driconf-0.9.1/setup.cfg driconf-0.9.1/setup.cfg --- driconf-0.9.1/setup.cfg 2014-01-22 21:55:15.000000000 +0000 +++ driconf-0.9.1/setup.cfg 2005-08-11 19:07:12.000000000 +0000 @@ -1,2 +1,3 @@ [install] -prefix=/usr +prefix=/usr/local +install-purelib=/usr/local/lib/driconf