Author: dnusinow
Date: 2005-09-14 20:53:54 -0500 (Wed, 14 Sep 2005)
New Revision: 601
Removed:
trunk/debian/patches/debian/916_add_XKBPATH_env_variable.diff
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/series
trunk/debian/po/eu.po
Log:
Remove changes made while xorg-x11 -7 was in limbo due to security embargo. The
changes will appear in -8.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-10 18:54:52 UTC (rev 600)
+++ trunk/debian/changelog 2005-09-15 01:53:54 UTC (rev 601)
@@ -18,19 +18,8 @@
dpkg-buildpackage -nc to work. Thanks Jeremy Shaw.
+ Also add -f to ln command in genscripts to allow -nc to work
- [ Denis Barbier ]
- * Modify setxkbmap and xkbcomp to look for XKB files in $XKBPATH if this
- environment variable is set. This allows installing both xlibs and
- xkeyboard-config at the same time, so that xkeyboard-config can install
- its files under /etc/X11/xkb-data until all packages depending on xlibs
- are fixed (closes: #324768).
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 3 Sep 2005 14:52:46 -0400
- [ Christian Perrier ]
- * Updated Basque translation (zh_CN.po). Thanks, Piarres Beobide!
- (closes: #327409).
-
- -- Christian Perrier <[EMAIL PROTECTED]> Sat, 10 Sep 2005 09:52:57 +0200
-
xorg-x11 (6.8.2.dfsg.1-6) unstable; urgency=low
[ Branden Robinson ]
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-09-10 18:54:52 UTC (rev 600)
+++ trunk/debian/control 2005-09-15 01:53:54 UTC (rev 601)
@@ -290,7 +290,7 @@
# cpp-3.3 (<< 1:3.3.3-0pre1)
# Previous versions of cpp 3.3 had broken support for the -traditional
# flag.
-# linux-kernel-headers (>= 2.6.13+0rc3-1.1)
+# linux-kernel-headers (<< 2.6.13+0rc3-1.1)
# Previous versions had a busted joystick.h file (see Debian #320515).
Package: lbxproxy
Deleted: trunk/debian/patches/debian/916_add_XKBPATH_env_variable.diff
===================================================================
--- trunk/debian/patches/debian/916_add_XKBPATH_env_variable.diff
2005-09-10 18:54:52 UTC (rev 600)
+++ trunk/debian/patches/debian/916_add_XKBPATH_env_variable.diff
2005-09-15 01:53:54 UTC (rev 601)
@@ -1,88 +0,0 @@
-$Id$
-
-As explained in #324768, this patch modifies setxkbmap and xkbcomp
-programs so that they look for XKB data files in $XKBPATH if this
-environment variable is set. This allows installing both xlibs and
-xkeyboard-config at the same time, so that xkeyboard-config can
-install its files under /etc/X11/xkb-data until all packages depending
-on xlibs are fixed. This patch by Denis Barbier.
-
-This patch will not be submitted upstream.
-
-Index: xorg-x11/xc/programs/setxkbmap/setxkbmap.c
-===================================================================
---- xorg-x11.orig/xc/programs/setxkbmap/setxkbmap.c
-+++ xorg-x11/xc/programs/setxkbmap/setxkbmap.c
-@@ -318,9 +318,13 @@
- int i;
- Bool ok;
- unsigned present;
-+char *xkbpath;
-
- ok= True;
- addToList(&szInclPath,&numInclPath,&inclPath,".");
-+ xkbpath= (char *)getenv("XKBPATH");
-+ if (xkbpath!=NULL)
-+ addToList(&szInclPath,&numInclPath,&inclPath,xkbpath);
- addToList(&szInclPath,&numInclPath,&inclPath,DFLT_XKB_CONFIG_ROOT);
- for (i=1;(i<argc)&&ok;i++) {
- if (argv[i][0]!='-') {
-Index: xorg-x11/xc/programs/xkbcomp/xkbpath.c
-===================================================================
---- xorg-x11.orig/xc/programs/xkbcomp/xkbpath.c
-+++ xorg-x11/xc/programs/xkbcomp/xkbpath.c
-@@ -131,9 +131,14 @@
- void
- XkbAddDefaultDirectoriesToPath(void)
- {
-+char *xkbpath;
-+
- if (noDefaultPath)
- return;
- XkbAddDirectoryToPath(".");
-+ xkbpath= (char *)getenv("XKBPATH");
-+ if (xkbpath!=NULL)
-+ XkbAddDirectoryToPath(xkbpath);
- XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
- }
-
-Index: xorg-x11/xc/programs/xkbevd/xkbevd.c
-===================================================================
---- xorg-x11.orig/xc/programs/xkbevd/xkbevd.c
-+++ xorg-x11/xc/programs/xkbevd/xkbevd.c
-@@ -471,20 +471,28 @@
- else {
- file= fopen(cfgFileName,"r");
- if (file==NULL) { /* no personal config, try for a system one */
-+ char *xkbpath;
- if (cfgFileName!=buf) { /* user specified a file. bail */
- uError("Can't open config file \"%s\n",cfgFileName);
- uAction("Exiting\n");
- exit(1);
- }
-- sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,DFLT_XKB_CONFIG_ROOT);
-- file= fopen(cfgFileName,"r");
-+ xkbpath= (char *)getenv("XKBPATH");
-+ if (xkbpath!=NULL) {
-+ sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,xkbpath);
-+ file= fopen(cfgFileName,"r");
-+ }
- if (file==NULL) {
-- if (verbose) {
-- uError("Couldn't find a config file anywhere\n");
-- uAction("Exiting\n");
-- exit(1);
-+ sprintf(buf,DFLT_SYS_XKBEVD_CONFIG,DFLT_XKB_CONFIG_ROOT);
-+ file= fopen(cfgFileName,"r");
-+ if (file==NULL) {
-+ if (verbose) {
-+ uError("Couldn't find a config file anywhere\n");
-+ uAction("Exiting\n");
-+ exit(1);
-+ }
-+ exit(0);
- }
-- exit(0);
- }
- }
- }
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-09-10 18:54:52 UTC (rev 600)
+++ trunk/debian/patches/series 2005-09-15 01:53:54 UTC (rev 601)
@@ -158,7 +158,6 @@
debian/913_debian_remove_code_ref_to_object_code_files.diff -p0
debian/914_make_static_libs.diff -p0
debian/915_disable_i915_debugging.diff -p0
-debian/916_add_XKBPATH_env_variable.diff
debian/989_ubuntu_add_extra_modelines_from_xorg.diff -p0
debian/990_ubuntu_accept_enabled_for_extensions.diff -p0
debian/991_ubuntu_gcc_flags.diff -p0
Modified: trunk/debian/po/eu.po
===================================================================
--- trunk/debian/po/eu.po 2005-09-10 18:54:52 UTC (rev 600)
+++ trunk/debian/po/eu.po 2005-09-15 01:53:54 UTC (rev 601)
@@ -1,4 +1,3 @@
-# translation of eu.po to librezale.org
# debconf templates for xorg-x11 package
# Euskara translation
#
@@ -6,6 +5,7 @@
#
# Copyright:
# Branden Robinson, 2000-2004
+# Piarres Beobide <[EMAIL PROTECTED]>, 2005.
#
# This file is distributed under the same license as the xorg-x11 package.
# Please see debian/copyright.
@@ -21,20 +21,19 @@
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
#
# Developers do not need to manually edit POT or PO files.
-# Piarres Beobide <[EMAIL PROTECTED]>, 2005.
#
msgid ""
msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: xorg-x11 6.8.2.dfsg.1-4\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
"POT-Creation-Date: 2005-08-03 11:55:14+0200\n"
-"PO-Revision-Date: 2005-09-10 00:31+0200\n"
+"PO-Revision-Date: 2005-08-01 15:45+0200\n"
"Last-Translator: Piarres Beobide <[EMAIL PROTECTED]>\n"
-"Language-Team: librezale.org <[EMAIL PROTECTED]>\n"
+"Language-Team: Librezale <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.9.1\n"
#. Type: boolean
#. Description
@@ -251,7 +250,8 @@
#. Description
#: ../xserver-common.templates:5
msgid "Select what type of user has permission to start the X server."
-msgstr "Hauatatu zein erabiltzaile motak duen X zerbitzaria abiarazteko
baimena."
+msgstr ""
+"Hauatatu zein erabiltzaile motak duen X zerbitzaria abiarazteko baimena."
#. Type: select
#. Description
@@ -423,7 +423,7 @@
msgstr ""
"X zerbitzaria X leiho sistemaren hardware intefazea da. Bere eginkizuna "
"bideo gailu eta sarrera gailuak komunikatzea da, Erabiltzaile Interfaze "
-"Grafikoa (GUI) hautatzeko aukera emango dizu."
+"Grafikoa (GUI) hautatzeko aukera emanog dizu."
#. Type: select
#. Description
@@ -434,7 +434,7 @@
"hardware."
msgstr ""
"Zenbait X zerbitzari daude eskuragarri; lehenetsia /etc/X11/X esteka "
-"sinbolikoaren bidez aukeratua izango da. Zenbait X zerbitzarik ezin du zure "
+"sinbolikoarne bidez aukeratua izango da. Zenbait X zerbitzarik ezin du zure "
"hardware grafikoarekin lan egin."
#. Type: boolean
@@ -491,6 +491,7 @@
#. Type: multiselect
#. Description
#: ../xserver-xorg.templates:66
+#, fuzzy
msgid ""
"The glx module enables software OpenGL rendering. The dri module enables "
"support in the X server for Direct Rendering Infrastructure (DRI). Note "
@@ -499,7 +500,7 @@
"operations using DRI to work. Otherwise, the server falls back to software "
"rendering."
msgstr ""
-"glx moduluak OpenGL errenderizazioa gaitzen du. Dri moduluak X "
+"GLCore eta glx moduluek OpenGL errenderizazioa gaitzen dute. Dri moduluak X "
"zerbitzarian \"Direct Rendering Infraestructure (DRI)\" onarpena gaitzen du. "
"Kontutan izan DRI onarpena kernelean ere gaiturik egon behar dela, bideo "
"txartela eta instalaturiko hardware-azeleraturiko MESA liburutegiek DRI "
@@ -509,6 +510,7 @@
#. Type: multiselect
#. Description
#: ../xserver-xorg.templates:66
+#, fuzzy
msgid ""
"The vbe and ddc modules enable support for VESA BIOS Extensions and Data "
"Display Channel, respectively. These modules are used to query monitor "
@@ -520,7 +522,7 @@
"vbe eta ddc moduluek VESA BIOS luzapenak eta \"Data Display Channel\" "
"onarpoenak gaitzen dituzte. Modulu hauek bideo txartelaren bidez monitore "
"gaitasunak atzemateko erabiltzen dira. int10 modulua bigarren VGA txartelak "
-"soft bidez abiarazteko erabiltzen den modu-errealeko x86 emuladorea da. "
+"soft bidez abiarazteko erabiltzen de modu-errealeko x86 emuladorea da. "
"Kontutan izan vbe moduluak intl10 moduluaren beharra duela, beraz vbe gaitu "
"nai ezkero, intl10 gaitu behar duzu ere."
@@ -528,7 +530,7 @@
#. Description
#: ../xserver-xorg.templates:66
msgid "The v4l module enables support for the Video4Linux kernel interface."
-msgstr "vl4 moduluak Video4Linux interfazea onarpena gaitzen du."
+msgstr ""
#. Type: multiselect
#. Description
@@ -557,8 +559,11 @@
#. Type: multiselect
#. Description
#: ../xserver-xorg.templates:66
+#, fuzzy
msgid "The bitmap, freetype, and type1 modules are all font rasterizers."
-msgstr "bitmap, freetype, speedo, type1, eta xtt moduluak letra-tipo
ikuspegiak dira."
+msgstr ""
+"bitmap, freetype, speedo, type1, eta xtt moduluak letra-tipo deka letra-tipo "
+"\"rasterizers\" dira."
#. Type: multiselect
#. Description
@@ -566,7 +571,8 @@
msgid ""
"For further information about these modules, please consult the X.Org "
"documentation."
-msgstr "Modulu hauei buruzko argibide gehiagorako, begiratu X-Org
dokumentazioa."
+msgstr ""
+"Modulu hauei buruzko argibide gehiagorako, begiratu X-Org dokumentazioa."
#. Type: multiselect
#. Description
@@ -728,6 +734,7 @@
#. Type: string
#. Description
#: ../xserver-xorg.templates:147
+#, fuzzy
msgid ""
"For users of multi-head setups, this option will configure only one of the "
"heads. Further configuration will have to be done manually in the X server "
@@ -984,7 +991,8 @@
#. Description
#: ../xserver-xorg.templates:214
msgid "Users of U.S. English keyboards should generally enter \"pc104\"."
-msgstr "E.B Ingeles teklatu erabiltzaileak normalean \"pc104\" aukeratu
beharko dute."
+msgstr ""
+"E.B Ingeles teklatu erabiltzaileak normalean \"pc104\" aukeratu beharko dute."
#. Type: string
#. Description
@@ -1076,7 +1084,8 @@
#. Type: string
#. Description
#: ../xserver-xorg.templates:270
-msgid "Users of U.S. English keyboards should generally leave this entry
blank."
+msgid ""
+"Users of U.S. English keyboards should generally leave this entry blank."
msgstr ""
"E.B Ingeles teklatuen erabiltzaileek normalean aukera hau zurian utzi behar "
"dute."
@@ -1360,7 +1369,8 @@
#. Type: boolean
#. Description
#: ../xserver-xorg.templates:389
-msgid "If autodetection fails, you will be asked for information about your
monitor."
+msgid ""
+"If autodetection fails, you will be asked for information about your monitor."
msgstr ""
"Auto-atzemateak huts egin ezkero, zure monitorearen ezaugarri batzuek "
"galdetuko zaizkizu."
@@ -1721,4 +1731,3 @@
#: ../xserver-xorg.templates:538
msgid "Characters other than digits are not allowed in the entry."
msgstr "Zenbakiak ez diren karaktererik ez da onartzen sarrera honetan"
-
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
