[Pkg-kde-commits] rev 319 - in branches/kde-3.3.2/kdemultimedia/debian: . patches
Adeodato Sim??
dato-guest@haydn.debian.org
Thu, 16 Dec 2004 18:40:10 -0700
Author: dato-guest
Date: 2004-12-16 18:39:55 -0700 (Thu, 16 Dec 2004)
New Revision: 319
Added:
branches/kde-3.3.2/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff
branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff
Removed:
branches/kde-3.3.2/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff.uu
Modified:
branches/kde-3.3.2/kdemultimedia/debian/changelog
branches/kde-3.3.2/kdemultimedia/debian/control
branches/kde-3.3.2/kdemultimedia/debian/rules
Log:
- branch pull, automake1.9 adjustments, rules adjustments.
Modified: branches/kde-3.3.2/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/changelog 2004-12-17 00:31:04 UTC (rev 318)
+++ branches/kde-3.3.2/kdemultimedia/debian/changelog 2004-12-17 01:39:55 UTC (rev 319)
@@ -2,17 +2,20 @@
* New upstream release.
- * New man pages: [AS]
+ * KDE_3_3_BRANCH update.
+
+ * New man pages:
- kaboodle.1 by Karolina Lindqv. (Closes: #192567)
- krec.1 by Ryan Waye. (Closes: #258812)
[Forgot to include krec.manpages in previous upload.]
* debian/control:
- - make kaudiocreator recommend vorbis-tools. (Closes: #285236) [AS]
- - improve the akode package description. (Closes: #264624, #277822) [AS]
- - make akode Enhance: libarts1. [AS]
+ - make kaudiocreator recommend vorbis-tools. (Closes: #285236)
+ - improve the akode package description. (Closes: #264624, #277822)
+ - make akode Enhance: libarts1.
+ - removed build-dependency on automake1.9.
- -- Adeodato Simó <asp16@alu.ua.es> Wed, 15 Dec 2004 20:06:53 +0100
+ -- Adeodato Simó <asp16@alu.ua.es> Fri, 17 Dec 2004 02:37:53 +0100
kdemultimedia (4:3.3.1-1) unstable; urgency=low
Modified: branches/kde-3.3.2/kdemultimedia/debian/control
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/control 2004-12-17 00:31:04 UTC (rev 318)
+++ branches/kde-3.3.2/kdemultimedia/debian/control 2004-12-17 01:39:55 UTC (rev 319)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: automake1.9, cdparanoia, debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.1), libcdparanoia0-dev, libesd0-dev, libflac-dev, liboggflac-dev, libsamplerate0-dev, libspeex-dev, libtag1-dev (>> 1.3.1), libtiff4-dev, libtunepimp-bin, libtunepimp2-dev, libxaw7-dev, libxine-dev, sharutils, texinfo, xlibs-static-pic
-Standards-Version: 3.6.1.0
+Build-Depends: cdparanoia, debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.1), libcdparanoia0-dev, libesd0-dev, libflac-dev, liboggflac-dev, libsamplerate0-dev, libspeex-dev, libtag1-dev (>> 1.3.1), libtiff4-dev, libtunepimp-bin, libtunepimp2-dev, libxaw7-dev, libxine-dev, sharutils, texinfo, xlibs-static-pic
+Standards-Version: 3.6.1
Package: kdemultimedia
Section: kde
Added: branches/kde-3.3.2/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff 2004-12-17 00:31:04 UTC (rev 318)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff 2004-12-17 01:39:55 UTC (rev 319)
@@ -0,0 +1,334 @@
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/admin/acinclude.m4.in kdemultimedia/admin/acinclude.m4.in
+--- kdemultimedia-3.3.2/admin/acinclude.m4.in 2004-12-17 02:13:36.000000000 +0100
++++ kdemultimedia/admin/acinclude.m4.in 2004-12-09 22:22:14.000000000 +0100
+@@ -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 -x CVS -x CVS kdemultimedia-3.3.2/juk/juk.desktop kdemultimedia/juk/juk.desktop
+--- kdemultimedia-3.3.2/juk/juk.desktop 2004-12-17 02:13:37.000000000 +0100
++++ kdemultimedia/juk/juk.desktop 2004-12-11 12:21:29.000000000 +0100
+@@ -44,7 +44,7 @@
+ GenericName[sr@Latn]=Muzički plejer
+ GenericName[sv]=Musikspelare
+ GenericName[ta]=இசை இயக்கி
+-GenericName[tg]=Бозингари Мусиқӣ
++GenericName[tg]=Навозишкунандаи Мусиқӣ
+ GenericName[tr]=Müzik Yürütücüsü
+ GenericName[uk]=Програвач музики
+ GenericName[uz]=Мусиқа плейер
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kaboodle/kaboodle_component.desktop kdemultimedia/kaboodle/kaboodle_component.desktop
+--- kdemultimedia-3.3.2/kaboodle/kaboodle_component.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kaboodle/kaboodle_component.desktop 2004-12-11 12:21:30.000000000 +0100
+@@ -45,7 +45,7 @@
+ Name[sr@Latn]=Ugrađeni medija plejer
+ Name[sv]=Inbäddad mediaspelare
+ Name[ta]=உட்பொதிந்த ஊடக இயக்கி
+-Name[tg]=Бозингари Расонаи Дарунсохта
++Name[tg]=Медиа навозиши Дарунсохта
+ Name[tr]=Gömülü Medya Yürütücüsü
+ Name[uk]=Вмонтований програвач медіа
+ Name[ven]=Tshitambi tsha media tsha Embedded
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kaboodle/kaboodle.desktop kdemultimedia/kaboodle/kaboodle.desktop
+--- kdemultimedia-3.3.2/kaboodle/kaboodle.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kaboodle/kaboodle.desktop 2004-12-11 12:21:30.000000000 +0100
+@@ -54,7 +54,7 @@
+ GenericName[sr@Latn]=Medija plejer
+ GenericName[sv]=Mediaspelare
+ GenericName[ta]=ஊடக இயக்கி
+-GenericName[tg]=Бозингари Расона
++GenericName[tg]=Медиа навозиш
+ GenericName[th]=เครื่องเล่นแฟ้มสื่อ
+ GenericName[tr]=Medya Yürütücüsü
+ GenericName[uk]=Програвач медіа-матеріалів
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kaboodle/kaboodleengine.desktop kdemultimedia/kaboodle/kaboodleengine.desktop
+--- kdemultimedia-3.3.2/kaboodle/kaboodleengine.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kaboodle/kaboodleengine.desktop 2004-12-11 12:21:30.000000000 +0100
+@@ -37,7 +37,7 @@
+ Name[sr@Latn]=Ugrađeni motor medija plejera
+ Name[sv]=Inbäddad mediaspelarkomponent
+ Name[ta]=உட்பொதிந்த மீடியா பிளேயர் பொறி
+-Name[tg]=Бозингари Расонаи Дарунсохтаи Муҳаррик
++Name[tg]=Медиа навозиши Дарунсохтаи движок
+ Name[tr]=Gömülü Çoklu Ortam Çalıcısı
+ Name[uk]=Механізм вмонтованого програвача медіа
+ Name[ven]=Tshitambi tsha media tsho dzheniswaho
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kappfinder-data/djplay.desktop kdemultimedia/kappfinder-data/djplay.desktop
+--- kdemultimedia-3.3.2/kappfinder-data/djplay.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kappfinder-data/djplay.desktop 2004-12-11 12:21:30.000000000 +0100
+@@ -6,6 +6,7 @@
+ Name[pt_BR]=DjPlay
+ Name[sv]=DJplay
+ Name[ta]=டிஜேதொடங்கு
++Name[tg]=DJНавозиш
+ GenericName=DJ-Mixer and Player
+ GenericName[bg]=Диско миксер и плеър
+ GenericName[bs]=DJ-Mixer i Player
+@@ -35,7 +36,7 @@
+ GenericName[sr@Latn]=DJ-Mixer i plejer
+ GenericName[sv]=DJ-mixer och ljudspelare
+ GenericName[ta]=டிஜே-ஒன்றுசேர்த்து இயக்கும்
+-GenericName[tg]=DJ-Омехтакунак ва Бозингар
++GenericName[tg]=DJ-Омехтакунак ва Навозишкунанда
+ GenericName[tr]=DJ-Karıştırıcı ve Çalıcı
+ GenericName[uk]=Мікшер та програвач DJ
+ GenericName[zh_CN]=DJ-Mixer 和播放器
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kappfinder-data/freebirth.desktop kdemultimedia/kappfinder-data/freebirth.desktop
+--- kdemultimedia-3.3.2/kappfinder-data/freebirth.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kappfinder-data/freebirth.desktop 2004-12-11 12:21:30.000000000 +0100
+@@ -31,7 +31,7 @@
+ GenericName[sr@Latn]=Bubanj mašina
+ GenericName[sv]=Trummaskin
+ GenericName[ta]=டிரம் இயந்திரம்
+-GenericName[tg]=Мошинаи Таблак
++GenericName[tg]=Мошинаи нақора
+ GenericName[tr]=Davul Makinası
+ GenericName[uk]=Барабани
+ GenericName[zh_CN]=鼓机
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kappfinder-data/hydrogen.desktop kdemultimedia/kappfinder-data/hydrogen.desktop
+--- kdemultimedia-3.3.2/kappfinder-data/hydrogen.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kappfinder-data/hydrogen.desktop 2004-12-11 12:21:30.000000000 +0100
+@@ -33,7 +33,7 @@
+ GenericName[sr@Latn]=Bubanj mašina
+ GenericName[sv]=Trummaskin
+ GenericName[ta]=டிரம் இயந்திரம்
+-GenericName[tg]=Мошинаи Таблак
++GenericName[tg]=Мошинаи нақора
+ GenericName[tr]=Davul Makinası
+ GenericName[uk]=Барабани
+ GenericName[zh_CN]=鼓机
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kappfinder-data/mixxx.desktop kdemultimedia/kappfinder-data/mixxx.desktop
+--- kdemultimedia-3.3.2/kappfinder-data/mixxx.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kappfinder-data/mixxx.desktop 2004-12-11 12:21:30.000000000 +0100
+@@ -33,7 +33,7 @@
+ GenericName[sr@Latn]=DJ-Mixer i plejer
+ GenericName[sv]=DJ-mixer och ljudspelare
+ GenericName[ta]=டிஜே-ஒன்றுசேர்த்து இயக்கும்
+-GenericName[tg]=DJ-Омехтакунак ва Бозингар
++GenericName[tg]=DJ-Омехтакунак ва Навозишкунанда
+ GenericName[tr]=DJ-Karıştırıcı ve Çalıcı
+ GenericName[uk]=Мікшер та програвач DJ
+ GenericName[zh_CN]=DJ-Mixer 和播放器
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kaudiocreator/eventsrc kdemultimedia/kaudiocreator/eventsrc
+--- kdemultimedia-3.3.2/kaudiocreator/eventsrc 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kaudiocreator/eventsrc 2004-12-11 12:21:30.000000000 +0100
+@@ -4,7 +4,7 @@
+ Comment[bn]=কে-অডিও-ক্রিয়েটার
+ Comment[cy]=KCreuyddSain
+ Comment[sv]=Kaudiocreator
+-Comment[tg]=KОфарандаи Садо
++Comment[tg]=KЭҷодкунандаиАудио
+
+ [track ripped]
+ Name=Track Ripped
+@@ -105,7 +105,7 @@
+ Name[sr@Latn]=CD je izgrebovan
+ Name[sv]=Cd lagrad
+ Name[ta]=CD பிரிக்கப்பட்டது
+-Name[tg]=Диски Фишурда Канда шудааст
++Name[tg]=Диск Канда шудааст
+ Name[uk]=Витягнутий музичний КД
+ Name[uz]=Компакт-диск риппер
+ Name[zh_CN]=CD 已抓取
+@@ -139,7 +139,7 @@
+ Comment[sr@Latn]=Grebovanje CD-a je završeno
+ Comment[sv]=Cd:n har lagrats klart
+ Comment[ta]=CD பிரித்தல் முடிந்தது
+-Comment[tg]=Диски Фишурда кандашавиро ба охир расонд
++Comment[tg]=Диск кандашавиро ба охир расонд
+ Comment[tr]=CD çevirici sonlandırıcı
+ Comment[uk]=Витягування музичного КД завершено
+ Comment[zh_CN]=CD 抓取完成
+@@ -247,7 +247,7 @@
+ Name[sr@Latn]=CD je iskodiran
+ Name[sv]=Cd kodad
+ Name[ta]=CD மறையாக்கப்பட்டது
+-Name[tg]=Диски Фишурда Рамзӣ кунонида шудааст
++Name[tg]=Диск Рамзӣ кунонида шудааст
+ Name[tr]=CD Dönüştürücü
+ Name[uk]=Закодований музичний КД
+ Name[zh_CN]=CD 已编码
+@@ -281,7 +281,7 @@
+ Comment[sr@Latn]=Kodiranje CD-a je završeno
+ Comment[sv]=Cd:n har kodats klart
+ Comment[ta]=CD மறையாக்கத்தை முடித்தது.
+-Comment[tg]=Диски Фишурда рамзикунониро ба охир расонд
++Comment[tg]=Диск рамзикунониро ба охир расонд
+ Comment[tr]=CD çözümleyici sonlandırıldı
+ Comment[uk]=Кодування музичного КД закінчено
+ Comment[zh_CN]=CD 编码完成
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kaudiocreator/kaudiocreator.desktop kdemultimedia/kaudiocreator/kaudiocreator.desktop
+--- kdemultimedia-3.3.2/kaudiocreator/kaudiocreator.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kaudiocreator/kaudiocreator.desktop 2004-12-11 12:21:30.000000000 +0100
+@@ -58,7 +58,7 @@
+ Name[pt_BR]=Criação de Áudio
+ Name[sv]=Kaudiocreator
+ Name[ta]=கேஒலிஉருவாக்கி
+-Name[tg]=KОфарандаи Садо
++Name[tg]=KЭҷодкунандаиАудио
+ Name[ven]=MuitiwazwamibvumoyaK
+ GenericName=CD Ripper
+ GenericName[bg]=Кодиране на аудио дискове
+@@ -89,7 +89,7 @@
+ GenericName[sr@Latn]=CD grebač
+ GenericName[sv]=Cd-lagring
+ GenericName[ta]=சிடி ரிப்பர்
+-GenericName[tg]=Кандакунандаи Диски Фишурда
++GenericName[tg]=Кандакунандаи Диск
+ GenericName[tr]=CD Aktarıcı
+ GenericName[uk]=Витягувач музики з КД
+ GenericName[uz]=Компакт-диск риппер
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kmid/kmid.desktop kdemultimedia/kmid/kmid.desktop
+--- kdemultimedia-3.3.2/kmid/kmid.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kmid/kmid.desktop 2004-12-11 12:21:31.000000000 +0100
+@@ -55,7 +55,7 @@
+ GenericName[sr@Latn]=MIDI/karaoka plejer
+ GenericName[sv]=Midi/Karaoke-spelare
+ GenericName[ta]=ஒரு மிடி/கரயோக்கே இயக்கி
+-GenericName[tg]=Бозингари Midi/Karaoke
++GenericName[tg]=Навозиши Midi/Karaoke
+ GenericName[th]=โปรแกรมเล่นแฟ้มมิดี้
+ GenericName[tr]=Midi/Karaoke Yürütücüsü
+ GenericName[uk]=Програвач Midi/Karaoke
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/krec/kcm_krec.desktop kdemultimedia/krec/kcm_krec.desktop
+--- kdemultimedia-3.3.2/krec/kcm_krec.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/krec/kcm_krec.desktop 2004-12-11 12:21:31.000000000 +0100
+@@ -32,7 +32,7 @@
+ Name[sr]=Глобално
+ Name[sr@Latn]=Globalno
+ Name[ta]=உலகலாவிய
+-Name[tg]=Саросарӣ
++Name[tg]=Глобалӣ
+ Name[tr]=Evrensel
+ Name[uk]=Глобальні
+ Name[uz]=Глобал
+@@ -68,7 +68,7 @@
+ Comment[sr@Latn]=Opšte podešavanje
+ Comment[sv]=Global inställning
+ Comment[ta]=KRec இன் உலகலாவிய வடிவமைப்பு
+-Comment[tg]=Танзимотҳои Саросарӣ
++Comment[tg]=Танзимотҳои глобалӣ
+ Comment[tr]=Genel Yapılandırma
+ Comment[uk]=Глобальні налаштування
+ Comment[zh_CN]=全局配置
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/krec/kcm_krec_files.desktop kdemultimedia/krec/kcm_krec_files.desktop
+--- kdemultimedia-3.3.2/krec/kcm_krec_files.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/krec/kcm_krec_files.desktop 2004-12-11 12:21:31.000000000 +0100
+@@ -45,7 +45,7 @@
+ Name[sr@Latn]=Novi fajlovi
+ Name[sv]=Nya filer
+ Name[ta]=புது கோப்புகள்
+-Name[tg]=Файли Нав
++Name[tg]=Файлҳои Нав
+ Name[tr]=Yeni Dosyalar
+ Name[uk]=Нові файли
+ Name[uz]=Янги файллар
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/kscd/kscd.desktop kdemultimedia/kscd/kscd.desktop
+--- kdemultimedia-3.3.2/kscd/kscd.desktop 2004-12-17 02:13:38.000000000 +0100
++++ kdemultimedia/kscd/kscd.desktop 2004-12-11 12:21:31.000000000 +0100
+@@ -42,7 +42,7 @@
+ GenericName[sr@Latn]=CD plejer
+ GenericName[sv]=Cd-spelare
+ GenericName[ta]=குறுந்தகடு இயக்கி
+-GenericName[tg]=Бозингари Диски Фишурда
++GenericName[tg]=Бозингари Диски фишурда
+ GenericName[th]=โปรแกรมเล่นซีดี
+ GenericName[tr]=CD okuyucu
+ GenericName[uk]=Програвач КД
+@@ -61,7 +61,7 @@
+ Name[hi]=के-एससीडी
+ Name[sv]=Kscd
+ Name[ta]=Ksகுறுந்தகடு
+-Name[tg]=KsДиски Фишурда
++Name[tg]=KsДиски фишурда
+ Exec=kscd -caption "%c" %i %m
+ DocPath=kscd/index.html
+ Icon=kscd
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/mpeglib/lib/input/cdromAccess_Linux.cpp kdemultimedia/mpeglib/lib/input/cdromAccess_Linux.cpp
+--- kdemultimedia-3.3.2/mpeglib/lib/input/cdromAccess_Linux.cpp 2004-12-17 02:13:39.000000000 +0100
++++ kdemultimedia/mpeglib/lib/input/cdromAccess_Linux.cpp 2004-12-13 11:23:44.000000000 +0100
+@@ -10,12 +10,19 @@
+
+ */
+
++#ifdef __STRICT_ANSI__
++#undef __STRICT_ANSI__
++#define _ANSI_WAS_HERE_
++#endif
++#include <linux/types.h>
++#include <linux/cdrom.h>
++#ifdef _ANSI_WAS_HERE_
++#define __STRICT_ANSI__
++#endif
++#include <sys/ioctl.h>
+
+ #include "cdromToc.h"
+ #include "cdromRawAccess.h"
+-#include <asm/types.h>
+-#include <linux/cdrom.h>
+-#include <sys/ioctl.h>
+
+ #include <iostream>
+
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/noatun/modules/dcopiface/dcopiface.plugin kdemultimedia/noatun/modules/dcopiface/dcopiface.plugin
+--- kdemultimedia-3.3.2/noatun/modules/dcopiface/dcopiface.plugin 2004-12-17 02:13:39.000000000 +0100
++++ kdemultimedia/noatun/modules/dcopiface/dcopiface.plugin 2004-12-14 08:29:56.000000000 +0100
+@@ -9,6 +9,7 @@
+ Name[ar]=واجهة DCOP
+ Name[az]=DCOP Ara üzü
+ Name[bn]=ডিকপ ইন্টারফেস
++Name[br]=Etrefas DCOP
+ Name[ca]=Interfície DCOP
+ Name[cs]=Rozhraní DCOP
+ Name[cy]=Rhyngwyneb DCOP
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/noatun/modules/metatag/metatag.plugin kdemultimedia/noatun/modules/metatag/metatag.plugin
+--- kdemultimedia-3.3.2/noatun/modules/metatag/metatag.plugin 2004-12-17 02:13:40.000000000 +0100
++++ kdemultimedia/noatun/modules/metatag/metatag.plugin 2004-12-11 12:21:32.000000000 +0100
+@@ -45,7 +45,7 @@
+ Name[sr@Latn]=Čitač oznaka
+ Name[sv]=Taggläsare
+ Name[ta]=ஒட்டு வாசிப்பாளர்
+-Name[tg]=Хонандаи Борчасп
++Name[tg]=Хонандаи тег
+ Name[tr]=İm Okuyucu
+ Name[uk]=Читач етикеток
+ Name[ven]=Muvhali wa Tag
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/noatun/modules/splitplaylist/playlist.cpp kdemultimedia/noatun/modules/splitplaylist/playlist.cpp
+--- kdemultimedia-3.3.2/noatun/modules/splitplaylist/playlist.cpp 2004-12-17 02:13:40.000000000 +0100
++++ kdemultimedia/noatun/modules/splitplaylist/playlist.cpp 2004-12-01 17:02:48.000000000 +0100
+@@ -81,7 +81,8 @@
+
+ if (!nextItem) // don't set a null-item as current item
+ {
+- nextItem = static_cast<SafeListViewItem*>(static_cast<SafeListViewItem*>(getFirst().data()));
++ return 0;
++// nextItem = static_cast<SafeListViewItem*>(static_cast<SafeListViewItem*>(getFirst().data()));
+ }
+
+ PlaylistItem oldCurrent = currentItem;
+diff -Nrua -x CVS -x CVS kdemultimedia-3.3.2/noatun/noatun.desktop kdemultimedia/noatun/noatun.desktop
+--- kdemultimedia-3.3.2/noatun/noatun.desktop 2004-12-17 02:13:39.000000000 +0100
++++ kdemultimedia/noatun/noatun.desktop 2004-12-11 12:21:32.000000000 +0100
+@@ -52,7 +52,7 @@
+ GenericName[sr@Latn]=Medija plejer
+ GenericName[sv]=Mediaspelare
+ GenericName[ta]=ஊடக இயக்கி
+-GenericName[tg]=Бозингари Расона
++GenericName[tg]=Медиа навозиш
+ GenericName[th]=เครื่องเล่นแฟ้มสื่อ
+ GenericName[tr]=Medya Yürütücüsü
+ GenericName[uk]=Програвач медіа-матеріалів
Deleted: branches/kde-3.3.2/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff.uu
Added: branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff 2004-12-17 00:31:04 UTC (rev 318)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff 2004-12-17 01:39:55 UTC (rev 319)
@@ -0,0 +1,11 @@
+--- a/admin/detect-autoconf.sh
++++ b/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
Modified: branches/kde-3.3.2/kdemultimedia/debian/rules
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/rules 2004-12-17 00:31:04 UTC (rev 318)
+++ branches/kde-3.3.2/kdemultimedia/debian/rules 2004-12-17 01:39:55 UTC (rev 319)
@@ -73,6 +73,7 @@
# run configure with build tree $(objdir)
cd $(objdir) && \
../configure $(configkde) --enable-final \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--with-alsa --with-arts-alsa
touch configure-stamp
@@ -202,7 +203,7 @@
dh_fixperms
# dh_perl
# dh_python
- dh_makeshlibs -V
+ env DH_COMPAT=3 dh_makeshlibs -V
dh_installdeb
dh_shlibdeps -ldebian/akode/usr/lib:debian/artsbuilder/usr/lib:debian/kdemultimedia-kio-plugins/usr/lib:debian/kmid/usr/lib:debian/kscd/usr/lib:debian/libkcddb1/usr/lib:debian/mpeglib/usr/lib:debian/noatun/usr/lib
dh_gencontrol