[Pkg-kde-commits] rev 1631 - in
branches/kde-3.4.0/packages/kdetoys/debian: . patches
Luk Claes
luk at costa.debian.org
Thu Sep 1 14:42:02 UTC 2005
Author: luk
Date: 2005-09-01 14:42:00 +0000 (Thu, 01 Sep 2005)
New Revision: 1631
Added:
branches/kde-3.4.0/packages/kdetoys/debian/patches/01_kdetoys_branch_r455845.diff
Modified:
branches/kde-3.4.0/packages/kdetoys/debian/changelog
branches/kde-3.4.0/packages/kdetoys/debian/control
branches/kde-3.4.0/packages/kdetoys/debian/copyright
branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff
Log:
Preparing upload
Modified: branches/kde-3.4.0/packages/kdetoys/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/changelog 2005-09-01 14:21:44 UTC (rev 1630)
+++ branches/kde-3.4.0/packages/kdetoys/debian/changelog 2005-09-01 14:42:00 UTC (rev 1631)
@@ -1,9 +1,15 @@
-kdetoys (4:3.4.2-1) UNRELEASED; urgency=low
+kdetoys (4:3.4.2-1) unstable; urgency=low
* New upstream release.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 31 May 2005 15:43:52 -0400
+ +++ Changes by Luk Claes:
+ * Added me to uploaders
+
+ * Updated FSF's address
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 1 Sep 2005 16:40:50 +0200
+
kdetoys (4:3.4.1-1) experimental; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdetoys/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/control 2005-09-01 14:21:44 UTC (rev 1630)
+++ branches/kde-3.4.0/packages/kdetoys/debian/control 2005-09-01 14:42:00 UTC (rev 1631)
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.4.2), gawk, gettext, sharutils
Build-Conflicts: autoconf2.13
Standards-Version: 3.6.2
Modified: branches/kde-3.4.0/packages/kdetoys/debian/copyright
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/copyright 2005-09-01 14:21:44 UTC (rev 1630)
+++ branches/kde-3.4.0/packages/kdetoys/debian/copyright 2005-09-01 14:42:00 UTC (rev 1631)
@@ -133,7 +133,7 @@
Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Added: branches/kde-3.4.0/packages/kdetoys/debian/patches/01_kdetoys_branch_r455845.diff
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/patches/01_kdetoys_branch_r455845.diff 2005-09-01 14:21:44 UTC (rev 1630)
+++ branches/kde-3.4.0/packages/kdetoys/debian/patches/01_kdetoys_branch_r455845.diff 2005-09-01 14:42:00 UTC (rev 1631)
@@ -0,0 +1,431 @@
+#DPATCHLEVEL=0
+--- kmoon/kmoonapplet.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kmoon/kmoonapplet.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -14,7 +14,6 @@
+ Name[el]=Δείκτης των φάσεων της Σελήνης
+ Name[es]=Indicador de fases lunares
+ Name[et]=Kuu faasid
+-Name[eu]=Ilargi-fasearen erakuspena
+ Name[fi]=Kuunvaihenäyttäjä
+ Name[fr]=Affichage des phases de la Lune
+ Name[gl]=Indicador de Fase Lunar
+@@ -56,7 +55,6 @@
+ Comment[el]=Ένα εφαρμογίδιο δείκτη των φάσεων της Σελήνης του KDE
+ Comment[es]=Un applet de KDE acerca de las fases lunares
+ Comment[et]=KDE kuufaaside aplett
+-Comment[eu]=KDErako Ilargi-fase appleta
+ Comment[fi]=Kuunvaihenäyttäjäsovelma
+ Comment[fr]=Une applet de phases lunaires pour KDE
+ Comment[gl]=Indicador de fase lunar para KDE
+--- fifteenapplet/kfifteenapplet.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ fifteenapplet/kfifteenapplet.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -13,7 +13,6 @@
+ Name[eo]=Kvindek pecoj
+ Name[es]=Quince piezas
+ Name[et]=Viisteist tükki
+-Name[eu]=Hamabost Zati
+ Name[fi]=Viisitoista palasta
+ Name[fr]=Taquin
+ Name[ga]=Cúig Phíosa Déag
+@@ -68,7 +67,6 @@
+ Comment[eo]=Aplikaĵeto "Kvindek pecoj"
+ Comment[es]=Applet Quince piezas
+ Comment[et]=Mäng 'Viisteist tükki'
+-Comment[eu]=Hamabost Zati Applet
+ Comment[fi]=Viisitoista palasta -sovelma
+ Comment[fr]=Applet du Taquin
+ Comment[ga]=Feidhmchláirín Chúig Phíosa Déag
+--- kworldwatch/kdeworld.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kworldwatch/kdeworld.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -14,7 +14,6 @@
+ Comment[eo]=KDE-mondhorloĝo
+ Comment[es]=El reloj mundial de KDE por Matthias Hoelzer-Kluepfel
+ Comment[et]=KDE maailma kell - Matthias Hoelzer-Kluepfel
+-Comment[eu]=KDE WorldWatch Matthias Hoelzer-Kluepfelek egina
+ Comment[fi]=Maailmankello, tehnyt Matthias Hoelzer-Kluepfel
+ Comment[fr]=L'horloge planétaire de KDE par Matthias Hoelzer-Kluepfel
+ Comment[ga]=KDE WorldClock le Matthias Hoelzer-Kluepfel
+--- kworldwatch/kwwapplet.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kworldwatch/kwwapplet.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -16,7 +16,6 @@
+ Name[eo]=Mondhorloĝo
+ Name[es]=Reloj mundial
+ Name[et]=Maailma kell
+-Name[eu]=Mundu Osoko Ikuspena
+ Name[fi]=Maailmankello
+ Name[fr]=Applet horloge planétaire
+ Name[he]=צג עולמי
+@@ -61,7 +60,6 @@
+ Comment[eo]=Mondhorloĝa panelaplikaĵeto
+ Comment[es]=Un applet para el panel de KDE que muestra un reloj mundial.
+ Comment[et]=Paneelil töötav maailma kell
+-Comment[eu]=KDE-ko Munduko Erlojua panel appleta
+ Comment[fi]=Maailmankellosovelma paneeliin
+ Comment[fr]=Une applet d'horloge planétaire pour KDE
+ Comment[gl]=Un applet para o panel do KDE World Watch
+--- kworldwatch/maps/depths/depths.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kworldwatch/maps/depths/depths.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -14,7 +14,6 @@
+ Name[eo]=Surfacprofundo
+ Name[es]=Profundidad de superficie
+ Name[et]=Pinnasügavus
+-Name[eu]=Azalaren Sakona
+ Name[fi]=Pinnan syvyys
+ Name[fr]=Relief
+ Name[gl]=Profundidade
+--- ktux/ktux.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ ktux/ktux.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -35,7 +35,6 @@
+ Name[eo]=Agordo...
+ Name[es]=Configuración...
+ Name[et]=Seadistused...
+-Name[eu]=Konfigurazioa...
+ Name[fi]=Asetukset...
+ Name[fr]=Configuration...
+ Name[ga]=Cumraigh...
+@@ -93,7 +92,6 @@
+ Name[el]=Εμφάνιση σε προκαθορισμένο παράθυρο
+ Name[es]=Mostrar en la ventana especificada
+ Name[et]=Määratud aknas näitamine
+-Name[eu]=Zehaztutako lehioan erakutsi
+ Name[fi]=Näytä määrätyssä ikkunassa
+ Name[fr]=Affichage dans la fenêtre indiquée
+ Name[ga]=Taispeáin san Fhuinneog Sonraithe
+@@ -141,7 +139,6 @@
+ Name[el]=Προβολή στο βασικό παράθυρο
+ Name[es]=Mostrar en la ventana raíz
+ Name[et]=Juuraknas näitamine
+-Name[eu]=Lehio nagusian erakutsi
+ Name[fi]=Näytä juuri-ikkunassa
+ Name[fr]=Affichage dans la fenêtre principale
+ Name[ga]=Taispeáin sa bhFréamhfhuinneog
+--- amor/amor.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/amor.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -24,7 +24,7 @@
+ GenericName[cs]=Příšerka na obrazovce
+ GenericName[cy]=Creadur Ar-Sgrin
+ GenericName[da]=Skæbning på skærm
+-GenericName[de]=Niedliche Kreaturen
++GenericName[de]=Maskottchen für die Arbeitsfläche
+ GenericName[es]=Criatura de la pantalla
+ GenericName[et]=Elajas töölaual
+ GenericName[fi]=Näytönolento
+--- amor/data/billyrc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/billyrc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -17,7 +17,6 @@
+ Description[eo]=Malgranda Bilĉjo
+ Description[es]=Pequeño Billy
+ Description[et]=Pisi-Villu
+-Description[eu]=Billy Txikia
+ Description[fi]=Pikku-Billy
+ Description[gl]=O Pequeno Billy
+ Description[he]=בילי הקטן
+@@ -68,7 +67,6 @@
+ About[eo]=Moviĝema fenestrosidulo\nGrafiko de http://www.xbill.org/
+ About[es]=Cuidador estático de ventanas\nGraphic from http://www.xbill.org/
+ About[et]=Liikumatu aknahoidja\nGraafika: http://www.xbill.org/
+-About[eu]=Lehio modelo egonkorra\nIrudia http://www.xbill.org/'tik
+ About[fi]=Staattinen ikkunakoriste\nGrafiikat osoitteesta http://www.xbill.org/
+ About[fr]=Surveillant statique de fenêtres\nDessin de http://www.xbill.org/
+ About[gl]=Vixiante estático de fiestras\nImaxe sacada de http://www.xbill.org/
+--- amor/data/nekorc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/nekorc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -30,7 +30,6 @@
+ About[eo]=Artaĵo de Masayuki Koba\nAMOR-ita de Chris Spiegel
+ About[es]=Arte de oneko por Masayuki Koba\nAMORizado por Chris Spiegel
+ About[et]=Hiirepüüdja graafika: Masayuki Koba\nAMORile kohandas: Chris Spiegel
+-About[eu]=Artelana onekotik Masayuki Kobak egina\nChris Spiegel'ek AMOR'tua
+ About[fi]=Kuvat oneko ohjelmasta, tehnyt Masayuki Koba\nMuokannut Amorille sopivaksi Chris Spiegel
+ About[fr]=Travail basé sur « oneko » de Masayuki Koba\nAMORé par Chris Spiegel
+ About[gl]=Imaxes de oneko por Masayuki Koba\nAdaptadas a AMOR por Chris Spiegel
+--- amor/data/blobrc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/blobrc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -13,7 +13,6 @@
+ Description[eo]=Multtalenta makulo
+ Description[es]=Mancha multifacética
+ Description[et]=Väga andekas plekk
+-Description[eu]=Ahalmen Askodun Gunea
+ Description[fi]=Monitaitoinen piste
+ Description[fr]=Point à talents multiples
+ Description[gl]="Polipatético" Gran
+@@ -60,7 +59,6 @@
+ About[eo]=De Martin R. Jones\nĴetpako, radiado kaj fajrospektakleto de Mark Grant
+ About[es]=Por Martin R. Jones\nAnimaciones de la mochila a chorro, rayos y fuego por Mark Grant
+ About[et]=Autor: Martin R. Jones\nJet pack, beam and fire animatsioonid: Mark Grant
+-About[eu]=Martin R. Jonesek egina\nJet bilduma, tximista eta su animazioak Mark Grantek eginak
+ About[fi]=Tehnyt Martin R. Jones\nAnimaatiot Mark Grant
+ About[fr]=Par Martin R. Jones\nAnimations du jet et du feu par Mark Grant
+ About[gl]=Por Martin R. Jones\nAs animacións do propulsor, do raio e do fogo son de Mark Grant
+--- amor/data/tuxrc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/tuxrc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -16,7 +16,6 @@
+ Description[eo]=Nemoviĝema Tuĉjo
+ Description[es]=Tux inanimado
+ Description[et]=Liikumatu Tux
+-Description[eu]=Tux animabakoa
+ Description[fi]=Animoimaton Tux
+ Description[fr]=Tux (in)animé
+ Description[ga]=Tux neamhbheoite
+@@ -67,7 +66,6 @@
+ About[eo]=Moviĝema fenestrosidulo
+ About[es]=Cuidador estático de ventanas
+ About[et]=Liikumatu aknahoidja
+-About[eu]=Lehio modelo egonkorra
+ About[fi]=Staattinen ikkunallaistuja
+ About[fr]=Surveillant statique de fenêtres
+ About[gl]=Vixiante estático de fiestras
+--- amor/data/pingurc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/pingurc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -31,7 +31,6 @@
+ About[eo]=De Frank Pieczynski\nbazita sur grafikoj de la ludo "pingus".
+ About[es]=Por Frank Pieczynski\nBasado en gráficos del juego "pingus".
+ About[et]=Autor: Frank Pieczynski\nAluseks mängu "pingus" graafika.
+-About[eu]=Frank Pieczynskik egina\n"pingus" jokoaren irudietan oinarritua.
+ About[fi]=Tehnyt Frank Pieczynski\nPerustuu "pingus" pelin grafiikoihin.
+ About[fr]=Par Frank Pieczynski\nBasé sur les graphismes du jeu « pingus ».
+ About[ga]=Le Frank Pieczynski\nBunaithe ar ghrafaigh an chluiche "pingus".
+--- amor/data/taorc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/taorc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -26,7 +26,6 @@
+ About[eo]=De Daniel Pfeiffer <occitan at esperanto.org>\nJinjan-simbolo inspirita de mia Tajĝi-praktikado.
+ About[es]=Por Daniel Pfeiffer <occitan at esperanto.org>\nSímbolo del Yin Yang, inspirado en mi práctica de Tai Chi.
+ About[et]=Autor: Daniel Pfeiffer <occitan at esperanto.org>\nYin-yangi sümbol jäi mulle külge taiji harrastusest.
+-About[eu]=Daniel Pfeiffer egina <occitan at esperanto.org>\nYin Yang simboloa nire Tai Chi praktikan oinarritua.
+ About[fi]=Tehnyt Daniel Pfeiffer <occitan at esperanto.org>\nYin Yang symbolin inspiroinut Tai Chi -harjoitukseni.
+ About[fr]=Par Daniel Pfeiffer <occitan at esperanto.org>\nLe symbole Yin Yang est inspiré par ma pratique du Tai Chi.
+ About[gl]=Por Daniel Pfeiffer <occitan at esperanto.org>\nO símbolo do Yin-Yang inspirado na miña práctica do Tai Chi.
+--- amor/data/bonhommerc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/bonhommerc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -38,7 +38,6 @@
+ About[eo]=De Jean-Claude Dumas
+ About[es]=Por Jean-Claude Dumas
+ About[et]=Autor: Jean-Claude Dumas
+-About[eu]=Jean-Claude Dumasek Egina
+ About[fi]=Tehnyt Jean-Claude Dumas
+ About[fo]=Av Jean-Claude Dumas
+ About[fr]=Par Jean-Claude Dumas
+--- amor/data/ghostrc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/ghostrc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -14,7 +14,6 @@
+ Description[eo]=Hantema spirito
+ Description[es]=Fantasma misterioso
+ Description[et]=Jube tont
+-Description[eu]=Mamu Izugarria
+ Description[fi]=Pelottava aave
+ Description[fr]=Fantôme
+ Description[ga]=Taibhse
+@@ -66,7 +65,6 @@
+ About[eo]=De Martin R. Jones\nbazita sur piktogramo de la KDE-artistaro.
+ About[es]=Por Martin R. Jones\nBasado en un ícono proveniente del equipo artístico KDE.
+ About[et]=Autor: Martin R. Jones\nAluseks KDE kunstnike loodud ikoon.
+-About[eu]=Martin R. Jonesek Eginak\nKDE artista taldeak egindako ikono batetan oinarritua.
+ About[fi]=Tehnyt Martin R. Jones\nPerustuu KDE-taiteilijaryhmän kuvakkeeseen.
+ About[fr]=Par Martin R. Jones\nBasé sur une icône de l'équipe artistique de KDE.
+ About[ga]=Le Martin R. Jones\nBunaithe ar deilbhín ó fhoireann ealaíontóirí KDE.
+--- amor/data/wormrc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/wormrc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -16,7 +16,6 @@
+ Description[eo]=Vermeto
+ Description[es]=Gusanito
+ Description[et]=Ussike
+-Description[eu]=Hartxoa
+ Description[fi]=Pieni mato
+ Description[fr]=Petit ver de terre
+ Description[ga]=Péistín
+@@ -66,7 +65,6 @@
+ About[eo]=De Bartosz Trudnowski\nFarita por mia edzino
+ About[es]=Por Bartosz Trudnowski\nHecho para mi esposa
+ About[et]=Autor: Bartosz Trudnowski\nTehtud minu abikaasale
+-About[eu]=Bartosz Trudnowski'k egina\nEmaztearentzat egina
+ About[fi]=Tehnyt Bartosz Trudnowski\nTehty vaimolleni
+ About[fr]=Par Bartosz Trudnowski\nDéveloppé pour ma femme
+ About[ga]=Le Bartosz Trudnowski\nDéanta do mo bhean chéile
+--- amor/data/eyesrc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/eyesrc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -17,7 +17,6 @@
+ Description[eo]=Frenezaj okuloj
+ Description[es]=Ojos locos
+ Description[et]=Hullud silmad
+-Description[eu]=Begi Zoroak
+ Description[fi]=Hullut silmät
+ Description[fr]=Yeux fous
+ Description[ga]=Súile Craiceáilte
+@@ -69,7 +68,6 @@
+ About[eo]=De Jean-Claude Dumas
+ About[es]=Por Jean-Claude Dumas
+ About[et]=Autor: Jean-Claude Dumas
+-About[eu]=Jean-Claude Dumasek Egina
+ About[fi]=Tehnyt Jean-Claude Dumas
+ About[fo]=Av Jean-Claude Dumas
+ About[fr]=Par Jean-Claude Dumas
+--- amor/data/bsdrc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ amor/data/bsdrc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -17,7 +17,6 @@
+ Description[eo]=Simbolbesto de FreeBSD
+ Description[es]=Mascota de FreeBSD
+ Description[et]=FreeBSD maskott
+-Description[eu]=FreeBSD Maskota
+ Description[fi]=FreeBSD-maskotti
+ Description[fr]=Mascotte de FreeBSD
+ Description[ga]=Sonóg FreeBSD
+@@ -69,7 +68,6 @@
+ About[eo]=Moviĝema fenestrosidulo
+ About[es]=Cuidador estático de ventanas
+ About[et]=Liikumatu aknahoidja
+-About[eu]=Lehio modelo egonkorra
+ About[fi]=Staattinen ikkunallaistuja
+ About[fr]=Surveillant statique de fenêtres
+ About[gl]=Vixiante estático de fiestras
+--- kteatime/eventsrc (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kteatime/eventsrc (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -14,7 +14,6 @@
+ Comment[eo]=La KDE-Teinfuzilo
+ Comment[es]=Tetera de Kde
+ Comment[et]=KDE teekann
+-Comment[eu]=KDE Te-Sukaldea
+ Comment[fi]=Teenkeittäjä
+ Comment[fr]=Le préparateur de thé de KDE
+ Comment[ga]=Cócaire Tae KDE
+@@ -65,7 +64,6 @@
+ Name[eo]=Teo estas preta
+ Name[es]=El té está listo
+ Name[et]=Tee on valmis
+-Name[eu]=Tea prest dago
+ Name[fi]=Tee on valmista
+ Name[fr]=Le thé est prêt
+ Name[ga]=Tá an tae réidh
+@@ -113,7 +111,6 @@
+ Comment[eo]=Teo estas preta
+ Comment[es]=El té está listo
+ Comment[et]=Tee on valmis
+-Comment[eu]=Tea prest dago
+ Comment[fi]=Tee on valmista
+ Comment[fr]=Le thé est prêt
+ Comment[ga]=Tá an tae réidh
+--- Makefile.cvs (.../tags/KDE/3.4.2/kdetoys) (revision 0)
++++ Makefile.cvs (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -0,0 +1,14 @@
++all:
++ @echo "This Makefile is only for the CVS repository"
++ @echo "This will be deleted before making the distribution"
++ @echo ""
++ @if test ! -d admin; then \
++ echo "Please recheckout this module!" ;\
++ echo "for cvs: use checkout once and after that update again" ;\
++ echo "for cvsup: checkout kde-common from cvsup and" ;\
++ echo " link kde-common/admin to ./admin" ;\
++ exit 1 ;\
++ fi
++ $(MAKE) -f admin/Makefile.common cvs
++
++.SILENT:
+--- kweather/kweather.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kweather/kweather.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -15,7 +15,6 @@
+ Comment[eo]=panelaplikaĵeto por la vetero
+ Comment[es]=Un applet para el panel que informa sobre el tiempo.
+ Comment[et]=Paneeli ilmateateaplett
+-Comment[eu]=Eguraldiaz ohartaPanel applet abibide bat
+ Comment[fi]=Sääsovelma paneelille
+ Comment[fr]=Une petite applet de météo
+ Comment[ga]=Feidhmchláirín painéil a thugann tuairiscí aimsire
+--- kweather/kcmweatherservice.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kweather/kcmweatherservice.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -25,7 +25,6 @@
+ Name[eo]=VeteroServo
+ Name[es]=Servicio de meteorología
+ Name[et]=Ilmateenistus
+-Name[eu]=Eguraldi Serbitzua
+ Name[fi]=Sääpalvelu
+ Name[fr]=KWeatherService
+ Name[ga]=Seirbhís Aimsire
+@@ -70,7 +69,6 @@
+ Comment[el]=Ρύθμιση υπηρεσίας καιρού
+ Comment[es]=Configuración del servicio de meteorología
+ Comment[et]=Ilmateenistuse seadistamine
+-Comment[eu]=Eguraldi Serbitzua Egokitu
+ Comment[fi]=Sääpalvelun asetukset
+ Comment[fr]=Configuration du service Weather
+ Comment[ga]=Cumraíocht na Seirbhíse Aimsire
+@@ -115,7 +113,6 @@
+ Keywords[el]=kweather, υπηρεσία καιρού, ρύθμιση, ρυθμίσεις
+ Keywords[es]=kweather, servicio de meteorología, configurar, parámetros
+ Keywords[et]=kweather, ilmateenistus, seadistamine, seadistused
+-Keywords[eu]=kweather,eguraldi serbitzua, konfiguratu, ezarpenak
+ Keywords[fi]=kweather, sääpalvelu, aseta, asetukset
+ Keywords[fr]=kweather, weather service, configurer, réglages
+ Keywords[ga]=kweather, seirbhís aimsire, cumraigh, socruithe
+--- kweather/weatherbar.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kweather/weatherbar.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -16,7 +16,6 @@
+ Name[eo]=Flank-VeterRaporto
+ Name[es]=Barra lateral de informe meteorológico
+ Name[et]=Külgriba ilmateade
+-Name[eu]=Eguraldiaren Egoera Alboko Barran
+ Name[fi]=Navigointipalkin säätiedotus
+ Name[fr]=Rapport météorologique de la barre latérale
+ Name[gl]=Barra de Información Sobre a Metereoloxía
+--- kweather/kweatherservice.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kweather/kweatherservice.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -7,7 +7,6 @@
+ Name[cy]=KGwasanaethTywydd
+ Name[eo]=VeteroServo
+ Name[et]=KIlmajaam
+-Name[eu]=KweatherSerbitzua
+ Name[fi]=Sääpalvelu
+ Name[hi]=के-वेदर-सर्विस
+ Name[lv]=KLaikapstākļu serviss
+--- kweather/kcmweather.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kweather/kcmweather.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -24,7 +24,6 @@
+ Name[eo]=Vidigilo
+ Name[es]=Visualización
+ Name[et]=Vaade
+-Name[eu]=Pantaila
+ Name[fi]=Näyttö
+ Name[fr]=Affichage
+ Name[gl]=Amosar
+@@ -69,7 +68,6 @@
+ Comment[eo]=Vidigilagordo
+ Comment[es]=Configuración de vistas
+ Comment[et]=Vaateseadistused
+-Comment[eu]=Pantaila Egokitu
+ Comment[fi]=Näytön asetukset
+ Comment[fr]=Configuration de l'affichage
+ Comment[ga]=Cumraigh an Taispeáint
+@@ -115,7 +113,6 @@
+ Keywords[el]=kweather, καιρός, ρύθμιση, ρυθμίσεις, εμφάνιση
+ Keywords[es]=kweather, clima, configurar, parámetros, visualización
+ Keywords[et]=kweather, ilm, seadistamine, seadistused, vaade
+-Keywords[eu]=kweather, eguraldia, configuratu, ezarpenak, pantaila
+ Keywords[fi]=kweather, sää, aseta, asetukset, näyttö
+ Keywords[fr]=kweather, temps, configurer, affichage, météo
+ Keywords[ga]=kweather, aimsir, cumraigh, socruithe, taispeáint
+--- kweather/weatherbar_add.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ kweather/weatherbar_add.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -16,7 +16,6 @@
+ Name[eo]=Flank-VeterRaporto
+ Name[es]=Barra lateral de informe meteorológico
+ Name[et]=Külgriba ilmateade
+-Name[eu]=Eguraldiaren Egoera Alboko Barran
+ Name[fi]=Navigointipalkin säätiedotus
+ Name[fr]=Rapport météorologique de la barre latérale
+ Name[gl]=Barra de Información Sobre a Metereoloxía
+--- eyesapplet/eyesapplet.desktop (.../tags/KDE/3.4.2/kdetoys) (revision 455845)
++++ eyesapplet/eyesapplet.desktop (.../branches/KDE/3.4/kdetoys) (revision 455845)
+@@ -17,7 +17,6 @@
+ Name[eo]=Okuloj
+ Name[es]=Ojos
+ Name[et]=Silmad
+-Name[eu]=Begiak
+ Name[fi]=Silmät
+ Name[fo]=Eygu
+ Name[fr]=Yeux
+@@ -75,7 +74,6 @@
+ Comment[eo]=Panelaplikaĵeto kun mussekvantaj okuloj.
+ Comment[es]=Applet para el panel similar a Xeyes
+ Comment[et]=XEyes'iga sarnanev paneeliaplett
+-Comment[eu]=Xeyes bezalako panel appleta
+ Comment[fi]=xeyesin tapainen paneelisovelma.
+ Comment[fr]=Applet similaire à xEyes.
+ Comment[ga]=Feidhmchláirín painéil cosúil le xeyes.
Modified: branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff 2005-09-01 14:21:44 UTC (rev 1630)
+++ branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff 2005-09-01 14:42:00 UTC (rev 1631)
@@ -1,6 +1,7 @@
-diff -Nru kdetoys-3.4.2.orig/acinclude.m4 kdetoys-3.4.2/acinclude.m4
---- kdetoys-3.4.2.orig/acinclude.m4 2005-07-20 20:20:37.000000000 +0000
-+++ kdetoys-3.4.2/acinclude.m4 2005-07-31 20:12:25.104714704 +0000
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- acinclude.m4
++++ acinclude.m4
@@ -1688,15 +1688,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1516,9 +1517,23 @@
AC_MSG_RESULT([$SED])
])
-diff -Nru kdetoys-3.4.2.orig/aclocal.m4 kdetoys-3.4.2/aclocal.m4
---- kdetoys-3.4.2.orig/aclocal.m4 2005-07-20 20:20:47.000000000 +0000
-+++ kdetoys-3.4.2/aclocal.m4 2005-07-31 20:12:59.287518128 +0000
+--- aclocal.m4
++++ aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005 Free Software Foundation, Inc.
+@@ -28,7 +28,7 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1555,9 +1570,14 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -Nru kdetoys-3.4.2.orig/amor/data/Makefile.in kdetoys-3.4.2/amor/data/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/Makefile.in 2005-07-31 20:14:25.235452056 +0000
+--- amor/data/Makefile.in
++++ amor/data/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1589,9 +1609,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/blob/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/blob/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/blob/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/blob/Makefile.in 2005-07-31 20:14:25.277445672 +0000
+--- amor/data/pics/animated/blob/Makefile.in
++++ amor/data/pics/animated/blob/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1632,9 +1657,14 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/bonhomme/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/bonhomme/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/bonhomme/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/bonhomme/Makefile.in 2005-07-31 20:14:25.291443544 +0000
+--- amor/data/pics/animated/bonhomme/Makefile.in
++++ amor/data/pics/animated/bonhomme/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1675,9 +1705,14 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/eyes/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/eyes/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/eyes/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/eyes/Makefile.in 2005-07-31 20:14:25.304441568 +0000
+--- amor/data/pics/animated/eyes/Makefile.in
++++ amor/data/pics/animated/eyes/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1718,9 +1753,14 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/ghost/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/ghost/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/ghost/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/ghost/Makefile.in 2005-07-31 20:14:25.348434880 +0000
+--- amor/data/pics/animated/ghost/Makefile.in
++++ amor/data/pics/animated/ghost/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1752,9 +1792,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/Makefile.in 2005-07-31 20:14:25.262447952 +0000
+--- amor/data/pics/animated/Makefile.in
++++ amor/data/pics/animated/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1786,9 +1831,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/neko/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/neko/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/neko/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/neko/Makefile.in 2005-07-31 20:14:25.361432904 +0000
+--- amor/data/pics/animated/neko/Makefile.in
++++ amor/data/pics/animated/neko/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1829,9 +1879,14 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/pingu/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/pingu/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/pingu/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/pingu/Makefile.in 2005-07-31 20:14:25.380430016 +0000
+--- amor/data/pics/animated/pingu/Makefile.in
++++ amor/data/pics/animated/pingu/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1872,9 +1927,14 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/tao/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/tao/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/tao/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/tao/Makefile.in 2005-07-31 20:14:25.395427736 +0000
+--- amor/data/pics/animated/tao/Makefile.in
++++ amor/data/pics/animated/tao/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1915,9 +1975,14 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/animated/worm/Makefile.in kdetoys-3.4.2/amor/data/pics/animated/worm/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/animated/worm/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/animated/worm/Makefile.in 2005-07-31 20:14:25.408425760 +0000
+--- amor/data/pics/animated/worm/Makefile.in
++++ amor/data/pics/animated/worm/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1958,9 +2023,14 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/Makefile.in kdetoys-3.4.2/amor/data/pics/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/Makefile.in 2005-07-31 20:14:25.248450080 +0000
+--- amor/data/pics/Makefile.in
++++ amor/data/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1992,9 +2062,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/preview/Makefile.in kdetoys-3.4.2/amor/data/pics/preview/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/preview/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/preview/Makefile.in 2005-07-31 20:14:25.420423936 +0000
+--- amor/data/pics/preview/Makefile.in
++++ amor/data/pics/preview/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -2026,9 +2101,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/amor/data/pics/static/Makefile.in kdetoys-3.4.2/amor/data/pics/static/Makefile.in
---- kdetoys-3.4.2.orig/amor/data/pics/static/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/data/pics/static/Makefile.in 2005-07-31 20:14:25.432422112 +0000
+--- amor/data/pics/static/Makefile.in
++++ amor/data/pics/static/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -2060,10 +2140,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/amor/Makefile.in kdetoys-3.4.2/amor/Makefile.in
---- kdetoys-3.4.2.orig/amor/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/amor/Makefile.in 2005-07-31 20:14:25.221454184 +0000
-@@ -233,6 +233,9 @@
+--- amor/Makefile.in
++++ amor/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(amor_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -233,6 +231,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2073,7 +2167,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -414,7 +415,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2082,7 +2176,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -452,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2094,7 +2188,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -870,18 +873,18 @@
+@@ -870,18 +871,18 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub AmorIface.kidl
#>+ 3
@@ -2119,7 +2213,7 @@
#>+ 3
amordialog.moc: $(srcdir)/amordialog.h
-@@ -899,7 +902,7 @@
+@@ -899,7 +900,7 @@
#>+ 3
clean-metasources:
@@ -2128,7 +2222,7 @@
#>+ 2
KDE_DIST=cr48-app-amor.png Makefile.in preparetips cr32-app-amor.png amor.desktop version.h cr16-app-amor.png configure.in.in Makefile.am
-@@ -914,17 +917,17 @@
+@@ -914,17 +915,17 @@
#>+ 13
install-kde-icons:
@@ -2152,7 +2246,7 @@
#>+ 15
force-reedit:
-@@ -965,7 +968,7 @@
+@@ -965,7 +966,7 @@
#>+ 11
@@ -2161,7 +2255,7 @@
@echo 'creating amor.all_cpp.cpp ...'; \
rm -f amor.all_cpp.files amor.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> amor.all_cpp.final; \
-@@ -1011,7 +1014,7 @@
+@@ -1011,7 +1012,7 @@
nmcheck-am: nmcheck
amordialog.lo: amordialog.moc
amorbubble.o: amorbubble.moc
@@ -2170,9 +2264,8 @@
+amorwidget.o: amorwidget.moc
amorbubble.lo: amorbubble.moc
amordialog.o: amordialog.moc
-diff -Nru kdetoys-3.4.2.orig/config.h.in kdetoys-3.4.2/config.h.in
---- kdetoys-3.4.2.orig/config.h.in 2005-07-20 20:20:53.000000000 +0000
-+++ kdetoys-3.4.2/config.h.in 2005-07-31 20:13:13.137412624 +0000
+--- config.h.in
++++ config.h.in
@@ -277,9 +277,6 @@
#endif
@@ -2183,9 +2276,8 @@
#if defined(__SVR4) && !defined(__svr4__)
#define __svr4__ 1
-diff -Nru kdetoys-3.4.2.orig/configure kdetoys-3.4.2/configure
---- kdetoys-3.4.2.orig/configure 2005-07-20 20:21:12.000000000 +0000
-+++ kdetoys-3.4.2/configure 2005-07-31 20:14:34.966972640 +0000
+--- configure
++++ configure
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -7643,9 +7735,8 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nru kdetoys-3.4.2.orig/configure.in kdetoys-3.4.2/configure.in
---- kdetoys-3.4.2.orig/configure.in 2005-07-20 20:20:38.000000000 +0000
-+++ kdetoys-3.4.2/configure.in 2005-07-31 20:12:27.843298376 +0000
+--- configure.in
++++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdetoys, "3.4.2") dnl searches for some needed programs
@@ -7655,9 +7746,14 @@
KDE_SET_PREFIX
dnl generate the config header
-diff -Nru kdetoys-3.4.2.orig/doc/amor/Makefile.in kdetoys-3.4.2/doc/amor/Makefile.in
---- kdetoys-3.4.2.orig/doc/amor/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/doc/amor/Makefile.in 2005-07-31 20:14:25.561402504 +0000
+--- doc/amor/Makefile.in
++++ doc/amor/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -160,6 +160,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7726,9 +7822,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdetoys-3.4.2.orig/doc/kmoon/Makefile.in kdetoys-3.4.2/doc/kmoon/Makefile.in
---- kdetoys-3.4.2.orig/doc/kmoon/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/doc/kmoon/Makefile.in 2005-07-31 20:14:25.574400528 +0000
+--- doc/kmoon/Makefile.in
++++ doc/kmoon/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -160,6 +160,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7760,9 +7861,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/doc/kodo/Makefile.in kdetoys-3.4.2/doc/kodo/Makefile.in
---- kdetoys-3.4.2.orig/doc/kodo/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/doc/kodo/Makefile.in 2005-07-31 20:14:25.587398552 +0000
+--- doc/kodo/Makefile.in
++++ doc/kodo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -160,6 +160,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7827,9 +7933,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdetoys-3.4.2.orig/doc/kteatime/Makefile.in kdetoys-3.4.2/doc/kteatime/Makefile.in
---- kdetoys-3.4.2.orig/doc/kteatime/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/doc/kteatime/Makefile.in 2005-07-31 20:14:25.600396576 +0000
+--- doc/kteatime/Makefile.in
++++ doc/kteatime/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -160,6 +160,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7894,9 +8005,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdetoys-3.4.2.orig/doc/kweather/Makefile.in kdetoys-3.4.2/doc/kweather/Makefile.in
---- kdetoys-3.4.2.orig/doc/kweather/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/doc/kweather/Makefile.in 2005-07-31 20:14:25.613394600 +0000
+--- doc/kweather/Makefile.in
++++ doc/kweather/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -160,6 +160,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7928,9 +8044,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/doc/kworldclock/Makefile.in kdetoys-3.4.2/doc/kworldclock/Makefile.in
---- kdetoys-3.4.2.orig/doc/kworldclock/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/doc/kworldclock/Makefile.in 2005-07-31 20:14:25.635391256 +0000
+--- doc/kworldclock/Makefile.in
++++ doc/kworldclock/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -160,6 +160,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7999,9 +8120,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdetoys-3.4.2.orig/doc/Makefile.in kdetoys-3.4.2/doc/Makefile.in
---- kdetoys-3.4.2.orig/doc/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/doc/Makefile.in 2005-07-31 20:14:25.546404784 +0000
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8040,10 +8166,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/eyesapplet/Makefile.in kdetoys-3.4.2/eyesapplet/Makefile.in
---- kdetoys-3.4.2.orig/eyesapplet/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/eyesapplet/Makefile.in 2005-07-31 20:14:25.663387000 +0000
-@@ -207,6 +207,9 @@
+--- eyesapplet/Makefile.in
++++ eyesapplet/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(eyes_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -207,6 +205,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8053,7 +8193,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -369,7 +372,7 @@
+@@ -369,7 +370,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8062,7 +8202,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -407,9 +410,9 @@
+@@ -407,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8074,10 +8214,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdetoys-3.4.2.orig/fifteenapplet/Makefile.in kdetoys-3.4.2/fifteenapplet/Makefile.in
---- kdetoys-3.4.2.orig/fifteenapplet/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/fifteenapplet/Makefile.in 2005-07-31 20:14:25.692382592 +0000
-@@ -210,6 +210,9 @@
+--- fifteenapplet/Makefile.in
++++ fifteenapplet/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(fifteen_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -210,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8087,7 +8241,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -372,7 +375,7 @@
+@@ -372,7 +373,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8096,7 +8250,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +413,9 @@
+@@ -410,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8108,10 +8262,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdetoys-3.4.2.orig/kmoon/Makefile.in kdetoys-3.4.2/kmoon/Makefile.in
---- kdetoys-3.4.2.orig/kmoon/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kmoon/Makefile.in 2005-07-31 20:14:25.724377728 +0000
-@@ -223,6 +223,9 @@
+--- kmoon/Makefile.in
++++ kmoon/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kmoon_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -223,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8121,7 +8289,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -385,7 +388,7 @@
+@@ -385,7 +386,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8130,7 +8298,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -423,9 +426,9 @@
+@@ -423,9 +424,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8142,9 +8310,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdetoys-3.4.2.orig/kmoon/pics/Makefile.in kdetoys-3.4.2/kmoon/pics/Makefile.in
---- kdetoys-3.4.2.orig/kmoon/pics/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kmoon/pics/Makefile.in 2005-07-31 20:14:25.738375600 +0000
+--- kmoon/pics/Makefile.in
++++ kmoon/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8185,10 +8358,24 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/kodo/Makefile.in kdetoys-3.4.2/kodo/Makefile.in
---- kdetoys-3.4.2.orig/kodo/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kodo/Makefile.in 2005-07-31 20:14:25.912349152 +0000
-@@ -212,6 +212,9 @@
+--- kodo/Makefile.in
++++ kodo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kodo_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -212,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8198,7 +8385,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -377,7 +380,7 @@
+@@ -377,7 +378,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8207,7 +8394,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -415,9 +418,9 @@
+@@ -415,9 +416,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8219,7 +8406,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -731,24 +734,24 @@
+@@ -731,24 +732,24 @@
-rm -f kimagenumber.moc kodometer.moc
#>+ 2
@@ -8251,10 +8438,24 @@
#>+ 15
force-reedit:
-diff -Nru kdetoys-3.4.2.orig/kteatime/Makefile.in kdetoys-3.4.2/kteatime/Makefile.in
---- kdetoys-3.4.2.orig/kteatime/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kteatime/Makefile.in 2005-07-31 20:14:25.940344896 +0000
-@@ -210,6 +210,9 @@
+--- kteatime/Makefile.in
++++ kteatime/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kteatime_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -210,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8264,7 +8465,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -376,7 +379,7 @@
+@@ -376,7 +377,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8273,7 +8474,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -414,9 +417,9 @@
+@@ -414,9 +415,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8285,7 +8486,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -731,7 +734,7 @@
+@@ -731,7 +732,7 @@
-rm -f timeedit.moc toplevel.moc
#>+ 2
@@ -8294,7 +8495,7 @@
#>+ 2
docs-am:
-@@ -744,29 +747,29 @@
+@@ -744,29 +745,29 @@
$(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kteatime.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
$(INSTALL_DATA) $(srcdir)/cr16-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kteatime.png
@@ -8330,10 +8531,24 @@
#>+ 15
force-reedit:
-diff -Nru kdetoys-3.4.2.orig/ktux/Makefile.in kdetoys-3.4.2/ktux/Makefile.in
---- kdetoys-3.4.2.orig/ktux/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/ktux/Makefile.in 2005-07-31 20:14:25.968340640 +0000
-@@ -227,6 +227,9 @@
+--- ktux/Makefile.in
++++ ktux/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(ktux_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -227,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8343,7 +8558,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -404,7 +405,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8352,7 +8567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -442,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8364,9 +8579,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdetoys-3.4.2.orig/ktux/sprites/Makefile.in kdetoys-3.4.2/ktux/sprites/Makefile.in
---- kdetoys-3.4.2.orig/ktux/sprites/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/ktux/sprites/Makefile.in 2005-07-31 20:14:25.982338512 +0000
+--- ktux/sprites/Makefile.in
++++ ktux/sprites/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8407,9 +8627,14 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/kweather/graphics/Makefile.in kdetoys-3.4.2/kweather/graphics/Makefile.in
---- kdetoys-3.4.2.orig/kweather/graphics/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kweather/graphics/Makefile.in 2005-07-31 20:14:26.112318752 +0000
+--- kweather/graphics/Makefile.in
++++ kweather/graphics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8450,10 +8675,43 @@
#>+ 2
docs-am:
-diff -Nru kdetoys-3.4.2.orig/kweather/Makefile.in kdetoys-3.4.2/kweather/Makefile.in
---- kdetoys-3.4.2.orig/kweather/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kweather/Makefile.in 2005-07-31 20:14:26.098320880 +0000
-@@ -327,6 +327,9 @@
+--- kweather/Makefile.in
++++ kweather/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kcm_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) $(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) $(kweatherservice_SOURCES) $(metar_parser_test_SOURCES) $(stationdatabase_test_SOURCES) $(sun_test_SOURCES)
+-#>+ 1
+-SOURCES = $(kcm_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) $(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) $(kweatherservice_SOURCES) $(metar_parser_test_SOURCES) $(stationdatabase_test_SOURCES) $(sun_test_SOURCES) $(kweatherreport_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -178,10 +174,15 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kcm_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) \
++#>- $(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) \
++#>- $(kweatherservice_SOURCES) $(metar_parser_test_SOURCES) \
++#>- $(stationdatabase_test_SOURCES) $(sun_test_SOURCES)
++#>+ 4
+ SOURCES = $(kcm_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) \
+ $(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) \
+ $(kweatherservice_SOURCES) $(metar_parser_test_SOURCES) \
+- $(stationdatabase_test_SOURCES) $(sun_test_SOURCES)
++ $(stationdatabase_test_SOURCES) $(sun_test_SOURCES) $(kweatherreport_SOURCES)
+ #>- DIST_SOURCES = $(kcm_weather_la_SOURCES) \
+ #>- $(kcm_weatherservice_la_SOURCES) $(kweatherreport_la_SOURCES) \
+ #>- $(weather_panelapplet_la_SOURCES) $(kweatherservice_SOURCES) \
+@@ -327,6 +328,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8463,7 +8721,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -569,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8472,7 +8730,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -607,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8484,7 +8742,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1272,13 +1275,6 @@
+@@ -1272,13 +1276,6 @@
mocs: kcmweather.moc
#>+ 3
@@ -8498,7 +8756,7 @@
weatherlib.moc: $(srcdir)/weatherlib.h
$(MOC) $(srcdir)/weatherlib.h -o weatherlib.moc
-@@ -1286,11 +1282,11 @@
+@@ -1286,11 +1283,11 @@
mocs: weatherlib.moc
#>+ 3
@@ -8513,7 +8771,7 @@
#>+ 3
kcmweatherservice.moc: $(srcdir)/kcmweatherservice.h
-@@ -1300,18 +1296,18 @@
+@@ -1300,18 +1297,18 @@
mocs: kcmweatherservice.moc
#>+ 3
@@ -8538,7 +8796,7 @@
#>+ 3
reportview.moc: $(srcdir)/reportview.h
-@@ -1321,6 +1317,13 @@
+@@ -1321,6 +1318,13 @@
mocs: reportview.moc
#>+ 3
@@ -8552,7 +8810,7 @@
sidebarwidget.moc: $(srcdir)/sidebarwidget.h
$(MOC) $(srcdir)/sidebarwidget.h -o sidebarwidget.moc
-@@ -1366,10 +1369,10 @@
+@@ -1366,10 +1370,10 @@
#>+ 3
clean-metasources:
@@ -8565,7 +8823,7 @@
#>+ 10
clean-idl:
-@@ -1484,7 +1487,7 @@
+@@ -1484,7 +1488,7 @@
rm -f kcm_weatherservice_la.all_cpp.final kcm_weatherservice_la.all_cpp.files
#>+ 11
@@ -8574,7 +8832,7 @@
@echo 'creating weather_panelapplet_la.all_cpp.cpp ...'; \
rm -f weather_panelapplet_la.all_cpp.files weather_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> weather_panelapplet_la.all_cpp.final; \
-@@ -1496,7 +1499,7 @@
+@@ -1496,7 +1500,7 @@
rm -f weather_panelapplet_la.all_cpp.final weather_panelapplet_la.all_cpp.files
#>+ 11
@@ -8583,10 +8841,24 @@
@echo 'creating kweatherservice.all_cpp.cpp ...'; \
rm -f kweatherservice.all_cpp.files kweatherservice.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kweatherservice.all_cpp.final; \
-diff -Nru kdetoys-3.4.2.orig/kworldwatch/Makefile.in kdetoys-3.4.2/kworldwatch/Makefile.in
---- kdetoys-3.4.2.orig/kworldwatch/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kworldwatch/Makefile.in 2005-07-31 20:14:26.250297776 +0000
-@@ -255,6 +255,9 @@
+--- kworldwatch/Makefile.in
++++ kworldwatch/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(libww_la_SOURCES) $(ww_panelapplet_la_SOURCES) $(kworldclock_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8596,7 +8868,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -431,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -8605,7 +8877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -469,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8617,7 +8889,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1047,17 +1050,17 @@
+@@ -1047,17 +1048,17 @@
#>+ 13
install-kde-icons:
@@ -8638,9 +8910,14 @@
#>+ 15
force-reedit:
-diff -Nru kdetoys-3.4.2.orig/kworldwatch/maps/depths/Makefile.in kdetoys-3.4.2/kworldwatch/maps/depths/Makefile.in
---- kdetoys-3.4.2.orig/kworldwatch/maps/depths/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kworldwatch/maps/depths/Makefile.in 2005-07-31 20:14:26.276293824 +0000
+--- kworldwatch/maps/depths/Makefile.in
++++ kworldwatch/maps/depths/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8672,9 +8949,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/kworldwatch/maps/flatworld/Makefile.in kdetoys-3.4.2/kworldwatch/maps/flatworld/Makefile.in
---- kdetoys-3.4.2.orig/kworldwatch/maps/flatworld/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kworldwatch/maps/flatworld/Makefile.in 2005-07-31 20:14:26.288292000 +0000
+--- kworldwatch/maps/flatworld/Makefile.in
++++ kworldwatch/maps/flatworld/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8706,9 +8988,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/kworldwatch/maps/Makefile.in kdetoys-3.4.2/kworldwatch/maps/Makefile.in
---- kdetoys-3.4.2.orig/kworldwatch/maps/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kworldwatch/maps/Makefile.in 2005-07-31 20:14:26.264295648 +0000
+--- kworldwatch/maps/Makefile.in
++++ kworldwatch/maps/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8740,9 +9027,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/kworldwatch/pics/Makefile.in kdetoys-3.4.2/kworldwatch/pics/Makefile.in
---- kdetoys-3.4.2.orig/kworldwatch/pics/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/kworldwatch/pics/Makefile.in 2005-07-31 20:14:26.300290176 +0000
+--- kworldwatch/pics/Makefile.in
++++ kworldwatch/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -170,6 +170,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8774,9 +9066,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdetoys-3.4.2.orig/Makefile.in kdetoys-3.4.2/Makefile.in
---- kdetoys-3.4.2.orig/Makefile.in 2005-07-20 20:21:10.000000000 +0000
-+++ kdetoys-3.4.2/Makefile.in 2005-07-31 20:14:25.178460720 +0000
+--- Makefile.in
++++ Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -193,6 +193,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8825,7 +9122,7 @@
#>+ 2
-KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 kdetoys.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
More information about the pkg-kde-commits
mailing list