rev 7595 - in kde-extras/kmplayer/trunk/debian: . patches

Fathi Boudra fboudra-guest at alioth.debian.org
Sat Oct 20 11:13:27 UTC 2007


Author: fboudra-guest
Date: 2007-10-20 11:13:27 +0000 (Sat, 20 Oct 2007)
New Revision: 7595

Removed:
   kde-extras/kmplayer/trunk/debian/patches/14_use_pkgconfig_for_nspr_cfg.diff
Modified:
   kde-extras/kmplayer/trunk/debian/changelog
   kde-extras/kmplayer/trunk/debian/control
   kde-extras/kmplayer/trunk/debian/patches/02_autotools_update.diff
   kde-extras/kmplayer/trunk/debian/patches/03_libtool_update.diff
   kde-extras/kmplayer/trunk/debian/patches/11_initial_preferences.diff
   kde-extras/kmplayer/trunk/debian/patches/12_remove_audio_mimetypes.diff
   kde-extras/kmplayer/trunk/debian/patches/series
Log:
  * New upstream release.
  * Update patches. Remove 14_use_pkgconfig_for_nspr_cfg patch.
  * Remove libnspr4-dev build dependency.


Modified: kde-extras/kmplayer/trunk/debian/changelog
===================================================================
--- kde-extras/kmplayer/trunk/debian/changelog	2007-10-20 11:07:01 UTC (rev 7594)
+++ kde-extras/kmplayer/trunk/debian/changelog	2007-10-20 11:13:27 UTC (rev 7595)
@@ -1,3 +1,11 @@
+kmplayer (1:0.10.0a-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update patches. Remove 14_use_pkgconfig_for_nspr_cfg patch.
+  * Remove libnspr4-dev build dependency.
+
+ -- Fathi Boudra <fboudra at free.fr>  Sat, 20 Oct 2007 12:09:01 +0200
+
 kmplayer (1:0.10.0-1) unstable; urgency=low
 
   * New upstream release. (Closes: #437982)

Modified: kde-extras/kmplayer/trunk/debian/control
===================================================================
--- kde-extras/kmplayer/trunk/debian/control	2007-10-20 11:07:01 UTC (rev 7594)
+++ kde-extras/kmplayer/trunk/debian/control	2007-10-20 11:13:27 UTC (rev 7595)
@@ -5,8 +5,7 @@
 Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, automake1.9, kdelibs4-dev,
  libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-qt-1-dev,
- libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libnspr4-dev, libxine-dev,
- libxv-dev
+ libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine-dev, libxv-dev
 Standards-Version: 3.7.2
 
 Package: kmplayer

Modified: kde-extras/kmplayer/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/02_autotools_update.diff	2007-10-20 11:07:01 UTC (rev 7594)
+++ kde-extras/kmplayer/trunk/debian/patches/02_autotools_update.diff	2007-10-20 11:13:27 UTC (rev 7595)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2007-09-29 00:20:22.000000000 +0200
-+++ b/admin/install-sh	2007-10-03 11:08:00.000000000 +0200
+--- a/admin/install-sh	2007-10-19 22:45:04.000000000 +0200
++++ b/admin/install-sh	2007-10-20 12:10:58.000000000 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -291,8 +291,8 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
 diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2007-09-29 00:20:22.000000000 +0200
-+++ b/admin/missing	2007-10-03 11:08:00.000000000 +0200
+--- a/admin/missing	2007-10-19 22:45:04.000000000 +0200
++++ b/admin/missing	2007-10-20 12:10:58.000000000 +0200
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.

Modified: kde-extras/kmplayer/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/03_libtool_update.diff	2007-10-20 11:07:01 UTC (rev 7594)
+++ kde-extras/kmplayer/trunk/debian/patches/03_libtool_update.diff	2007-10-20 11:13:27 UTC (rev 7595)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2007-09-29 00:20:22.000000000 +0200
-+++ b/admin/libtool.m4.in	2007-10-03 11:08:00.000000000 +0200
+--- a/admin/libtool.m4.in	2007-10-19 22:45:04.000000000 +0200
++++ b/admin/libtool.m4.in	2007-10-20 12:10:58.000000000 +0200
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -4346,8 +4346,8 @@
  AC_MSG_RESULT([$SED])
  ])
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2007-09-29 00:20:22.000000000 +0200
-+++ b/admin/ltmain.sh	2007-10-03 11:08:00.000000000 +0200
+--- a/admin/ltmain.sh	2007-10-19 22:45:04.000000000 +0200
++++ b/admin/ltmain.sh	2007-10-20 12:10:58.000000000 +0200
 @@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Modified: kde-extras/kmplayer/trunk/debian/patches/11_initial_preferences.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/11_initial_preferences.diff	2007-10-20 11:07:01 UTC (rev 7594)
