[Pkg-kde-commits] rev 317 - in branches/kde-3.3.2/kdeutils/debian: . man patches
Christopher Martin
chrsmrtn-guest@haydn.debian.org
Thu, 16 Dec 2004 15:29:06 -0700
Author: chrsmrtn-guest
Date: 2004-12-16 15:28:44 -0700 (Thu, 16 Dec 2004)
New Revision: 317
Added:
branches/kde-3.3.2/kdeutils/debian/kcharselect.manpages
branches/kde-3.3.2/kdeutils/debian/man/kcharselect.1
branches/kde-3.3.2/kdeutils/debian/patches/01_kdeutils_branch.diff
branches/kde-3.3.2/kdeutils/debian/patches/06_automake-1.9.diff
branches/kde-3.3.2/kdeutils/debian/patches/07_kfloppy-devicename-table.diff
Removed:
branches/kde-3.3.2/kdeutils/debian/patches/01_kdeutils_branch.diff.uu
Modified:
branches/kde-3.3.2/kdeutils/debian/changelog
branches/kde-3.3.2/kdeutils/debian/control
branches/kde-3.3.2/kdeutils/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdeutils/debian/patches/03_libtool_arm.diff
branches/kde-3.3.2/kdeutils/debian/patches/04_am_maintainer_mode.diff
branches/kde-3.3.2/kdeutils/debian/patches/05_pedantic-errors.diff
branches/kde-3.3.2/kdeutils/debian/rules
Log:
kdeutils initial 3.3.2 commit.
Modified: branches/kde-3.3.2/kdeutils/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/changelog 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/changelog 2004-12-16 22:28:44 UTC (rev 317)
@@ -1,3 +1,16 @@
+kdeutils (4:3.3.2-1~pre1) unstable; urgency=low
+
+ * New upstream release.
+ * KDE_3_3_BRANCH update.
+ * Remove build-dependency on automake1.9.
+ * Strengthen Suggests to Recommends on compression utilties found in
+ main. Also add Recommends on bzip2.
+ * Add patch fixing kfloppy + udev. (Closes: #273890)
+ * Add kcharselect manpage from Karolina Lindqvist. (Closes: #192570)
+ * Updated kmilo and ksim package descriptions. (Closes: #250094, #235347)
+
+ -- Christopher Martin <chrsmrtn@freeshell.org> Thu, 16 Dec 2004 15:26:40 -0500
+
kdeutils (4:3.3.1-1) unstable; urgency=low
* New upstream release.
Modified: branches/kde-3.3.2/kdeutils/debian/control
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/control 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/control 2004-12-16 22:28:44 UTC (rev 317)
@@ -2,9 +2,9 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: automake1.9, debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.1), libkonq4-dev (>> 4:3.3.1), libsnmp5-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
-Standards-Version: 3.6.1.0
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>
+Build-Depends: debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.1), libkonq4-dev (>> 4:3.3.1), libsnmp5-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
+Standards-Version: 3.6.1
Package: kdeutils
Section: kde
@@ -37,7 +37,8 @@
Section: utils
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: khelpcenter, arj, ncompress, rar, unzip, zip, zoo
+Recommends: arj, ncompress, unzip, zip, zoo, bzip2
+Suggests: khelpcenter, rar
Description: KDE archiving tool
KDE is a powerful Open Source graphical desktop environment for Unix
workstations. It combines ease of use, contemporary functionality, and
@@ -238,7 +239,10 @@
outstanding graphical design with the technological superiority of the Unix
operating system.
.
- KDE kded hardware support module.
+ KMilo lets you use the special keys on some keyboards and laptops. Usually
+ this includes volume keys and other features. Currently, KMilo comes with
+ plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
+ with special keys.
.
This package is part of the official KDE utils module.
@@ -268,7 +272,9 @@
outstanding graphical design with the technological superiority of the Unix
operating system.
.
- KSim is a plugin-based system information monitor.
+ KSim is a system monitor app which has its own plugin system with support
+ for GKrellm skins. It allows users to follow uptime, memory usage, network
+ connections, power, etc.
.
This package is part of the official KDE utils module.
Added: branches/kde-3.3.2/kdeutils/debian/kcharselect.manpages
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/kcharselect.manpages 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/kcharselect.manpages 2004-12-16 22:28:44 UTC (rev 317)
@@ -0,0 +1 @@
+debian/man/kcharselect.1
Added: branches/kde-3.3.2/kdeutils/debian/man/kcharselect.1
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/man/kcharselect.1 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/man/kcharselect.1 2004-12-16 22:28:44 UTC (rev 317)
@@ -0,0 +1,253 @@
+.lf 1 info/kdeutils.kcharselect.1
+.TH KCHARSELECT 1 "May 2003" KDE "KDE Application"
+.SH NAME
+kcharselect \- KDE Character Selector
+.SH SYNOPSIS
+.B kcharselect
+[\fIQt-options\fR] [\fIKDE-options\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KCharSelect
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+With the
+.B kcharselect
+utility you can view which characters that exist in any font installed on the system, in any
+character table, and also assemble a string of characters by klicking on them with the mouse
+from a palette of characters, and export it to the clip board in various formats.
+It is good too locate which characters are actually available in a font and to use rare or national characters which might not be easily available on the keyboard.
+.P
+This program is part of the official KDE utils module.
+.SH OPTIONS
+.SS "General Options"
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v\fR, \fB\-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.lf 1 info/kdeqtoptions
+.SS "KDE options"
+.TP 12
+.BI \-\-caption \ caption
+Use \fIcaption\fP as name in the titlebar.
+.TP
+.BI \-\-icon \ icon
+Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
+icon, which can either be an absolute filename path, or otherwise the
+icon is sought for in places according to the normal KDE rules.
+.TP
+.BI \-\-miniicon \ icon
+Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
+of the icon, according to the same rules as for the \-\-icon parameter.
+.TP
+.BI \-\-config \ filename
+Use an alternative configuration file, instead of the default, which
+is normally located in
+.I /usr/share/config
+or in
+.RB $ KDEHOME\fI/share/config
+.TP
+.BI \-\-dcopserver \ server
+Set the address of the DCOP server to attach to.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps. This option has the same
+effect as definiting the environment variable KDE_DEBUG.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.BI \-\-style \ style
+sets the application GUI style.
+.TP
+.BI \-\-geometry \ geometry
+sets the client geometry of the main widget.
+The geometry parameter follows the normal X convention for geometry,
+which is on the form:
+.RS
+.IP
+[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
+.P
+Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
+height, of the main application window. Both in pixels. A value of 0
+specifies the default size. The optional \fIxpos\fR and \fIypos\fR
+specifies the x,y-position that which is desired for the application
+window. Specifying negative values for x or y implies that the x or y
+position is to be measured from the left or bottom screen edge,
+instead of as in the normal case, with positive values, from the left
+and top edges.
+.RE
+.SS "Qt options"
+.TP 12
+.BI \-\-display \ displayname
+Use the X-server display \fIdisplayname\fP.
+.TP
+.BI \-\-session \ sessionId
+Restore the application for the given \fIsessionId\fP.
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.BI \-\-ncols \ count
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit
+.B \-nograb, use \fB\-dograb\fR to override.
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging.
+.TP
+.BI "\-\-fn\fR, \fP\-\-font" \ fontname
+Defines the default application font. The \fIfontname\fP should be in
+the X logical font name description format XLFD. For a full description of
+the format see
+.I /usr/X11R6/lib/X11/doc/xlfd.TXT
+Note that the application might override the font specified with
+its own font.
+.TP
+.BI "-\-bg\fR, \fB\-\-background" \ color
+Sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.BI "\-\-fg\fR, \fB\-\-foreground" \ color
+Sets the default foreground color.
+.TP
+.BI \-\-btn\fR, \fB\-\-button \ color
+Sets the default button color.
+.TP
+.BI \-\-name \ name
+Sets the application name.
+.TP
+.BI \-\-title \ title
+Sets the application title. This option might, or might not appear
+in the title bar caption, depending on the application. To change the caption, use the
+.B \-\-caption
+option instead.
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.BI \-\-inputstyle \ inputstyle
+Sets XIM (X Input Method) input style. Possible
+values are
+.BR onthespot ", " overthespot ", " offthespot and root .
+.TP
+.BI \-\-im " XIM-server"
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.TP
+.B \-\-reverse
+Mirror reverses the whole layout of widgets. This means that menus
+will go in the opposite direction, the scroll bar will be on the
+opposite side, etc. For a normal western layout that means that menus
+and tool bars will go from the right edge to the left, the vertical
+scroll bar will be on the left side and so on.
+
+.lf 48 info/kdeutils.kcharselect.1
+.SH ENVIRONMENT
+.lf 1 info/kdeenviron
+.SS "standard KDE environment variables"
+.IP KDE_LANG
+Language locale setting to use. This option makes it possible to set
+another language environment for a program than what is the default. The
+correct language pack for this language has to be installed for this option
+to work. The default language when there is none set is en_US. When
+deciding upon a language, the following resources are looked up, in
+order: KDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
+LANG.
+.IP KDE_UTF8_FILENAMES
+Assume that all filenames are in UTF-8 format regardless of the
+current language setting. Otherwise the filename format is defined by
+the language.
+.IP KDE_MULTIHEAD
+If this variable has the value
+.B true
+multihead multiple display mode is enabled. The KDE display will be
+shared over more than one screen.
+.IP DISPLAY
+Specifies the X display to run KDE on.
+.IP KDESYCOCA
+Specifies and alternative path for the
+.I ksycoca
+KDE system configuration cache file.
+The default path is
+/tmp/kde-$USER/ksycoca
+.IP DCOPSERVER
+Specifies an alternative path for the DCOP server file. The default
+file is
+$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
+.IP SESSION_MANAGER
+The session manager to use. This option is set automatically by KDE
+and is a network path to the session manager socket.
+.IP HOME
+Path to the home directory for the current user.
+.IP KDEHOME
+The KDE per-user setting directory. Default if not specified is
+.I $HOME/.kde
+.lf 50 info/kdeutils.kcharselect.1
+.SH FILES
+.TP
+.I $HOME/.kde/share/config/kcharselectrc
+configuration file.
+.SH AUTHOR
+KCharSelect was written by
+.nh
+.ad l
+Reginald Stadlbauer <reggie@kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+.ad l
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+The full documentation for
+.B KCharSelect
+is maintained as a docbook manual. If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kcharselect
+.PP
+should give you access to the complete manual.
+.P
+Alternatively the manual can be browsed in
+.B konqueror
+giving it the URL help:/kcharselect
+
Added: branches/kde-3.3.2/kdeutils/debian/patches/01_kdeutils_branch.diff
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/patches/01_kdeutils_branch.diff 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/patches/01_kdeutils_branch.diff 2004-12-16 22:28:44 UTC (rev 317)
@@ -0,0 +1,655 @@
+diff -Nrua kdeutils-release/admin/acinclude.m4.in kdeutils-branch/admin/acinclude.m4.in
+--- kdeutils-release/admin/acinclude.m4.in 2004-11-12 17:48:09.000000000 -0500
++++ kdeutils-branch/admin/acinclude.m4.in 2004-12-09 16:22:14.000000000 -0500
+@@ -4254,7 +4254,8 @@
+
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+- KDE_CHECK_PYTHON_INTERN("2.3",
++ KDE_CHECK_PYTHON_INTERN("2.4",
++ [KDE_CHECK_PYTHON_INTERN("2.3",
+ [KDE_CHECK_PYTHON_INTERN("2.2",
+ [KDE_CHECK_PYTHON_INTERN("2.1",
+ [KDE_CHECK_PYTHON_INTERN("2.0",
+@@ -4262,6 +4263,7 @@
+ ])
+ ])
+ ])
++ ])
+ ])
+
+ AC_DEFUN([KDE_CHECK_STL],
+diff -Nrua kdeutils-release/ark/ark.desktop kdeutils-branch/ark/ark.desktop
+--- kdeutils-release/ark/ark.desktop 2004-11-22 03:34:41.000000000 -0500
++++ kdeutils-branch/ark/ark.desktop 2004-12-11 06:21:16.000000000 -0500
+@@ -19,6 +19,7 @@
+ GenericName[eu]=Artxibaketa Tresna
+ GenericName[fi]=Pakettienhallintatyökalu
+ GenericName[fr]=Outil de manipulation d'archives
++GenericName[ga]=Uirlis Chartlainne
+ GenericName[he]=כלי לניהול ארכיונים
+ GenericName[hi]=अभिलेख औज़ार
+ GenericName[hr]=Uslužni program za arhiviranje
+diff -Nrua kdeutils-release/ark/ark_part.desktop kdeutils-branch/ark/ark_part.desktop
+--- kdeutils-release/ark/ark_part.desktop 2004-08-31 03:24:18.000000000 -0400
++++ kdeutils-branch/ark/ark_part.desktop 2004-12-11 06:21:16.000000000 -0500
+@@ -20,6 +20,7 @@
+ Comment[eu]=Artxiboak Kudeatzeko tresna
+ Comment[fi]=Pakettienhallintatyökalu
+ Comment[fr]=Outil de manipulation d'archives
++Comment[ga]=Uirlis Láimhseála Cartlainne
+ Comment[gl]=Ferramenta de Manexo de Arquivos
+ Comment[he]=כלי לניהול ארכיונים
+ Comment[hi]=अभिलेख संभाल औज़ार
+diff -Nrua kdeutils-release/kcalc/kcalc.desktop kdeutils-branch/kcalc/kcalc.desktop
+--- kdeutils-release/kcalc/kcalc.desktop 2004-11-22 03:34:43.000000000 -0500
++++ kdeutils-branch/kcalc/kcalc.desktop 2004-12-11 06:21:16.000000000 -0500
+@@ -33,6 +33,7 @@
+ GenericName[eu]=Kalkulagailu Zientifikoa
+ GenericName[fi]=Tieteellinen laskin
+ GenericName[fr]=Une calculatrice scientifique
++GenericName[ga]=Áireamhán Eolaíochta
+ GenericName[he]=מחשבון מדעי
+ GenericName[hi]=वैज्ञानिक गणक
+ GenericName[hr]=Znanstveni kalkulator
+diff -Nrua kdeutils-release/kcardtools/chooser/kcardchooser.desktop kdeutils-branch/kcardtools/chooser/kcardchooser.desktop
+--- kdeutils-release/kcardtools/chooser/kcardchooser.desktop 2004-11-22 03:34:43.000000000 -0500
++++ kdeutils-branch/kcardtools/chooser/kcardchooser.desktop 2004-12-11 06:21:17.000000000 -0500
+@@ -17,6 +17,7 @@
+ Name[eu]=Smartcard Hautatzailea
+ Name[fi]=Älykorttivalitsin
+ Name[fr]=Sélecteur de carte à puce
++Name[ga]=Roghnóir Smartcard
+ Name[he]=בוחר הכרטיסים החכמים
+ Name[hi]=स्मार्टकार्ड चयनक
+ Name[hr]=Izabirač Smartcard-a
+diff -Nrua kdeutils-release/kcharselect/KCharSelect.desktop kdeutils-branch/kcharselect/KCharSelect.desktop
+--- kdeutils-release/kcharselect/KCharSelect.desktop 2004-11-22 03:34:43.000000000 -0500
++++ kdeutils-branch/kcharselect/KCharSelect.desktop 2004-12-11 06:21:17.000000000 -0500
+@@ -20,6 +20,7 @@
+ GenericName[eu]=Karaktere Hautatzailea
+ GenericName[fi]=Valitse merkki leikepöydälle
+ GenericName[fr]=Sélecteur de caractères
++GenericName[ga]=Roghnóir Carachtar
+ GenericName[gl]=Selector de Caracteres
+ GenericName[he]=בוחר תווים
+ GenericName[hi]=अक्षर चयनक
+diff -Nrua kdeutils-release/kdelirc/irkick/irkick.desktop kdeutils-branch/kdelirc/irkick/irkick.desktop
+--- kdeutils-release/kdelirc/irkick/irkick.desktop 2004-11-22 03:34:44.000000000 -0500
++++ kdeutils-branch/kdelirc/irkick/irkick.desktop 2004-12-11 06:21:17.000000000 -0500
+@@ -63,6 +63,7 @@
+ Comment[eu]=KDE Linux infrasare urruneko aginte zerbitzaria.
+ Comment[fi]=KDE:n Linux infrapunalla toimivien kauko-ohjainten ohjauspalvelin.
+ Comment[fr]=Serveur de contrôle distant infrarouge sous Linux pour KDE.
++Comment[ga]=Freastalaí KDE cianrialaithe infridheirg Linux
+ Comment[hi]=केडीई लिनक्स इन्फ्रारेड रिमोट नियंत्रण सर्वर.
+ Comment[hu]=KDE Linux szolgáltatás infravörös távirányítók kezeléséhez
+ Comment[is]=KDE Linux innrauða fjarstýringarstjórnborðið
+diff -Nrua kdeutils-release/kdelirc/kcmlirc/kcmlirc.desktop kdeutils-branch/kdelirc/kcmlirc/kcmlirc.desktop
+--- kdeutils-release/kdelirc/kcmlirc/kcmlirc.desktop 2004-11-22 03:34:44.000000000 -0500
++++ kdeutils-branch/kdelirc/kcmlirc/kcmlirc.desktop 2004-12-11 06:21:18.000000000 -0500
+@@ -15,6 +15,7 @@
+ Comment[eu]=Konfiguratu zure urruneko kontrolak aplikazioekin erabiltzeko
+ Comment[fi]=Muokkaa kauko-ohjaimesi toimimaan ohjelmien kanssa
+ Comment[fr]=Configurer vos contrôleurs distants pour l'utiliser avec vos applications
++Comment[ga]=Cumraigh do chianrialuithe chun iad a úsáid le feidhmchláir
+ Comment[hi]=अनुप्रयोगों के साथ उपयोग के लिए अपने रिमोट नियंत्रण को कॉन्फ़िगर करें
+ Comment[hu]=Az infravörös távirányítók kezelésének beállításai
+ Comment[is]=Her má stilla fjarstýringar ýmissa forrita
+@@ -62,6 +63,7 @@
+ Name[eu]=Urruneko Aginteak
+ Name[fi]=Kauko-ohjaimet
+ Name[fr]=Contrôleurs distants
++Name[ga]=Cianrialuithe
+ Name[hi]=रिमोट नियंत्रण
+ Name[hu]=Távirányító
+ Name[is]=Fjarstýringar
+diff -Nrua kdeutils-release/kdf/kcmdf.desktop kdeutils-branch/kdf/kcmdf.desktop
+--- kdeutils-release/kdf/kcmdf.desktop 2004-11-22 03:34:44.000000000 -0500
++++ kdeutils-branch/kdf/kcmdf.desktop 2004-12-11 06:21:18.000000000 -0500
+@@ -24,6 +24,7 @@
+ Name[eu]=Biltegiratze Gailuak
+ Name[fi]=Tallennuslaitteet
+ Name[fr]=Périphériques de stockage
++Name[ga]=Gléasanna Stórais
+ Name[gl]=Dispositivos de Almaceamento
+ Name[he]=התקני איחסון
+ Name[hi]=भंडारण औज़ार
+@@ -65,7 +66,7 @@
+ Comment[ar]=عرض المساحة المستخدمة من الأقراص المجهزة
+ Comment[az]=Bağlı avadanlıqların disk istifadəsini göstərir
+ Comment[bg]=Показване на използваното пространство на монтираните устройства
+-Comment[br]=Diskouez an egor implijet gant an drobarzhelloù marc'het
++Comment[br]=Diskouez an egor implijet gant an trobarzhelloù marc'het
+ Comment[bs]=Prikazuje iskorištenost diskova na montiranim uređajima
+ Comment[ca]=Mostra l'ús de disc dels dispositius muntats
+ Comment[cs]=Zobrazuje využití připojených diskových zařízení
+@@ -79,6 +80,7 @@
+ Comment[eu]=Muntatutako diskoen erabilera erakusten du
+ Comment[fi]=Näyttää levynkäytön liitetyillä laitteilla
+ Comment[fr]=Affiche l'espace utilisé sur les périphériques montés
++Comment[ga]=Taispeánann úsáid diosca na ngléasanna feistithe
+ Comment[gl]=Amosa o uso do disco dos dispositivos montados
+ Comment[he]=מידע על השימוש בנפח האיחסון של ההתקנים המחוברים
+ Comment[hi]=माउन्टेड औज़ारों के डिस्क उपयोग दिखाता है
+diff -Nrua kdeutils-release/kdf/kdf.desktop kdeutils-branch/kdf/kdf.desktop
+--- kdeutils-release/kdf/kdf.desktop 2004-11-22 03:34:44.000000000 -0500
++++ kdeutils-branch/kdf/kdf.desktop 2004-12-11 06:21:18.000000000 -0500
+@@ -35,6 +35,7 @@
+ GenericName[eu]=Erakutsi Diskoaren Erabilera
+ GenericName[fi]=Näytä levynkäyttö
+ GenericName[fr]=Affiche l'utilisation de l'espace disque
++GenericName[ga]=Taispeáin úsáid diosca
+ GenericName[he]=הצגת שיעור השימוש בדיסקים
+ GenericName[hi]=डिस्क उपयोग देखें
+ GenericName[hr]=Prikazuje iskorištenost diska
+diff -Nrua kdeutils-release/kdf/kwikdisk.desktop kdeutils-branch/kdf/kwikdisk.desktop
+--- kdeutils-release/kdf/kwikdisk.desktop 2004-11-22 03:34:44.000000000 -0500
++++ kdeutils-branch/kdf/kwikdisk.desktop 2004-12-11 06:21:18.000000000 -0500
+@@ -30,6 +30,7 @@
+ GenericName[eu]=Euskarri Eramangarrien Erabilgarritasuna
+ GenericName[fi]=Poistettavan median työkalu
+ GenericName[fr]=Utilitaire de média éjectable
++GenericName[ga]=Uirlis Meáin Inscortha
+ GenericName[he]=כלי מדיה נשלפת
+ GenericName[hi]=हटाया जा सकने वाला मीडिया यूटिलिटी
+ GenericName[hr]=Alat za uklonjive medije
+diff -Nrua kdeutils-release/kedit/KEdit.desktop kdeutils-branch/kedit/KEdit.desktop
+--- kdeutils-release/kedit/KEdit.desktop 2004-11-22 03:34:45.000000000 -0500
++++ kdeutils-branch/kedit/KEdit.desktop 2004-12-11 06:21:18.000000000 -0500
+@@ -17,6 +17,7 @@
+ GenericName[eu]=Testu Editore Soila
+ GenericName[fi]=Tekstieditori
+ GenericName[fr]=Éditeur de texte élémentaire
++GenericName[ga]=Eagarthóir Téacs Simplí
+ GenericName[hi]=सादा पाठ संपादक
+ GenericName[hu]=Egyszerű szövegszerkesztő
+ GenericName[is]=Einfaldur textaritill
+diff -Nrua kdeutils-release/kfloppy/format.cpp kdeutils-branch/kfloppy/format.cpp
+--- kdeutils-release/kfloppy/format.cpp 2004-08-20 06:51:04.000000000 -0400
++++ kdeutils-branch/kfloppy/format.cpp 2004-12-15 16:09:02.000000000 -0500
+@@ -168,8 +168,8 @@
+ const char *fd0D720[]={ "/dev/fd0u720", "/dev/fd0D720", 0L };
+ const char *fd0h1200[]={ "/dev/fd0h1200", 0L };
+ const char *fd0h360[]={ "/dev/fd0h360", 0L };
+-const char *fd1H1440[] = { "/dev/fd1h1440", "/dev/fd1H1440", "/dev/fd0u1440", 0L } ;
+-const char *fd1D720[]={ "/dev/fd0u720", "/dev/fd1D720", 0L };
++const char *fd1H1440[] = { "/dev/fd1h1440", "/dev/fd1H1440", "/dev/fdsu1440", 0L } ;
++const char *fd1D720[]={ "/dev/fd1u720", "/dev/fd1D720", 0L };
+ const char *fd1h1200[]={ "/dev/fd1h1200", 0L };
+ const char *fd1h360[]={ "/dev/fd1h360", 0L };
+ #endif
+diff -Nrua kdeutils-release/kfloppy/KFloppy.desktop kdeutils-branch/kfloppy/KFloppy.desktop
+--- kdeutils-release/kfloppy/KFloppy.desktop 2004-11-22 03:34:45.000000000 -0500
++++ kdeutils-branch/kfloppy/KFloppy.desktop 2004-12-11 06:21:19.000000000 -0500
+@@ -19,6 +19,7 @@
+ GenericName[eu]=Diskete Eratzailea
+ GenericName[fi]=Levykkeiden alustusohjelma
+ GenericName[fr]=Outil de formatage de disquette
++GenericName[ga]=Uirlis Fhormáidithe Dioscaí Boga
+ GenericName[gl]=Formatador de Disquetes
+ GenericName[he]=מאתחל תקליטונים
+ GenericName[hi]=फ़्लॉपी फार्मेटर
+diff -Nrua kdeutils-release/kgpg/encryptfile.desktop kdeutils-branch/kgpg/encryptfile.desktop
+--- kdeutils-release/kgpg/encryptfile.desktop 2004-11-22 03:34:45.000000000 -0500
++++ kdeutils-branch/kgpg/encryptfile.desktop 2004-12-11 06:21:19.000000000 -0500
+@@ -19,6 +19,7 @@
+ Name[eu]=Fitxategiak Zifratu
+ Name[fi]=Salaa tiedosto
+ Name[fr]=Chiffrer le fichier
++Name[ga]=Criptigh Comhad
+ Name[hi]=एनक्रिप्ट फ़ाइल
+ Name[hu]=Fájl titkosítása
+ Name[is]=Dulrita skrá
+diff -Nrua kdeutils-release/kgpg/encryptfolder.desktop kdeutils-branch/kgpg/encryptfolder.desktop
+--- kdeutils-release/kgpg/encryptfolder.desktop 2004-11-22 03:34:45.000000000 -0500
++++ kdeutils-branch/kgpg/encryptfolder.desktop 2004-12-11 06:21:19.000000000 -0500
+@@ -18,6 +18,7 @@
+ Name[eu]=Karpetak Artxibatu eta Zifratu
+ Name[fi]=Pakkaa ja salaa kansio
+ Name[fr]=Archive puis chiffre le dossier
++Name[ga]=Cuir Fillteán i gCartlann && Criptigh É
+ Name[hi]=अभिलेख व एनक्रिप्ट फ़ोल्डर
+ Name[hu]=Könyvtár titkosítása és archiválása
+ Name[is]=Pakka og dulrita möppu
+diff -Nrua kdeutils-release/kgpg/kgpg.desktop kdeutils-branch/kgpg/kgpg.desktop
+--- kdeutils-release/kgpg/kgpg.desktop 2004-11-22 03:34:45.000000000 -0500
++++ kdeutils-branch/kgpg/kgpg.desktop 2004-12-11 06:21:19.000000000 -0500
+@@ -21,6 +21,7 @@
+ GenericName[eu]=Zifraketa Tresna
+ GenericName[fi]=Salaustyökalu
+ GenericName[fr]=Outil de cryptage
++GenericName[ga]=Uirlis Chriptithe
+ GenericName[hi]=एनक्रिप्शन औज़ार
+ GenericName[hu]=Titkosítóeszköz
+ GenericName[is]=Dulritunartól
+@@ -59,6 +60,7 @@
+ Comment[eu]=GnuPGren bitarteko bat
+ Comment[fi]=GnuPG-käyttöliittymä
+ Comment[fr]=Une interface à GnuPG
++Comment[ga]=Comhéadan do GnuPG
+ Comment[hi]=एक ग्नू-पीजी फ्रन्टएण्ड
+ Comment[hu]=Grafikus kezelőprogram a GnuPG-hez
+ Comment[is]=Viðmót á GnuPG
+diff -Nrua kdeutils-release/khexedit/khexedit.desktop kdeutils-branch/khexedit/khexedit.desktop
+--- kdeutils-release/khexedit/khexedit.desktop 2004-11-22 03:34:46.000000000 -0500
++++ kdeutils-branch/khexedit/khexedit.desktop 2004-12-11 06:21:19.000000000 -0500
+@@ -17,6 +17,7 @@
+ GenericName[eu]=Editore Binarioa
+ GenericName[fi]=Binäärieditori
+ GenericName[fr]=Éditeur hexadécimal
++GenericName[ga]=Eagarthóir Dénártha
+ GenericName[he]=עורך בינרי
+ GenericName[hi]=द्विचर संपादक
+ GenericName[hr]=Binarni uređivač
+diff -Nrua kdeutils-release/khexedit/parts/kbytesedit/kbyteseditwidget.desktop kdeutils-branch/khexedit/parts/kbytesedit/kbyteseditwidget.desktop
+--- kdeutils-release/khexedit/parts/kbytesedit/kbyteseditwidget.desktop 2004-11-22 03:34:46.000000000 -0500
++++ kdeutils-branch/khexedit/parts/kbytesedit/kbyteseditwidget.desktop 2004-12-11 06:21:19.000000000 -0500
+@@ -13,6 +13,7 @@
+ Name[eu]=Byteak Editatzeko Widget-a
+ Name[fi]=BytesEdit käyttöliittymäkomponentti
+ Name[fr]=Composant éditeur binaire
++Name[ga]=Giuirléid BytesEdit
+ Name[hi]=बाइट्स-एडिट विजेट
+ Name[hu]=BytesEdit grafikus elem
+ Name[is]=Græja til að sýsla með bætaskrár
+diff -Nrua kdeutils-release/kjots/Kjots.desktop kdeutils-branch/kjots/Kjots.desktop
+--- kdeutils-release/kjots/Kjots.desktop 2004-11-22 03:34:46.000000000 -0500
++++ kdeutils-branch/kjots/Kjots.desktop 2004-12-11 06:21:20.000000000 -0500
+@@ -29,6 +29,7 @@
+ GenericName[eu]=Ohar Hartzailea
+ GenericName[fi]=Muistilappuohjelma
+ GenericName[fr]=Prise de notes
++GenericName[ga]=Eagarthóir Nótaí
+ GenericName[he]=כותב הערות
+ GenericName[hi]=नोट टेकर
+ GenericName[hr]=Program za pisanje bilježaka
+diff -Nrua kdeutils-release/klaptopdaemon/applnk/.directory kdeutils-branch/klaptopdaemon/applnk/.directory
+--- kdeutils-release/klaptopdaemon/applnk/.directory 2004-09-01 10:19:06.000000000 -0400
++++ kdeutils-branch/klaptopdaemon/applnk/.directory 2004-12-11 06:21:20.000000000 -0500
+@@ -15,6 +15,7 @@
+ Name[eu]=Magalekoa
+ Name[fi]=Kannettava
+ Name[fr]=Ordinateur portable
++Name[ga]=Ríomhaire Glúine
+ Name[gl]=Portátil
+ Name[he]=מחשב נייד
+ Name[hi]=लैपटॉप
+diff -Nrua kdeutils-release/klaptopdaemon/applnk/klaptopdaemon.desktop kdeutils-branch/klaptopdaemon/applnk/klaptopdaemon.desktop
+--- kdeutils-release/klaptopdaemon/applnk/klaptopdaemon.desktop 2004-11-22 03:34:46.000000000 -0500
++++ kdeutils-branch/klaptopdaemon/applnk/klaptopdaemon.desktop 2004-12-11 06:21:20.000000000 -0500
+@@ -60,6 +60,7 @@
+ Name[eu]=Magalekoaren Bateria Begiralea
+ Name[fi]=Paristonvalvonta
+ Name[fr]=Indicateur de batterie de portable
++Name[ga]=Monatóir Chadhnra Ríomhaire Glúine
+ Name[hi]=लैपटॉप बैटरी मॉनीटर
+ Name[hu]=Feltöltöttségi szintjelző
+ Name[is]=Rafhlöðueftirlit fyrir ferðavélar
+diff -Nrua kdeutils-release/klaptopdaemon/applnk/laptop.desktop kdeutils-branch/klaptopdaemon/applnk/laptop.desktop
+--- kdeutils-release/klaptopdaemon/applnk/laptop.desktop 2004-11-22 03:34:46.000000000 -0500
++++ kdeutils-branch/klaptopdaemon/applnk/laptop.desktop 2004-12-11 06:21:20.000000000 -0500
+@@ -26,6 +26,7 @@
+ Comment[eu]=Magalekoen Bateria
+ Comment[fi]=Kannettavan akku
+ Comment[fr]=Batterie d'ordinateur portable
++Comment[ga]=Cadhnra Ríomhaire Glúine
+ Comment[he]=סוללת מחשב נייד
+ Comment[hi]=लैपटॉप बैटरी
+ Comment[hr]=Baterija laptopa
+@@ -78,6 +79,7 @@
+ Name[eu]=Magalekoen Bateria
+ Name[fi]=Kannettavan akku
+ Name[fr]=Batterie d'ordinateur portable
++Name[ga]=Cadhnra Ríomhaire Glúine
+ Name[he]=סוללת מחשב נייד
+ Name[hi]=लैपटॉप बैटरी
+ Name[hr]=Laptop baterija
+diff -Nrua kdeutils-release/klaptopdaemon/applnk/pcmcia.desktop kdeutils-branch/klaptopdaemon/applnk/pcmcia.desktop
+--- kdeutils-release/klaptopdaemon/applnk/pcmcia.desktop 2004-11-22 03:34:46.000000000 -0500
++++ kdeutils-branch/klaptopdaemon/applnk/pcmcia.desktop 2004-12-11 06:21:20.000000000 -0500
+@@ -26,6 +26,7 @@
+ Comment[eu]=PCMCIAren egoera
+ Comment[fi]=PCMCIA-tila
+ Comment[fr]=État PCMCIA
++Comment[ga]=Stádas PCMCIA
+ Comment[gl]=Estado de PCMCIA
+ Comment[he]=מידע על מצב PCMCIA
+ Comment[hi]=पीसीएमसीआईए स्थिति
+diff -Nrua kdeutils-release/kmilo/demo/kmilo_demo.desktop kdeutils-branch/kmilo/demo/kmilo_demo.desktop
+--- kdeutils-release/kmilo/demo/kmilo_demo.desktop 2004-11-22 03:34:47.000000000 -0500
++++ kdeutils-branch/kmilo/demo/kmilo_demo.desktop 2004-12-11 06:21:20.000000000 -0500
+@@ -15,6 +15,7 @@
+ Name[eu]=Demo Plugina
+ Name[fi]=Esimerkkiliitännäinen
+ Name[fr]=Module externe de démonstration
++Name[ga]=Breiseán Taispeántais
+ Name[hi]=डेमो प्लगइन
+ Name[hu]=Mintapélda bővítőmodulra
+ Name[is]=Sýnishorn af íforriti
+@@ -54,6 +55,7 @@
+ Comment[eu]=Plugin honek ez du ezer egiten.
+ Comment[fi]=Tämä liitännäinen ei tee mitään.
+ Comment[fr]=Ce module ne fait rien.
++Comment[ga]=Ní dhéanann an breiseán seo faic.
+ Comment[hi]=यह प्लगइन कुछ नहीं करता है.
+ Comment[hu]=Ez a bővítőmodul nem csinál semmit
+ Comment[is]=Þetta íforrit gerir ekki neitt.
+diff -Nrua kdeutils-release/kmilo/generic/kmilo_generic.desktop kdeutils-branch/kmilo/generic/kmilo_generic.desktop
+--- kdeutils-release/kmilo/generic/kmilo_generic.desktop 2004-11-22 03:34:47.000000000 -0500
++++ kdeutils-branch/kmilo/generic/kmilo_generic.desktop 2004-12-11 06:21:21.000000000 -0500
+@@ -17,6 +17,7 @@
+ Name[eu]=Teklatu Arruntaren Plugina
+ Name[fi]=Yleinen näppäimistöliitännäinen
+ Name[fr]=Module externe de clavier générique
++Name[ga]=Breiseán Cineálach Méarchláir
+ Name[hi]=जेनेरिक कुंजीपट प्लगइन
+ Name[hu]=Általános billentyűzet-bővítőmodul
+ Name[is]=Almennt lyklaborðsíforrit
+@@ -57,6 +58,7 @@
+ Comment[eu]=Plugin honek tekla berezientzako euskarria gaitzen du teklatu eta magaleko mota guztietan.
+ Comment[fi]=Tämä liitännäinen mahdollistaa erikoisnäppäinten tuen kaikenlaisille näppäimistöille ja kannettavilla tietokoneille.
+ Comment[fr]=Ce module active la gestion des touches spéciales pour toutes sortes de claviers et de portables.
++Comment[ga]=Tacaíonn an breiseán seo le cnaipí speisialta ar neart sóirt méarchlár agus ríomhairí glúine.
+ Comment[hi]=यह प्लगइन सभी क़िस्म के कुंजीपट तथा लैपटॉप पर विशिष्ट कुंजी समर्थन सक्षम करता है
+ Comment[hu]=Ez a bővítőmodul lehetővé teszi az extra billentyűk használatát speciális billentyűzeteknél és noteszgépeken.
+ Comment[is]=Þetta íforrit virkjar sérhnappana sem eru á allskynd gerðum lyklaborða og ferðavéla.
+diff -Nrua kdeutils-release/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop kdeutils-branch/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop
+--- kdeutils-release/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop 2004-11-22 03:34:48.000000000 -0500
++++ kdeutils-branch/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop 2004-12-11 06:21:21.000000000 -0500
+@@ -54,6 +54,7 @@
+ Comment[eu]=Konfiguratu Sonyren Interrupzio Kontrolatzaile Programagarriaren Gidariarentzako KDE Interfazea
+ Comment[fi]=Aseta KDE:n liityntää Sonyn ohjelmoitavalle keskeytysajurille
+ Comment[fr]=Configuration de l'interface KDE pour le pilote du contrôleur d'interruption programmable de Sony
++Comment[ga]=Cumraigh comhéadan KDE do Tiománaí an Rialtóir Idirbhriste Inríomhchláraithe Sony
+ Comment[hi]=केडीई इंटरफेस को सोनी प्रोग्रामेबल इंटरप्ट कन्ट्रोलर ड्राइवर के लिए कॉन्फ़िगर करता है
+ Comment[hu]=KDE-s beállítómodul a Sony megszakításkezelő meghajtóprogramjához
+ Comment[is]=Stilla viðmót KDE á Sony Programmable Interrupt stýringuna
+@@ -82,7 +83,7 @@
+ Keywords[ca]=Sony, Vaio, kvaio, brillantor, silenci, Jog Dial
+ Keywords[cs]=Sony,Vaio,kvaio,jas,ztlumení,Jog Dial
+ Keywords[cy]=Sony, Vaio, kvaio, gloywder, mud, Jog Dial
+-Keywords[da]=Sony, Vaio, kvaio, lyshed, stum, Jog Dial
++Keywords[da]=Sony, Vaio, kvaio, lysstyrke, stum, Jog Dial
+ Keywords[de]=Sony, Vaio, kvaio, brightness, mute, Jog Dial, stumm, hell, dunkel
+ Keywords[el]=Sony, Vaio, kvaio, φωτεινότητα, κλείσιμο ήχου, Jog Dial
+ Keywords[es]=Sony, Vaio, kvaio, brillo, mute, Jog Dial
+@@ -90,6 +91,7 @@
+ Keywords[eu]=Sony, Vaio, kvaio, distira, mutu, Jog Dial
+ Keywords[fi]=Sony, Vaio, kvaio, kirkkaus, vaimenna, Jog Dial
+ Keywords[fr]=Sony, Vaio, kvaio, luminosité, sourdine, mute, Jog Dial
++Keywords[ga]=Sony, Vaio, kvaio, gile, mute, Jog Dial
+ Keywords[hi]=सोनी,वायो,के-वायो,चमकीलापन,म्यूट,जॉग डायल
+ Keywords[hu]=Sony,Vaio,kvaio,fényerő,elnémítás,tárcsagomb
+ Keywords[it]=Sony,Vaio,kvaio,luminosità,muto,Jog Dial
+diff -Nrua kdeutils-release/kmilo/kmilo_kvaio/kmilo_kvaio.desktop kdeutils-branch/kmilo/kmilo_kvaio/kmilo_kvaio.desktop
+--- kdeutils-release/kmilo/kmilo_kvaio/kmilo_kvaio.desktop 2004-11-22 03:34:47.000000000 -0500
++++ kdeutils-branch/kmilo/kmilo_kvaio/kmilo_kvaio.desktop 2004-12-11 06:21:21.000000000 -0500
+@@ -16,6 +16,7 @@
+ Name[eu]=Sony Vaio Plugina
+ Name[fi]=Sony Vaio -liitännäinen
+ Name[fr]=Module externe pour les Vaio de Sony
++Name[ga]=Breiseán Sony Vaio
+ Name[hi]=सोनी वायो प्लगइन
+ Name[hu]=Sony Vaio bővítőmodul
+ Name[is]=Sony Vaio íforrit
+@@ -56,6 +57,7 @@
+ Comment[eu]=KMilo Moduloa Sony Vaio Magalekoen euskarriarentzako
+ Comment[fi]=KMilo-moduuli Sony Vaio -kannettavatuelle
+ Comment[fr]=Module KMilo pour la gestion des portables Vaio de Sony
++Comment[ga]=Modúl KMilo a thacaíonn le Sony Vaio
+ Comment[hi]=सोनी वायो लेपटॉप समर्थन के लिए के-मिलो मॉड्यूल
+ Comment[hu]=KMilo beállítómodul Sony Vaio noteszgépek beállításához
+ Comment[is]=KMilo eining fyrir Sony Vaio kjöltutölvur
+diff -Nrua kdeutils-release/kmilo/powerbook/kmilo_powerbook.desktop kdeutils-branch/kmilo/powerbook/kmilo_powerbook.desktop
+--- kdeutils-release/kmilo/powerbook/kmilo_powerbook.desktop 2004-11-22 03:34:48.000000000 -0500
++++ kdeutils-branch/kmilo/powerbook/kmilo_powerbook.desktop 2004-12-11 06:21:22.000000000 -0500
+@@ -17,6 +17,7 @@
+ Name[eu]=Apple (R) PowerBook (R) Plugina
+ Name[fi]=Apple (R) PowerBook (R) -liitännäinen
+ Name[fr]=Module externe Apple (R) PowerBook (R)
++Name[ga]=Breiseán Apple® PowerBook®
+ Name[hi]=एप्पल (R) पावरबुक (R) प्लगइन
+ Name[hu]=Apple (R) PowerBook (R) bővítőmodul
+ Name[is]=Apple (R) PowerBook (R) íforrit
+@@ -56,6 +57,7 @@
+ Comment[eu]=Plugin honek tekla berezientzako euskarria gaitzen du Apple (R) PowerBook (R) magalekoetan pbbuttonsd bitartez.
+ Comment[fi]=Tänmä liitännäinen mahdollistaa tuen Apple (R) PowerBook (R) kannettavien erikoisnäppäimille pbbuttonsd-ohjelman kautta.
+ Comment[fr]=Ce module active la gestion des touches spéciales des Apple (R)PowerBook (R) via pbbuttonsd.
++Comment[ga]=Tacaíonn an breiseán seo le cnaipí speisialta ar ríomhairí glúine Apple® PowerBook® trí pbbuttonsd.
+ Comment[hi]=यह प्लगइन एपल (R) पावर-बुक (R) लैपटॉप पर pbbuttonsd के द्वारा विशिष्ट कुंजी समर्थन सक्षम करता है
+ Comment[hu]=Ez a bővítőmodul lehetővé teszi az extra billentyűk használatát Apple (R) PowerBook (R) noteszgépeken (a pbbuttonsd szolgáltatáson keresztül).
+ Comment[is]=Þetta íforrit gerir þér kleyft að nota sérhnappana á Apple (R) PowerBook (R) með pbbuttonsd þjóninum.
+diff -Nrua kdeutils-release/kmilo/powerbook2/kmilo_powerbook.desktop kdeutils-branch/kmilo/powerbook2/kmilo_powerbook.desktop
+--- kdeutils-release/kmilo/powerbook2/kmilo_powerbook.desktop 2004-11-22 03:34:48.000000000 -0500
++++ kdeutils-branch/kmilo/powerbook2/kmilo_powerbook.desktop 2004-12-11 06:21:22.000000000 -0500
+@@ -16,6 +16,7 @@
+ Name[eu]=Apple PowerBook Plugina
+ Name[fi]=Apple PowerBook -liitännäinen
+ Name[fr]=Module externe Apple PowerBook
++Name[ga]=Breiseán Apple® PowerBook®
+ Name[hi]=एपल पावर-बुक प्लगइन
+ Name[hu]=Apple PowerBook bővítőmodul
+ Name[is]=Apple PowerBook íforrit
+@@ -56,6 +57,7 @@
+ Comment[eu]=Plugin honek tekla berezientzako euskarria gaitu du Apple PowerBook magalekoetan pbbuttonsd bitartez.
+ Comment[fi]=Tämä sovelma mahdollisti tuen Apple Powerbook kannettavien erikoisnäppäimille pbbuttonsd-ohjelman kautta.
+ Comment[fr]=Ce module active la gestion des touches spéciales des Apple PowerBook via pbbuttonsd.
++Comment[ga]=Tacaíonn an breiseán seo le cnaipí speisialta ar ríomhairí glúine Apple® PowerBook® trí pbbuttonsd.
+ Comment[hi]=यह प्लगइन एपल पावर-बुक पर pbbuttonsd के द्वारा विशिष्ट कुंजी समर्थन सक्षम करता है
+ Comment[hu]=Ez a bővítőmodul lehetővé teszi az extra billentyűk használatát Apple PowerBook noteszgépeken (a pbbuttonsd szolgáltatáson keresztül).
+ Comment[is]=Þetta íforrit gerir þér kleyft að nota sérhnappana á Apple PowerBook með pbbuttonsd þjóninum.
+diff -Nrua kdeutils-release/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop kdeutils-branch/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop
+--- kdeutils-release/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop 2004-11-22 03:34:49.000000000 -0500
++++ kdeutils-branch/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop 2004-12-11 06:21:22.000000000 -0500
+@@ -78,7 +78,7 @@
+ Keywords[ca]=IBM, Thinkpad, brillantor, silenci, Jog Dial
+ Keywords[cs]=IBM,Thinkpad,jas,ztlumení,Jog Dial
+ Keywords[cy]=IBM,Thinkpad,gloywder, mud, Jog Dial
+-Keywords[da]=IBM. Thinkpad, lyshed, stum, Jog Dial
++Keywords[da]=IBM. Thinkpad, lysstyrke, stum, Jog Dial
+ Keywords[de]=IBM, Thinkpad, Helligkeit, Abschalten, Jog Dial
+ Keywords[el]=IBM, Thinkpad, φωτεινότητα, κλείσιμο ήχου, Jog Dial
+ Keywords[es]=IBM, Thinkpad, brillo, mute, Jog Dial
+diff -Nrua kdeutils-release/kregexpeditor/kregexpeditor.desktop kdeutils-branch/kregexpeditor/kregexpeditor.desktop
+--- kdeutils-release/kregexpeditor/kregexpeditor.desktop 2004-11-22 03:34:49.000000000 -0500
++++ kdeutils-branch/kregexpeditor/kregexpeditor.desktop 2004-12-11 06:21:22.000000000 -0500
+@@ -26,6 +26,7 @@
+ GenericName[eu]=Adierazpen Erregularren Editorea
+ GenericName[fi]=Säännöllisten lausekkeiden muokkain
+ GenericName[fr]=Éditeur d'expressions régulières
++GenericName[ga]=Eagarthóir Sloinn Rialta
+ GenericName[hi]=रेगुलर एक्सप्रेशन संपादक
+ GenericName[hu]=Kifejezésszerkesztő
+ GenericName[is]=Ritill fyrir reglulegar segðir
+diff -Nrua kdeutils-release/kregexpeditor/kregexpeditorgui.desktop kdeutils-branch/kregexpeditor/kregexpeditorgui.desktop
+--- kdeutils-release/kregexpeditor/kregexpeditorgui.desktop 2004-11-22 03:34:49.000000000 -0500
++++ kdeutils-branch/kregexpeditor/kregexpeditorgui.desktop 2004-12-11 06:21:22.000000000 -0500
+@@ -16,6 +16,7 @@
+ Name[eu]=RegExp Editore Widgeta
+ Name[fi]=Säännöllisten lauseiden muokkain
+ Name[fr]=Composant éditeur d'exp. rég.
++Name[ga]=Giuirléid Eagarthóireachta Sloinn Rialta
+ Name[he]=פריט עורך הביטויים הסדירים
+ Name[hi]=रेग-एक्सपी संपादक विजेट
+ Name[hr]=Widget za uređivanje RegExp-a (regularnih izraza)
+diff -Nrua kdeutils-release/ksim/ksim.desktop kdeutils-branch/ksim/ksim.desktop
+--- kdeutils-release/ksim/ksim.desktop 2004-11-22 03:34:49.000000000 -0500
++++ kdeutils-branch/ksim/ksim.desktop 2004-12-11 06:21:23.000000000 -0500
+@@ -18,6 +18,7 @@
+ GenericName[eu]=Sistemaren Begiralea
+ GenericName[fi]=Järjestelmänvalvontaohjelma
+ GenericName[fr]=Indicateurs du système
++GenericName[ga]=Monatóir Córais
+ GenericName[gl]=Monitor do Sistema
+ GenericName[he]=צג מערכת
+ GenericName[hi]=तंत्र मॉनीटर
+@@ -76,6 +77,7 @@
+ Comment[eu]=K System Informazio Begiralea (GKrellM itxura)
+ Comment[fi]=K järjestelmätietomonitori (GKrellM tyyliin)
+ Comment[fr]=Indicateur système K (dans le style de GKrellM)
++Comment[ga]=Monatóir Eolais an Chórais K (stíl GKrellM)
+ Comment[he]=צג מידע מערכת (נוסח GKrellM)
+ Comment[hi]=के तंत्र जानकारी मॉनीटर (GKrellM शैली)
+ Comment[hr]=K Monitor sustava (GKrellM stil)
+diff -Nrua kdeutils-release/ksim/monitors/cpu/cpu.desktop kdeutils-branch/ksim/monitors/cpu/cpu.desktop
+--- kdeutils-release/ksim/monitors/cpu/cpu.desktop 2004-11-22 03:34:50.000000000 -0500
++++ kdeutils-branch/ksim/monitors/cpu/cpu.desktop 2004-12-11 06:21:23.000000000 -0500
+@@ -40,6 +40,7 @@
+ Comment[eu]=CPU Plugin Begiralea
+ Comment[fi]=CPU monitorisovelma
+ Comment[fr]=Module de surveillance du processeur
++Comment[ga]=Breiseán Monatóireachta LAP
+ Comment[he]=תוסף צג מעבד
+ Comment[hi]=सीपीयू मॉनीटर प्लगइन
+ Comment[hu]=CPU-figyelő bővítőmodul
+diff -Nrua kdeutils-release/ksim/monitors/disk/disk.desktop kdeutils-branch/ksim/monitors/disk/disk.desktop
+--- kdeutils-release/ksim/monitors/disk/disk.desktop 2004-11-22 03:34:50.000000000 -0500
++++ kdeutils-branch/ksim/monitors/disk/disk.desktop 2004-12-11 06:21:23.000000000 -0500
+@@ -16,6 +16,7 @@
+ Comment[eu]=Diskoaren Plugin Begiralea
+ Comment[fi]=Levymonitorisovelma
+ Comment[fr]=Module de surveillance du disque
++Comment[ga]=Breiseán Monatóireachta Diosca
+ Comment[he]=תוסף צג דיסק
+ Comment[hi]=डिस्क मॉनीटर प्लगइन
+ Comment[hu]=Lemezfigyelő bővítőmodul
+@@ -62,6 +63,7 @@
+ Name[et]=Ketas
+ Name[eu]=Diskoa
+ Name[fi]=Levy
++Name[ga]=Diosca
+ Name[he]=דיסק
+ Name[hi]=डिस्क
+ Name[hu]=Lemez
+diff -Nrua kdeutils-release/ksim/monitors/filesystem/DFree.desktop kdeutils-branch/ksim/monitors/filesystem/DFree.desktop
+--- kdeutils-release/ksim/monitors/filesystem/DFree.desktop 2004-11-22 03:34:50.000000000 -0500
++++ kdeutils-branch/ksim/monitors/filesystem/DFree.desktop 2004-12-11 06:21:24.000000000 -0500
+@@ -35,6 +35,7 @@
+ Comment[eu]=Muntatutako Partizioen Begiralea
+ Comment[fi]=Liitettyjen osioiden valvonta
+ Comment[fr]=Surveillant des lecteurs montés
++Comment[ga]=Monatóir Rannta Feistithe
+ Comment[he]=צג מחיצות מחוברות
+ Comment[hi]=माउन्टेड पार्टीशन्स मॉनीटर
+ Comment[hu]=Lemezcsatlakoztatás-figyelő
+diff -Nrua kdeutils-release/ksim/monitors/i8k/i8k.desktop kdeutils-branch/ksim/monitors/i8k/i8k.desktop
+--- kdeutils-release/ksim/monitors/i8k/i8k.desktop 2004-11-22 03:34:51.000000000 -0500
++++ kdeutils-branch/ksim/monitors/i8k/i8k.desktop 2004-12-11 06:21:24.000000000 -0500
+@@ -12,6 +12,7 @@
+ Comment[eu]=Dell I8K Hardwarearen Plugin Begiralea
+ Comment[fi]=Dell I8K-laitteistomonitoriliitännäinen
+ Comment[fr]=Module de surveillance du Dell l8K
++Comment[ga]=Breiseán Monatóireachta Cruaearraí Dell I8K
+ Comment[hi]=डेल I8K हार्डवेयर मॉनीटर प्लगइन
+ Comment[hu]=Dell I8K hardvermonitor bővítőmodul
+ Comment[is]=Íforrit til að fylgjast með Dell I8K vélbúnaði
+diff -Nrua kdeutils-release/ksim/monitors/lm_sensors/Lm_sensors.desktop kdeutils-branch/ksim/monitors/lm_sensors/Lm_sensors.desktop
+--- kdeutils-release/ksim/monitors/lm_sensors/Lm_sensors.desktop 2004-11-22 03:34:51.000000000 -0500
++++ kdeutils-branch/ksim/monitors/lm_sensors/Lm_sensors.desktop 2004-12-11 06:21:24.000000000 -0500
+@@ -15,6 +15,7 @@
+ Comment[eu]=Lm_sentsoreen Egoera Begiralea
+ Comment[fi]=Lm_sensors tilavalvonta
+ Comment[fr]=Indicateur d'état lm_sensors
++Comment[ga]=Monatóir Stádais Lm_sensors
+ Comment[he]=צג מצב Lm_sensors
+ Comment[hi]=एलएम_सेंसर्स स्थिति मॉनीटर
+ Comment[hu]=Lm_sensors hardvermonitor
+diff -Nrua kdeutils-release/ksim/monitors/mail/mail.desktop kdeutils-branch/ksim/monitors/mail/mail.desktop
+--- kdeutils-release/ksim/monitors/mail/mail.desktop 2004-11-22 03:34:51.000000000 -0500
++++ kdeutils-branch/ksim/monitors/mail/mail.desktop 2004-12-11 06:21:24.000000000 -0500
+@@ -16,6 +16,7 @@
+ Comment[eu]=Postaren Plugin Begiralea
+ Comment[fi]=Sähköpostin monitorointisovelma
+ Comment[fr]=Module de surveillance de boîtes aux lettres
++Comment[ga]=Breiseán Monatóireachta Ríomhphoist
+ Comment[he]=תוסף צג דואר
+ Comment[hi]=डाक मॉनीटर प्लगइन
+ Comment[hu]=E-mail-figyelő bővítőmodul
+@@ -66,6 +67,7 @@
+ Name[eu]=Posta
+ Name[fi]=Sähköposti
+ Name[fr]=Courrier
++Name[ga]=Ríomhphost
+ Name[he]=דואר
+ Name[hi]=डाक
+ Name[hr]=Pošta
+diff -Nrua kdeutils-release/ksim/monitors/net/Net.desktop kdeutils-branch/ksim/monitors/net/Net.desktop
+--- kdeutils-release/ksim/monitors/net/Net.desktop 2004-11-22 03:34:51.000000000 -0500
++++ kdeutils-branch/ksim/monitors/net/Net.desktop 2004-12-11 06:21:25.000000000 -0500
+@@ -15,6 +15,7 @@
+ Comment[eu]=Sarearen Egoera Begiralea
+ Comment[fi]=Verkon tilavalvonta
+ Comment[fr]=Indicateur d'état réseau
++Comment[ga]=Monatóir Stádais an Ghréasáin
+ Comment[he]=צג מצב רשת
+ Comment[hi]=नेट स्थिति मॉनीटर
+ Comment[hu]=Hálózati állapotfigyelő
+@@ -58,6 +59,7 @@
+ Name[el]=Δίκτυο
+ Name[eo]=Reto
+ Name[es]=Red
++Name[ga]=Gréasán
+ Name[he]=רשת
+ Name[hi]=नेट
+ Name[is]=Netið
+diff -Nrua kdeutils-release/ksim/monitors/snmp/Snmp.desktop kdeutils-branch/ksim/monitors/snmp/Snmp.desktop
+--- kdeutils-release/ksim/monitors/snmp/Snmp.desktop 2004-11-22 03:34:52.000000000 -0500
++++ kdeutils-branch/ksim/monitors/snmp/Snmp.desktop 2004-12-11 06:21:25.000000000 -0500
+@@ -14,6 +14,7 @@
+ Comment[eu]=Snmp Egoera Begiralea
+ Comment[fi]=SNPP-tilavalvoja
+ Comment[fr]=Indicateur d'état snmp
++Comment[ga]=Monatóir Stádais SNMP
+ Comment[hi]=एसएनएमपी स्थिति मॉनीटर
+ Comment[hu]=Snmp állapotmonitor
+ Comment[is]=Snmp eftirlitstól
+@@ -43,6 +44,7 @@
+ Name=Snmp
+ Name[cs]=SNMP
+ Name[de]=SNMP
++Name[ga]=SNMP
+ Name[hi]=एसएनएमपी
+ Name[it]=SNMP
+ Name[ro]=SNMP
+diff -Nrua kdeutils-release/kwallet/konfigurator/kwalletconfig.desktop kdeutils-branch/kwallet/konfigurator/kwalletconfig.desktop
+--- kdeutils-release/kwallet/konfigurator/kwalletconfig.desktop 2004-11-22 03:34:52.000000000 -0500
++++ kdeutils-branch/kwallet/konfigurator/kwalletconfig.desktop 2004-12-11 06:21:25.000000000 -0500
+@@ -55,6 +55,7 @@
+ Comment[eu]=KDE Karteraren Konfigurazioa
+ Comment[fi]=KDE-lompakon asetukset
+ Comment[fr]=Configuration du gestionnaire de comptes de KDE
++Comment[ga]=Cumraíocht KDE Wallet
+ Comment[hi]=केडीई वॉलेट कॉन्फ़िगरेशन
+ Comment[hu]=A KDE digitális noteszeinek beállításai
+ Comment[is]=Stillingar veskisins
+@@ -93,6 +94,7 @@
+ Keywords[eu]=Kartera,Formularioa Bete,Pasahitzak,Formulario Datuak
+ Keywords[fi]=Lompakko,Lomakkeen täyttö,Salasanat,Lomaketiedot
+ Keywords[fr]=gestionnaire de comptes,remplissage de formulaire,Mots de passe,Données de formulaire
++Keywords[ga]=Wallet,Líonadh Foirmeacha,Focal Faire,Sonraí foirme
+ Keywords[hi]=बटुआ,फ़ॉर्म फिल,पासवर्ड,फ़ॉर्म डाटा
+ Keywords[hu]=digitális notesz,űrlapkitöltés,jelszavak,űrlapadatok
+ Keywords[it]=portafogli,wallet,riempimento moduli,moduli,form,password,dati moduli
+diff -Nrua kdeutils-release/kwallet/konfigurator/kwalletmanager_show.desktop kdeutils-branch/kwallet/konfigurator/kwalletmanager_show.desktop
+--- kdeutils-release/kwallet/konfigurator/kwalletmanager_show.desktop 2004-11-22 03:34:52.000000000 -0500
++++ kdeutils-branch/kwallet/konfigurator/kwalletmanager_show.desktop 2004-12-11 06:21:25.000000000 -0500
+@@ -16,6 +16,7 @@
+ Name[eu]=Kartera Kudeatzeko Tresna
+ Name[fi]=Lompakon hallintatyökalu
+ Name[fr]=Outil de gestion de comptes
++Name[ga]=Uirlis Bhainistíochta Wallet
+ Name[hi]= बटुआ प्रबंधन औज़ार
+ Name[hu]=Kezelőprogram a KDE digitális noteszeihez
+ Name[is]=Tól til að stýra eiginleikum veskisins
+diff -Nrua kdeutils-release/kwallet/kwalletmanager.desktop kdeutils-branch/kwallet/kwalletmanager.desktop
+--- kdeutils-release/kwallet/kwalletmanager.desktop 2004-11-22 03:34:52.000000000 -0500
++++ kdeutils-branch/kwallet/kwalletmanager.desktop 2004-12-11 06:21:25.000000000 -0500
+@@ -16,6 +16,7 @@
+ Name[eu]=Kartera Kudeatzeko Tresna
+ Name[fi]=Lompakon hallintatyökalu
+ Name[fr]=Outil de gestion de comptes
++Name[ga]=Uirlis Bhainistíochta Wallet
+ Name[hi]= बटुआ प्रबंधन औज़ार
+ Name[hu]=Kezelőprogram a KDE digitális noteszeihez
+ Name[is]=Tól til að stýra eiginleikum veskisins
Deleted: branches/kde-3.3.2/kdeutils/debian/patches/01_kdeutils_branch.diff.uu
Modified: branches/kde-3.3.2/kdeutils/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/patches/02_autotools_update.diff 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/patches/02_autotools_update.diff 2004-12-16 22:28:44 UTC (rev 317)
@@ -1,19 +1,18 @@
-diff -Nrua kdeutils-3.3.1/admin/compile kdeutils-patched/admin/compile
---- kdeutils-3.3.1/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ kdeutils-patched/admin/compile 2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/compile
++++ kdeutils-patched/admin/compile
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-10-12.08
++scriptversion=2004-09-10.20
+
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
-@@ -24,76 +25,118 @@
+@@ -24,76 +25,116 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
@@ -165,8 +164,6 @@
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
@@ -182,9 +179,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeutils-3.3.1/admin/config.guess kdeutils-patched/admin/config.guess
---- kdeutils-3.3.1/admin/config.guess 2004-08-02 09:17:40.000000000 -0500
-+++ kdeutils-patched/admin/config.guess 2004-08-25 09:25:50.000000000 -0500
+--- kdeutils-orig/admin/config.guess
++++ kdeutils-patched/admin/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -246,9 +242,8 @@
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
-diff -Nrua kdeutils-3.3.1/admin/depcomp kdeutils-patched/admin/depcomp
---- kdeutils-3.3.1/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ kdeutils-patched/admin/depcomp 2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/depcomp
++++ kdeutils-patched/admin/depcomp
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -719,16 +714,15 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeutils-3.3.1/admin/install-sh kdeutils-patched/admin/install-sh
---- kdeutils-3.3.1/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ kdeutils-patched/admin/install-sh 2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/install-sh
++++ kdeutils-patched/admin/install-sh
@@ -1,19 +1,38 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-10-22.00
++scriptversion=2004-09-10.20
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
@@ -787,7 +781,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,266 @@
+@@ -41,236 +58,265 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1161,7 +1155,7 @@
+ fi
+
+ # This sed command emulates the dirname command.
-+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+ # Make sure that the destination directory exists.
+
@@ -1174,8 +1168,7 @@
+ oIFS=$IFS
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
-+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+ shift
++ set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ IFS=$oIFS
+
+ pathcomp=
@@ -1271,9 +1264,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeutils-3.3.1/admin/missing kdeutils-patched/admin/missing
---- kdeutils-3.3.1/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ kdeutils-patched/admin/missing 2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/missing
++++ kdeutils-patched/admin/missing
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -1530,9 +1522,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeutils-3.3.1/admin/mkinstalldirs kdeutils-patched/admin/mkinstalldirs
---- kdeutils-3.3.1/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
-+++ kdeutils-patched/admin/mkinstalldirs 2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/mkinstalldirs
++++ kdeutils-patched/admin/mkinstalldirs
@@ -1,20 +1,32 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -1657,9 +1648,8 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
-diff -Nrua kdeutils-3.3.1/admin/ylwrap kdeutils-patched/admin/ylwrap
---- kdeutils-3.3.1/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ kdeutils-patched/admin/ylwrap 2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/ylwrap
++++ kdeutils-patched/admin/ylwrap
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
Modified: branches/kde-3.3.2/kdeutils/debian/patches/03_libtool_arm.diff
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/patches/03_libtool_arm.diff 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/patches/03_libtool_arm.diff 2004-12-16 22:28:44 UTC (rev 317)
@@ -1,6 +1,5 @@
-diff -Nrua kdeutils-3.2.2/admin/libtool.m4.in kdeutils-patched/admin/libtool.m4.in
---- kdeutils-3.2.2/admin/libtool.m4.in 2004-04-02 09:41:05.000000000 -0600
-+++ kdeutils-patched/admin/libtool.m4.in 2004-04-16 19:51:52.000000000 -0500
+--- kdeutils-orig/admin/libtool.m4.in
++++ kdeutils-patched/admin/libtool.m4.in
@@ -2180,17 +2180,7 @@
# This must be Linux ELF.
Modified: branches/kde-3.3.2/kdeutils/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/patches/04_am_maintainer_mode.diff 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/patches/04_am_maintainer_mode.diff 2004-12-16 22:28:44 UTC (rev 317)
@@ -1,12 +1,11 @@
-diff -Nru kdeutils-3.1.4/admin/configure.in.min kdeutils-patched/admin/configure.in.min
---- kdeutils-3.1.4/admin/configure.in.min 2001-11-07 05:17:28.000000000 -0600
-+++ kdeutils-patched/admin/configure.in.min 2003-10-18 03:10:32.000000000 -0500
+--- kdeutils-orig/admin/configure.in.min
++++ kdeutils-patched/admin/configure.in.min
@@ -38,6 +38,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
+
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
-
+
dnl generate the config header
Modified: branches/kde-3.3.2/kdeutils/debian/patches/05_pedantic-errors.diff
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/patches/05_pedantic-errors.diff 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/patches/05_pedantic-errors.diff 2004-12-16 22:28:44 UTC (rev 317)
@@ -1,6 +1,5 @@
-diff -Nrua kdeutils-3.3.0/admin/acinclude.m4.in kdeutils-patched/admin/acinclude.m4.in
---- kdeutils-3.3.0/admin/acinclude.m4.in 2004-07-26 09:13:36.000000000 -0500
-+++ kdeutils-patched/admin/acinclude.m4.in 2004-08-14 23:15:02.000000000 -0500
+--- kdeutils-orig/admin/acinclude.m4.in
++++ kdeutils-patched/admin/acinclude.m4.in
@@ -2087,9 +2087,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
Added: branches/kde-3.3.2/kdeutils/debian/patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/patches/06_automake-1.9.diff 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/patches/06_automake-1.9.diff 2004-12-16 22:28:44 UTC (rev 317)
@@ -0,0 +1,11 @@
+--- kdeutils-orig/admin/detect-autoconf.sh
++++ kdeutils-patched/admin/detect-autoconf.sh
+@@ -11,7 +11,7 @@
+ # needed to compile KDE. Do not forget to include the name/version #
+ # separator if one is present, e.g. -1.2 where - is the separator.
+ KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOMAKE_VERS="-1.9 -1.7 17 -1.6"
+
+ # We don't use variable here for remembering the type ... strings. Local
+ # variables are not that portable, but we fear namespace issues with our
Added: branches/kde-3.3.2/kdeutils/debian/patches/07_kfloppy-devicename-table.diff
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/patches/07_kfloppy-devicename-table.diff 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/patches/07_kfloppy-devicename-table.diff 2004-12-16 22:28:44 UTC (rev 317)
@@ -0,0 +1,25 @@
+--- kdeutils-orig/kfloppy/format.cpp
++++ kdeutils-patched/kfloppy/format.cpp
+@@ -164,14 +164,14 @@
+ //
+ //
+ #ifdef ANY_LINUX
+-const char *fd0H1440[] = { "/dev/fd0h1440", "/dev/fd0H1440", "/dev/fd0u1440", 0L } ;
+-const char *fd0D720[]={ "/dev/fd0u720", "/dev/fd0D720", 0L };
+-const char *fd0h1200[]={ "/dev/fd0h1200", 0L };
+-const char *fd0h360[]={ "/dev/fd0h360", 0L };
+-const char *fd1H1440[] = { "/dev/fd1h1440", "/dev/fd1H1440", "/dev/fdsu1440", 0L } ;
+-const char *fd1D720[]={ "/dev/fd1u720", "/dev/fd1D720", 0L };
+-const char *fd1h1200[]={ "/dev/fd1h1200", 0L };
+-const char *fd1h360[]={ "/dev/fd1h360", 0L };
++const char *fd0H1440[] = { "/dev/fd0h1440", "/dev/fd0H1440", "/dev/fd0u1440", "/dev/fd0", 0L } ;
++const char *fd0D720[]={ "/dev/fd0u720", "/dev/fd0D720", "/dev/fd0", 0L };
++const char *fd0h1200[]={ "/dev/fd0h1200", "/dev/fd0", 0L };
++const char *fd0h360[]={ "/dev/fd0h360", "/dev/fd0", 0L };
++const char *fd1H1440[] = { "/dev/fd1h1440", "/dev/fd1H1440", "/dev/fd1u1440", "/dev/fd1", 0L } ;
++const char *fd1D720[]={ "/dev/fd1u720", "/dev/fd1D720", "/dev/fd1", 0L };
++const char *fd1h1200[]={ "/dev/fd1h1200", "/dev/fd1", 0L };
++const char *fd1h360[]={ "/dev/fd1h360", "/dev/fd1", 0L };
+ #endif
+
+ #ifdef ANY_BSD
Modified: branches/kde-3.3.2/kdeutils/debian/rules
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/rules 2004-12-16 20:03:06 UTC (rev 316)
+++ branches/kde-3.3.2/kdeutils/debian/rules 2004-12-16 22:28:44 UTC (rev 317)
@@ -72,7 +72,8 @@
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure $(configkde) --enable-final
+ ../configure $(configkde) --enable-final \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
touch configure-stamp
@@ -201,7 +202,7 @@
dh_fixperms
# dh_perl
# dh_python
- dh_makeshlibs -V
+ env DH_COMPAT=3 dh_makeshlibs -V
dh_installdeb
dh_shlibdeps -ldebian/klaptopdaemon/usr/lib:debian/kmilo/usr/lib:debian/kregexpeditor/usr/lib:debian/ksim/usr/lib
dh_gencontrol