rev 4258 - in trunk/packages/kdeutils/debian: . patches

Christopher Martin chrsmrtn at costa.debian.org
Sun Jul 30 01:46:44 UTC 2006


Author: chrsmrtn
Date: 2006-07-30 01:46:43 +0000 (Sun, 30 Jul 2006)
New Revision: 4258

Added:
   trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r567761.diff
Removed:
   trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r548145.diff
Modified:
   trunk/packages/kdeutils/debian/changelog
   trunk/packages/kdeutils/debian/control
   trunk/packages/kdeutils/debian/rules
Log:
Ready for upload.


Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2006-07-30 01:45:41 UTC (rev 4257)
+++ trunk/packages/kdeutils/debian/changelog	2006-07-30 01:46:43 UTC (rev 4258)
@@ -1,15 +1,16 @@
-kdeutils (4:3.5.3-2) UNRELEASED; urgency=low
+kdeutils (4:3.5.4-1) unstable; urgency=low
 
-  * Next upload: do a branch pull. This should fix kwalletmanager bugs,
-    such as #372564. Post 3.5.3 regression #372258 not fixed in branch
-    as of June 17.
+  * New upstream release.
 
+  * KDE_3_5_BRANCH update (up to r567761).
+    + Fixes kwalletmanager crashes on logout. (Closes: #372564, #377001)
+
   +++ Changes by Christopher Martin:
 
   * Add kdf, kwikdisk, kfloppy, and kedit manpages, thanks to Holger Hartmann.
     (Closes: #370490, #370527, #370783)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  8 Jun 2006 17:20:18 -0400
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Jul 2006 21:01:40 -0400
 
 kdeutils (4:3.5.3-1) unstable; urgency=low
 

Modified: trunk/packages/kdeutils/debian/control
===================================================================
--- trunk/packages/kdeutils/debian/control	2006-07-30 01:45:41 UTC (rev 4257)
+++ trunk/packages/kdeutils/debian/control	2006-07-30 01:46:43 UTC (rev 4258)
@@ -3,7 +3,7 @@
 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 debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.3), kdebase-dev (>= 4:3.5.3), libkonq4-dev (>= 4:3.5.3), libgmp3-dev, libsnmp9-dev, libxpm-dev, python-dev, xmms-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.4), kdebase-dev (>= 4:3.5.4), libkonq4-dev (>= 4:3.5.4), libgmp3-dev, libsnmp9-dev, libxpm-dev, python-dev, xmms-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
 Standards-Version: 3.7.2
 
@@ -52,7 +52,7 @@
 Package: kdeutils-dev
 Section: utils
 Architecture: any
-Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.3)
+Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.4)
 Description: development files for the KDE utilities module
  This package contains development files needed to compile kdeutils
  applications.

Deleted: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r548145.diff