+++ kde-extras/kmplayer/trunk/debian/patches/11_initial_preferences.diff	2007-10-20 11:13:27 UTC (rev 7595)
@@ -1,28 +1,25 @@
-diff -Nur kmplayer-0.9.4a/src/kmplayer.desktop kmplayer-0.9.4a.new/src/kmplayer.desktop
---- kmplayer-0.9.4a/src/kmplayer.desktop	2007-04-03 23:15:50.000000000 +0200
-+++ kmplayer-0.9.4a.new/src/kmplayer.desktop	2007-05-16 08:48:28.000000000 +0200
-@@ -51,7 +51,7 @@
+--- a/src/kmplayer.desktop
++++ b/src/kmplayer.desktop
+@@ -53,7 +53,7 @@
  Name[ta]=கேஎம்இயக்கி
  Name[xx]=xxKMPlayerxx
- MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
+ MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wvx;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
 -InitialPreference=7
 +InitialPreference=5
  Categories=Qt;KDE;AudioVideo;
  GenericName=Media Player
  GenericName[af]=Media Speler
-diff -Nur kmplayer-0.9.4a/src/kmplayer_koffice.desktop kmplayer-0.9.4a.new/src/kmplayer_koffice.desktop
---- kmplayer-0.9.4a/src/kmplayer_koffice.desktop	2007-04-03 23:15:50.000000000 +0200
-+++ kmplayer-0.9.4a.new/src/kmplayer_koffice.desktop	2007-05-16 08:49:17.000000000 +0200
+--- a/src/kmplayer_koffice.desktop
++++ b/src/kmplayer_koffice.desktop
 @@ -12,4 +12,4 @@
  Icon=kmplayer
  ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,Browser/View,KMediaPlayer/Player
  X-KDE-NativeMimeType=application/x-kmplayer
 -InitialPreference=9
 +InitialPreference=5
-diff -Nur kmplayer-0.9.4a/src/kmplayer_part.desktop kmplayer-0.9.4a.new/src/kmplayer_part.desktop
---- kmplayer-0.9.4a/src/kmplayer_part.desktop	2007-04-03 23:15:50.000000000 +0200
-+++ kmplayer-0.9.4a.new/src/kmplayer_part.desktop	2007-05-16 08:49:01.000000000 +0200
-@@ -81,4 +81,4 @@
+--- a/src/kmplayer_part.desktop
++++ b/src/kmplayer_part.desktop
+@@ -85,4 +85,4 @@
  Icon=kmplayer
  ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player
  X-KDE-BrowserView-PluginsInfo=kmplayer/pluginsinfo

Modified: kde-extras/kmplayer/trunk/debian/patches/12_remove_audio_mimetypes.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/12_remove_audio_mimetypes.diff	2007-10-20 11:07:01 UTC (rev 7594)
+++ kde-extras/kmplayer/trunk/debian/patches/12_remove_audio_mimetypes.diff	2007-10-20 11:13:27 UTC (rev 7595)
@@ -1,24 +1,22 @@
-diff -Nur kmplayer-0.9.4a/src/kmplayer.desktop kmplayer-0.9.4a.new/src/kmplayer.desktop
---- kmplayer-0.9.4a/src/kmplayer.desktop	2007-05-16 08:50:37.000000000 +0200
-+++ kmplayer-0.9.4a.new/src/kmplayer.desktop	2007-05-16 08:51:16.000000000 +0200
-@@ -50,7 +50,7 @@
+--- a/src/kmplayer.desktop
++++ b/src/kmplayer.desktop
+@@ -52,7 +52,7 @@
  Name[sv]=Kmplayer
  Name[ta]=கேஎம்இயக்கி
  Name[xx]=xxKMPlayerxx
--MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
-+MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
+-MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wvx;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
++MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wvx;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
  InitialPreference=5
  Categories=Qt;KDE;AudioVideo;
  GenericName=Media Player
-diff -Nur kmplayer-0.9.4a/src/kmplayer_part.desktop kmplayer-0.9.4a.new/src/kmplayer_part.desktop
---- kmplayer-0.9.4a/src/kmplayer_part.desktop	2007-05-16 08:50:37.000000000 +0200
-+++ kmplayer-0.9.4a.new/src/kmplayer_part.desktop	2007-05-16 08:52:28.000000000 +0200
-@@ -76,7 +76,7 @@
+--- a/src/kmplayer_part.desktop
++++ b/src/kmplayer_part.desktop
+@@ -80,7 +80,7 @@
  Comment[zh_TW]=視像播放程式 (可播放 QuickTime, XMovie, Windows Media 和 RealPlayer)
  X-KDE-Library=libkmplayerpart
  # Keep in sync with the audio types in kmplayer.desktop
--MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
-+MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
+-MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wvx;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
++MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wvx;video/x-ogm;video/x-theora;uri/mms;uri/pnm;uri/rtspt;uri/rtspu;
  Type=Service
  Icon=kmplayer
  ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player

Deleted: kde-extras/kmplayer/trunk/debian/patches/14_use_pkgconfig_for_nspr_cfg.diff

Modified: kde-extras/kmplayer/trunk/debian/patches/series
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/series	2007-10-20 11:07:01 UTC (rev 7594)
+++ kde-extras/kmplayer/trunk/debian/patches/series	2007-10-20 11:13:27 UTC (rev 7595)
@@ -6,4 +6,3 @@
 10_xine_default_player.diff
 11_initial_preferences.diff
 12_remove_audio_mimetypes.diff
-14_use_pkgconfig_for_nspr_cfg.diff




More information about the pkg-kde-commits mailing list