rev 3958 - in trunk/packages/kdemultimedia/debian: . patches

Christopher Martin chrsmrtn at costa.debian.org
Sat Jun 17 18:29:57 UTC 2006


Author: chrsmrtn
Date: 2006-06-17 18:29:56 +0000 (Sat, 17 Jun 2006)
New Revision: 3958

Added:
   trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r552408.diff
Modified:
   trunk/packages/kdemultimedia/debian/changelog
Log:
Let's get this uploaded. Branch pull, and changelog update
(list Pierre's change first, since it's far more important).


Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2006-06-17 18:23:46 UTC (rev 3957)
+++ trunk/packages/kdemultimedia/debian/changelog	2006-06-17 18:29:56 UTC (rev 3958)
@@ -1,16 +1,18 @@
-kdemultimedia (4:3.5.3-2) UNRELEASED; urgency=low
+kdemultimedia (4:3.5.3-2) unstable; urgency=low
 
+  * KDE_3_5_BRANCH update (up to r552408).
+
+  +++ Changes by Pierre Habouzit:
+
+  * Add a missing Replaces: akode for Sarge upgrades. (Closes: #372791)
+
   +++ Changes by Christopher Martin:
 
   * Add a noatun manpage, thanks to Holger Hartmann.
     (Closes: #220685, #348084)
 
-  +++ Changes by Pierre Habouzit:
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Jun 2006 14:27:25 -0400
 
-  * Add a missing Replace akode for sarge upgrades. (Closes: #372791).
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun,  4 Jun 2006 09:39:11 -0400
-
 kdemultimedia (4:3.5.3-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r552408.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r552408.diff	2006-06-17 18:23:46 UTC (rev 3957)
+++ trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r552408.diff	2006-06-17 18:29:56 UTC (rev 3958)
@@ -0,0 +1,241 @@
+#DPATCHLEVEL=0
+--- kscd/cddaslave.c	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kscd/cddaslave.c	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -418,7 +418,10 @@
+ 	 * superuser access.
+ 	 */
+ 	nice(-14);
++	setgid(getgid());
+ 	setuid(getuid());
++	if (getuid() != geteuid())
++		return 255;
+ 
+ 	FD_ZERO(&dummyfd);
+ 	FD_ZERO(&readfd);
+--- kscd/libwm/cddaslave.c	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kscd/libwm/cddaslave.c	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -489,7 +489,10 @@
+    * superuser access.
+    */
+   nice(-14);
++  setgid(getgid());
+   setuid(getuid());
++  if (geteuid() != getuid())
++    return 255;
+ 
+   FD_ZERO(&dummyfd);
+   FD_ZERO(&readfd);
+--- kappfinder-data/jamin.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kappfinder-data/jamin.desktop	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -33,6 +33,7 @@
+ GenericName[pt]=Ferramenta de Masterização do Jack
+ GenericName[pt_BR]=Ferramenta de masterização Jack 
+ GenericName[ru]=Утилита мастеринга Jack
++GenericName[sk]=Jack Mastering nástroj
+ GenericName[sl]=Orodje za Jack Mastering
+ GenericName[sr]=Jack-ов алат за мастеровање
+ GenericName[sr at Latn]=Jack-ov alat za masterovanje
+--- kappfinder-data/kde-multimedia-music.directory	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kappfinder-data/kde-multimedia-music.directory	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -26,6 +26,7 @@
+ Name[pl]=Muzyka
+ Name[pt]=Música
+ Name[pt_BR]=Música
++Name[sk]=Hudba
+ Name[sl]=Glasba
+ Name[sr]=Музика
+ Name[sr at Latn]=Muzika
+@@ -62,6 +63,7 @@
+ GenericName[pt]=Áudio Profissional
+ GenericName[pt_BR]=Áudio Profissional
+ GenericName[ru]=Профессиональное аудио
++GenericName[sk]=Profesionálne audio
+ GenericName[sl]=Profesionalni zvok
+ GenericName[sr]=Професионални звук
+ GenericName[sr at Latn]=Profesionalni zvuk
+--- akode_artsplugin/akodePlayObject_impl.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ akode_artsplugin/akodePlayObject_impl.cpp	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -82,6 +82,8 @@
+ 
+ akodePlayObject_impl::~akodePlayObject_impl()
+ {
++    delete m_packetQueue;
++
+     unload();
+ }
+ 
+@@ -219,10 +221,9 @@
+         delete bufferedDecoder;
+         bufferedDecoder = 0;
+     }
+-#else
+-    delete frameDecoder
++#endif
++    delete frameDecoder;
+     frameDecoder = 0;
+-#endif
+     decoder = 0;
+     if (buffer != inBuffer)
+         delete inBuffer;
+@@ -301,7 +302,7 @@
+ {
+     arts_debug("akode: readFrame");
+ 
+-    if (!buffer || !decoder) return false;
++    if (!inBuffer || !decoder) return false;
+     if (m_bytebuffer) processQueue();
+     if(!decoder->readFrame(inBuffer)) {
+         if (decoder->eof()) {
+--- kaudiocreator/audiocd_extract.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kaudiocreator/audiocd_extract.desktop	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -26,11 +26,13 @@
+ Name[lt]=Nuskaityti ir įkoduoti audio takelius
+ Name[nb]=Pakk ut og dekod lydfiler
+ Name[nl]=Audio-tracks rippen en coderen
++Name[nn]=Hent og kod lydspor
+ Name[pa]=ਆਡੀਓ ਟਰੈਕ ਖੋਲੋ ਅਤੇ ਇੰਕੋਡ
+ Name[pl]=Odzyskaj i przekoduj ścieżki audio
+ Name[pt]=Extracção e Codificação de Faixas de Áudio
+ Name[pt_BR]=Extracção e Codificação de Faixas de Áudio
+ Name[ru]=Извлечь и закодировать дорожки
++Name[sk]=Vytiahnuť a zakódovať audio stopy
+ Name[sl]=Zajemite in zakodirajte glasbo
+ Name[sr]=Издваја и кодира аудио стазе
+ Name[sr at Latn]=Izdvaja i kodira audio staze
+--- kaudiocreator/ripper.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kaudiocreator/ripper.cpp	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -53,11 +53,10 @@
+ 	for( it = jobs.begin(); it != jobs.end(); ++it ){
+ 		 KIO::Job* ioJob = it.key();
+ 		Job *job = it.data();
+-		if(job){
+-			delete job;
+-		}
++		delete job;
++	
+ 		if(ioJob){
+-			KIO::FileCopyJob *copyJob = dynamic_cast<KIO::FileCopyJob*> (ioJob);
++			KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob*> (ioJob);
+ 			disconnect(copyJob, SIGNAL(result(KIO::Job*)), this, SLOT(copyJobResult(KIO::Job*)));
+ 			disconnect(copyJob, SIGNAL(percent ( KIO::Job *, unsigned long)), this, SLOT(updateProgress ( KIO::Job *, unsigned long)));
+ 			QString fileDestination = (copyJob->destURL()).path();
+@@ -221,9 +220,10 @@
+ 		file.remove();
+ 		emit updateProgress(newJob->id, -1);
+ 		delete newJob;
++		newJob = 0;
+ 	}
+ 
+-	if(newJob->lastSongInAlbum){
++	if(newJob && newJob->lastSongInAlbum){
+ 		if(Prefs::autoEjectAfterRip()){
+ 			// Don't eject device if a pending job has that device
+ 			Job *job = pendingJobs.first();
+--- kaudiocreator/eventsrc	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kaudiocreator/eventsrc	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -33,11 +33,13 @@
+ Name[mk]=Сите задачи се завршени
+ Name[nb]=Alle jobbene er utført
+ Name[nl]=Alle taken voltooid
++Name[nn]=Alle jobbar ferdige
+ Name[pa]=ਸਭ ਕੰਮ ਖਤਮ
+ Name[pl]=Wszystkie zadania ukończone
+ Name[pt]=Todos os trabalhos terminados
+ Name[pt_BR]=Todos os trabalhos terminados
+ Name[ru]=Все задания выполнены
++Name[sk]=Všetky úlohy skončili
+ Name[sl]=Vsa opravila zaključena
+ Name[sr]=Сви послови завршени
+ Name[sr at Latn]=Svi poslovi završeni
+@@ -69,11 +71,13 @@
+ Comment[mk]=Сите задачи во редицата завршија
+ Comment[nb]=Alle jobbene i køen er utført
+ Comment[nl]=Alle taken in de wachtrij zijn voltooid
++Comment[nn]=Alle jobbane i køen er ferdige
+ Comment[pa]=ਕਤਾਰ ਵਿੱਚ ਸਭ ਕੰਮਾਂ ਨੂੰ ਖਤਮ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ
+ Comment[pl]=Wszystkie zadania z kolejko zostały ukończone
+ Comment[pt]=Todos os trabalhos em fila foram terminados
+ Comment[pt_BR]=Todos os trabalhos em fila foram terminados
+ Comment[ru]=Все задания очереди завершены
++Comment[sk]=Všetky úlohy v rade skončili
+ Comment[sl]=Vsa opravila iz vrste so bila zaključena
+ Comment[sr]=Сви послови из редоследа су завршени
+ Comment[sr at Latn]=Svi poslovi iz redosleda su završeni
+--- libkcddb/kcmcddb/cddbconfigwidget.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ libkcddb/kcmcddb/cddbconfigwidget.cpp	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -76,7 +76,7 @@
+       i18n("Select one of these mirrors"), keys.keys(),
+       QStringList(), false, &ok, this);
+ 
+-    if (&ok && result.count() == 1)
++    if (ok && result.count() == 1)
+     {
+       KCDDB::Mirror m = keys[*(result.begin())];
+ 
+--- kmix/kmixapplet.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kmix/kmixapplet.desktop	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -72,10 +72,12 @@
+ Comment[lt]=Garso lygio ir kanalų mikserio valdymas
+ Comment[nb]=Miksekontroll for lydnivået og lydkanalene
+ Comment[nl]=Bedieningspaneel voor het regelen van het volume en de geluidskanalen
++Comment[nn]=Lydstyrke- og kanalmiksarkontroll
+ Comment[pl]=Sterowanie mikserem dźwięku i kanałów
+ Comment[pt]=Controlo de volume e canais de som
+ Comment[pt_BR]=Controlo de volume e canais de som
+ Comment[ru]=Управление громкостью и звуковыми каналами
++Comment[sk]=Riadenie hlasitosti a zvukového kanálu mixéru
+ Comment[sl]=Nadzor glasnosti in mešalnik zvočnih kanalov
+ Comment[sr]=Контрола јачине и миксета звучних канала
+ Comment[sr at Latn]=Kontrola jačine i mikseta zvučnih kanala
+--- arts/tools/artscontrolapplet.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ arts/tools/artscontrolapplet.desktop	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -26,10 +26,12 @@
+ Comment[mk]=Го контролира звучниот сервер aRts
+ Comment[nb]=Styr lydtjeneren aRts
+ Comment[nl]=Bedien de aRts geluidsserver
++Comment[nn]=Styr aRts-lydtenaren
+ Comment[pl]=Sterowanie serwerem dźwięku aRts
+ Comment[pt]=Controlar o servidor de som aRts
+ Comment[pt_BR]=Controlar o servidor de som aRts
+ Comment[ru]=Управление звуковым сервером aRts
++Comment[sk]=Ovládanie zvukového servera aRts
+ Comment[sl]=Nadzorujte zvočni strežnik aRts
+ Comment[sr]=Контролише aRts звучни сервер
+ Comment[sr at Latn]=Kontroliše aRts zvučni server
+--- kfile-plugins/theora/kfile_theora.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kfile-plugins/theora/kfile_theora.desktop	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -31,6 +31,7 @@
+ Name[pt]=Informação do theora
+ Name[pt_BR]=Informação sobre theora
+ Name[ru]=Сведения о theora
++Name[sk]=theora info
+ Name[sl]=Podatki o Theora
+ Name[sr]=Информације о theora-и
+ Name[sr at Latn]=Informacije o theora-i
+--- kfile-plugins/mpeg/kfile_mpeg.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kfile-plugins/mpeg/kfile_mpeg.desktop	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -26,6 +26,7 @@
+ Name[lt]=MPEG informacija
+ Name[nb]=MPEG informasjon
+ Name[nl]=MPEG-info
++Name[nn]=MPEG-info
+ Name[pa]=MPEG ਜਾਣਕਾਰੀ
+ Name[pl]=Informacja o pliku MPEG
+ Name[pt]=Informação do MPEG
+--- kioslave/audiocd/audiocd.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(revision 552408)
++++ kioslave/audiocd/audiocd.cpp	(.../branches/KDE/3.5/kdemultimedia)	(revision 552408)
+@@ -213,7 +213,13 @@
+ 		return 0;
+ 
+ 	// Update our knowledge of the disc
+-	d->cd.setDevice(drive->ioctl_device_name, 50, false);
++
++#if defined(__linux__)
++        d->cd.setDevice(drive->ioctl_device_name, 50, false);
++#else
++        d->cd.setDevice(drive->cdda_device_name, 50, false);
++#endif
++
+ #if 0
+ 	// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
+ 	// support for non-SCSI devices. Although it finds ATA cdroms just




More information about the pkg-kde-commits mailing list