Added: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r567761.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r567761.diff	2006-07-30 01:45:41 UTC (rev 4257)
+++ trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r567761.diff	2006-07-30 01:46:43 UTC (rev 4258)
@@ -0,0 +1,192 @@
+#DPATCHLEVEL=0
+--- charselectapplet/kcharselectapplet.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ charselectapplet/kcharselectapplet.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -70,6 +70,7 @@
+ Comment[nb]=Hent inn fremmede tegn og spesialtegn til utklippstavla
+ Comment[nds]=Frömdspraak- un Sünnertekens na de Twischenaflaag koperen
+ Comment[nl]=Buitenlandse en speciale tekens van klembord halen
++Comment[nn]=Kopier spesialteikn og bokstavar frå framande språk til utklippstavla
+ Comment[pl]=Wstawia znaki specjalne albo diakrytyczne do schowka
+ Comment[pt]=Escolher caracteres especiais e estrangeiros para a área de transferência
+ Comment[pt_BR]=Lista de caracteres especiais para a área de transferência
+--- kfloppy/floppy_format.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ kfloppy/floppy_format.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -23,6 +23,7 @@
+ Name[lt]=Formatas
+ Name[nds]=Formateren
+ Name[nl]=Formatteren
++Name[nn]=Formater
+ Name[pa]=ਫਾਰਮਿਟ
+ Name[pl]=Formatuj
+ Name[pt]=Formatar
+--- kgpg/encryptfolder.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ kgpg/encryptfolder.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -27,6 +27,7 @@
+ Name[nb]=Arkiver og krypter mappe
+ Name[nds]=Ornern komprimeren un verslöteln
+ Name[nl]=Map archiveren en versleutelen
++Name[nn]=Arkiver og krypter mappe
+ Name[pa]=ਆਕੀਵੀ & ਇੰਕਰਿਪਟ ਫੋਲਡਰ
+ Name[pl]=Zarchiwizuj i zaszyfruj katalog
+ Name[pt]=Arquivar e Cifrar a Pasta
+--- ksim/ksim.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ ksim/ksim.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -89,6 +89,7 @@
+ Comment[nb]=Overvåkning av K systeminformasjon (GKrellM stil)
+ Comment[nds]=Kieker för Systeeminformatschonen (GKrellM-Stil)
+ Comment[nl]=Systeeminformatiemonitor (gKrellM-stijl)
++Comment[nn]=Systeminfovisar (GKrellM-stil)
+ Comment[pl]=Informacja o stanie systemu (w stylu GKrellM)
+ Comment[pt]=Monitor de Informações do Sistema (estilo GKrellM)
+ Comment[pt_BR]=Monitor de Informações do Sistema (estilo GKrellM)
+--- kwallet/kwalleteditor.cpp	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ kwallet/kwalleteditor.cpp	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -1104,7 +1104,17 @@
+ 	KURL url = KFileDialog::getSaveURL(QString::null, "*.xml", this);
+ 
+ 	if (!url.isEmpty()) {
+-		KIO::NetAccess::file_copy(tf.name(), url, 0600, false, false, this);
++		bool ok = true;
++		if (KIO::NetAccess::exists(url, false, this)) {
++			int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").arg(url.prettyURL()), i18n("Overwrite"));
++			if (rc == KMessageBox::Cancel) {
++				ok = false;
++			}
++		}
++		if (ok) {
++			KURL tfURL; tfURL.setPath(tf.name());
++			KIO::NetAccess::file_copy(tfURL, url, 0600, true, false, this);
++		}
+ 	}
+ }
+ 
+@@ -1119,10 +1129,11 @@
+ 	if (!url.isEmpty()) {
+ 		// Sync() kwalletd
+ 		if (_nonLocal) {
+-			KIO::NetAccess::file_copy(_walletName, url, 0600, false, false, this);
++			KIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this);
+ 		} else {
+ 			QString path = KGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl";
+-			KIO::NetAccess::file_copy(path, url, 0600, false, false, this);
++			KURL destURL; destURL.setPath(path);
++			KIO::NetAccess::file_copy(destURL, url, 0600, false, false, this);
+ 		}
+ 	}
+ }
+--- kwallet/konfigurator/kwalletconfig.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ kwallet/konfigurator/kwalletconfig.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -72,7 +72,7 @@
+ Comment[km]=ការកំណត់​រចនា​សម្ព័ន្ធ​កាបូប KDE Wallet
+ Comment[lt]=KDE slaptažodinių konfigūravimas
+ Comment[mk]=Конфигурација на паричник во KDE
+-Comment[nb]=Konfigurasjon av KDE Wallet
++Comment[nb]=Oppsett av KDE Wallet
+ Comment[nds]=KDE-Knipp instellen
+ Comment[nl]=KDE portefeuille-instellingen
+ Comment[nn]=Oppsett av KDE Wallet
+--- kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -30,7 +30,7 @@
+ Name[ja]=Sony Vaio ラップトップ
+ Name[km]=កុំព្យូទ័រ​យួរដៃ Sony Vaio
+ Name[mk]=Лаптоп Sony Vaio
+-Name[nb]=Tilleggsprogram for Sony Vaio
++Name[nb]=Programtillegg for Sony Vaio
+ Name[nds]=Sony Vaio-Klappreekner
+ Name[nn]=Sony Vaio-bærbar
+ Name[pa]=Sony Vaio ਲੈਪਟਾਪ
+--- kmilo/kmilo_kvaio/kmilo_kvaio.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ kmilo/kmilo_kvaio/kmilo_kvaio.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -27,7 +27,7 @@
+ Name[km]=កម្មវិធី​ជំនួយ Sony Vaio
+ Name[lt]=Sony Vaio priedas
+ Name[mk]=Приклучок за Sony Vaio
+-Name[nb]=Tilleggsprogram for Sony Vaio
++Name[nb]=Programtillegg for Sony Vaio
+ Name[nds]=Sony Vaio-Moduul
+ Name[nl]=Sony Vaio-plugin
+ Name[nn]=Tilleggsprogram for Sony Vaio
+--- kmilo/powerbook/kmilo_powerbook.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ kmilo/powerbook/kmilo_powerbook.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -26,7 +26,7 @@
+ Name[km]=កម្មវិធី​ជំនួយ Apple (R) PowerBook (R)
+ Name[lt]=Apple (R) PowerBook (R) priedas
+ Name[mk]=Приклучок за Apple (R) PowerBook (R)
+-Name[nb]=Tilleggsprogram for Apple (R) PowerBook (R)
++Name[nb]=Programtillegg for Apple (R) PowerBook (R)
+ Name[nds]=Apple(R) PowerBook(R)-Moduul
+ Name[nl]=Apple (R) PowerBook (R)-Plugin
+ Name[nn]=Tilleggsprogram for Apple ® PowerBook ®
+@@ -72,7 +72,7 @@
+ Comment[km]=កម្មវិធី​ជំនួយនេះបើក​ការគាំទ្រ​សម្រាប់​គ្រាប់ចុច​ពិសេសនៅ​លើកុំព្យូទ័រ​យួរដៃ Apple (R) PowerBook (R) តាម​រយៈ pbbuttonsd ។
+ Comment[lt]=Šis priedas įgalina specialiųjų raktų Apple (R) PowerBook (R) nešiojamuose kompiuteriuose palaikymą per pbbuttonsd.
+ Comment[mk]=Овој приклучок дава поддршка за специјалните копчиња на лаптопите Apple (R) PowerBook (R) преку pbbuttonsd.
+-Comment[nb]=Dette tilleggsprogrammet muliggjør støtte for spesielle taster på Apple (R) PowerBook (R) bærbare maskiner via pbbuttonsd.
++Comment[nb]=Dette programtilleggmet muliggjør støtte for spesielle taster på Apple (R) PowerBook (R) bærbare maskiner via pbbuttonsd.
+ Comment[nds]=Dit Moduul maakt de Sünnertasten-Ünnerstütten för PowerBook(R)-Klappreekners vun Apple(R) via pbbuttonsd an.
+ Comment[nl]=Maakt het mogelijk speciale toetsen op Apple (R) PowerBook (R) laptops te gebruiken via pbbuttonsd.
+ Comment[nn]=Dette programtillegget gjer at du kan bruka spesialtastane på Apple® PowerBook® gjennom pbbuttonsd.
+--- superkaramba/src/karamba.cpp	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ superkaramba/src/karamba.cpp	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -1912,7 +1912,7 @@
+     if (pythonIface && pythonIface->isExtensionLoaded())
+     {
+       const QPoint &p = event->pos();
+-      pythonIface->itemDropped(this, text.ascii(), p.x(), p.y());
++      pythonIface->itemDropped(this, text, p.x(), p.y());
+     }
+   }
+ }
+--- superkaramba/src/karamba_python.cpp	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ superkaramba/src/karamba_python.cpp	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -595,7 +595,7 @@
+ 
+ bool KarambaPython::itemDropped(karamba* k, QString text, int x, int y)
+ {
+-  PyObject* pArgs = Py_BuildValue((char*)"(lsii)", k, text.ascii(), x, y);
++  PyObject* pArgs = Py_BuildValue((char*)"(lOii)", k, QString2PyString(text), x, y);
+   return callObject("itemDropped", pArgs);
+ }
+ 
+--- superkaramba/src/superkaramba.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ superkaramba/src/superkaramba.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -29,6 +29,7 @@
+ Comment[nb]=Et program for kule skrivebordseffekter.
+ Comment[nds]=En Ümgeven för wunnerbore Schriefdischeffekten.
+ Comment[nl]=Een programma voor bureaubladverfraaiing.
++Comment[nn]=Eit rammeverk for lekre skrivebord.
+ Comment[pl]=Narzędzie do tworzenia efektownego pulpitu.
+ Comment[pt]=Um motor para embelezar o ecrã.
+ Comment[pt_BR]=Mecanismo para recursos gráficos interessantes.
+@@ -63,6 +64,7 @@
+ GenericName[nb]=Skjermelement for skrivebordet
+ GenericName[nds]=Schriefdisch-Verwiedern
+ GenericName[nl]=Bureaubladprogramma's
++GenericName[nn]=Skrivebordsprogram
+ GenericName[pa]=ਵੇਹੜਾ ਸਹਾਇਕ
+ GenericName[pl]=Aplety pulpitu
+ GenericName[pt]=Elementos do Ecrã
+--- superkaramba/mimetypes/x-superkaramba.desktop	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ superkaramba/mimetypes/x-superkaramba.desktop	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -24,6 +24,7 @@
+ Comment[nb]=Temafil for Superkaramba
+ Comment[nds]=Muster-Datei vun Superkaramba
+ Comment[nl]=Thema-bestand van Superkaramba
++Comment[nn]=Superkaramba-temafil
+ Comment[pa]=Superkaramba ਸਰੂਪ ਫਾਇਲ
+ Comment[pl]=Plik motywu Superkaramby
+ Comment[pt]=Ficheiro de Tema do Superkaramba
+--- superkaramba/examples/template.py	(.../tags/KDE/3.5.4/kdeutils)	(revision 567761)
++++ superkaramba/examples/template.py	(.../branches/KDE/3.5/kdeutils)	(revision 567761)
+@@ -86,7 +86,9 @@
+ # NOTE you have to call acceptDrops() before your widget will accept drops.
+ #  widget = reference to your theme
+ #  dropText = the text of the dropped item (probably a URL to it's location in KDE)
+-def itemDropped(widget, dropText):
++#  x = the x position on the theme relative to the upper left corner
++#  y = the y position on the theme relative to the upper left corner
++def itemDropped(widget, dropText, x, y):
+     pass
+ 
+ 

Modified: trunk/packages/kdeutils/debian/rules
===================================================================
--- trunk/packages/kdeutils/debian/rules	2006-07-30 01:45:41 UTC (rev 4257)
+++ trunk/packages/kdeutils/debian/rules	2006-07-30 01:46:43 UTC (rev 4258)
@@ -13,11 +13,11 @@
 
 PACKAGES_WITH_LIBS := khexedit klaptopdaemon kmilo kregexpeditor ksim
 
-DEB_DH_MAKESHLIBS_ARGS_khexedit		:= -V'khexedit (>= 4:3.5.3-1)'
-DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon	:= -V'klaptopdaemon (>= 4:3.5.3-1)'
-DEB_DH_MAKESHLIBS_ARGS_kmilo		:= -V'kmilo (>= 4:3.5.3-1)'
-DEB_DH_MAKESHLIBS_ARGS_kregexpeditor	:= -V'kregexpeditor (>= 4:3.5.3-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksim		:= -V'ksim (>= 4:3.5.3-1)'
+DEB_DH_MAKESHLIBS_ARGS_khexedit		:= -V'khexedit (>= 4:3.5.4-1)'
+DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon	:= -V'klaptopdaemon (>= 4:3.5.4-1)'
+DEB_DH_MAKESHLIBS_ARGS_kmilo		:= -V'kmilo (>= 4:3.5.4-1)'
+DEB_DH_MAKESHLIBS_ARGS_kregexpeditor	:= -V'kregexpeditor (>= 4:3.5.4-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksim		:= -V'ksim (>= 4:3.5.4-1)'
 
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))




More information about the pkg-kde-commits mailing list