rev 6885 - in kde-extras/kaffeine/trunk/debian: . patches

Fathi Boudra fboudra-guest at alioth.debian.org
Sat Jul 28 18:21:35 UTC 2007 

Author: fboudra-guest
Date: 2007-07-28 18:21:34 +0000 (Sat, 28 Jul 2007)
New Revision: 6885

Modified:
   kde-extras/kaffeine/trunk/debian/changelog
   kde-extras/kaffeine/trunk/debian/copyright
   kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides
   kde-extras/kaffeine/trunk/debian/patches/02_autotools_update.diff
   kde-extras/kaffeine/trunk/debian/patches/03_libtool_update.diff
   kde-extras/kaffeine/trunk/debian/patches/10_proper_am_init_automake_usage.diff
Log:
* Update kaffeine package

Modified: kde-extras/kaffeine/trunk/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog	2007-07-28 15:21:29 UTC (rev 6884)
+++ kde-extras/kaffeine/trunk/debian/changelog	2007-07-28 18:21:34 UTC (rev 6885)
@@ -1,3 +1,9 @@
+kaffeine (0.8.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fboudra at free.fr>  Sat, 28 Jul 2007 19:59:41 +0200
+
 kaffeine (0.8.4-6) unstable; urgency=low
 
   * Add patch to add AM_INIT_AUTOMAKE to configure.in.in. It fixes broken

Modified: kde-extras/kaffeine/trunk/debian/copyright
===================================================================
--- kde-extras/kaffeine/trunk/debian/copyright	2007-07-28 15:21:29 UTC (rev 6884)
+++ kde-extras/kaffeine/trunk/debian/copyright	2007-07-28 18:21:34 UTC (rev 6885)
@@ -3,9 +3,10 @@
 
 It was downloaded from http://kaffeine.sourceforge.net
 
-Copyright Holders:
-   (C) 2006 Christophe Thommeret <hftom at free.fr>
-   (C) 2004-2005 Jurgen Kofler <kaffeine at gmx.net>
+Upstream authors:
+   Christophe Thommeret <hftom at free.fr>
+   Christoph Pfister <christophpfister at gmail.com>
+   Jurgen Kofler <kaffeine at gmx.net>
 
 Copyright for kmultitabbar:
    (C) 2001-2003 Joseph Wenninger <jowenn at kde.org>

Modified: kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides	2007-07-28 15:21:29 UTC (rev 6884)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides	2007-07-28 18:21:34 UTC (rev 6885)
@@ -2,7 +2,7 @@
 # It isn't a library or a development package and no other packages uses
 # libkaffeinedvbplugin0, libkaffeineaudioencoder0 and libkaffeinepart.
 # kaffeine needs them and maybe a split can happen later.
-kaffeine: package-name-doesnt-match-sonames libkaffeinedvbplugin0 libkaffeinepart libkaffeineaudioencoder0
+kaffeine: package-name-doesnt-match-sonames libkaffeineaudioencoder0 libkaffeinedvbplugin0 libkaffeinepart
 kaffeine: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeinedvbplugin.so.0.0.1 usr/lib/libkaffeinedvbplugin.so
 kaffeine: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeineaudioencoder.so.0.0.1 usr/lib/libkaffeineaudioencoder.so
 kaffeine: shlib-missing-in-control-file libkaffeinepart.so for usr/lib/libkaffeinepart.so

Modified: kde-extras/kaffeine/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kaffeine/trunk/debian/patches/02_autotools_update.diff	2007-07-28 15:21:29 UTC (rev 6884)
+++ kde-extras/kaffeine/trunk/debian/patches/02_autotools_update.diff	2007-07-28 18:21:34 UTC (rev 6885)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp	2006-11-04 02:41:44.000000000 +0100
-+++ b/admin/depcomp	2007-07-18 18:18:19.000000000 +0200
+--- a/admin/depcomp	2007-06-03 15:55:41.000000000 +0200
++++ b/admin/depcomp	2007-07-28 20:01:05.000000000 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -100,8 +100,8 @@
        # one of the two compilations can be disabled.  We should prefer
        # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
 diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2006-11-04 02:41:45.000000000 +0100
-+++ b/admin/install-sh	2007-07-18 18:18:19.000000000 +0200
+--- a/admin/install-sh	2007-06-03 15:55:41.000000000 +0200
++++ b/admin/install-sh	2007-07-28 20:01:05.000000000 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -492,8 +492,8 @@
      # Now rename the file to the real destination.
      { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
 diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2006-11-04 02:41:45.000000000 +0100
-+++ b/admin/missing	2007-07-18 18:18:19.000000000 +0200
+--- a/admin/missing	2007-06-03 15:55:41.000000000 +0200
++++ b/admin/missing	2007-07-28 20:01:05.000000000 +0200
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -712,8 +712,8 @@
  	    firstarg=`echo "$firstarg" | sed s/h//`
  	    tar "$firstarg" "$@" && exit 0
 diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs	2006-11-04 02:41:45.000000000 +0100
-+++ b/admin/mkinstalldirs	2007-07-18 18:18:19.000000000 +0200
+--- a/admin/mkinstalldirs	2007-06-03 15:55:41.000000000 +0200
++++ b/admin/mkinstalldirs	2007-07-28 20:01:05.000000000 +0200
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy

Modified: kde-extras/kaffeine/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kaffeine/trunk/debian/patches/03_libtool_update.diff	2007-07-28 15:21:29 UTC (rev 6884)
+++ kde-extras/kaffeine/trunk/debian/patches/03_libtool_update.diff	2007-07-28 18:21:34 UTC (rev 6885)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-11-04 02:41:45.000000000 +0100
-+++ b/admin/libtool.m4.in	2007-07-18 18:18:19.000000000 +0200
+--- a/admin/libtool.m4.in	2007-06-03 15:55:41.000000000 +0200
++++ b/admin/libtool.m4.in	2007-07-28 20:01:05.000000000 +0200
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -844,7 +844,7 @@
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
--    if test -d /lib64; then
+-    if test -d /lib64 -a ! -h /lib64; then
 -      libsuff=64
 -    fi
 -  fi
@@ -4346,8 +4346,8 @@
  AC_MSG_RESULT([$SED])
  ])
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2006-11-04 02:41:44.000000000 +0100
-+++ b/admin/ltmain.sh	2007-07-18 18:18:19.000000000 +0200
+--- a/admin/ltmain.sh	2007-06-03 15:55:41.000000000 +0200
++++ b/admin/ltmain.sh	2007-07-28 20:01:05.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/kaffeine/trunk/debian/patches/10_proper_am_init_automake_usage.diff
===================================================================
--- kde-extras/kaffeine/trunk/debian/patches/10_proper_am_init_automake_usage.diff	2007-07-28 15:21:29 UTC (rev 6884)
+++ kde-extras/kaffeine/trunk/debian/patches/10_proper_am_init_automake_usage.diff	2007-07-28 18:21:34 UTC (rev 6885)
@@ -1,12 +1,12 @@
-diff -Nur kaffeine-0.8.4/configure.in.in kaffeine-0.8.4.new/configure.in.in
---- kaffeine-0.8.4/configure.in.in	2007-04-13 16:54:53.000000000 +0200
-+++ kaffeine-0.8.4.new/configure.in.in	2007-07-18 21:47:04.000000000 +0200
+diff -Nur kaffeine-0.8.5/configure.in.in kaffeine-0.8.5.new/configure.in.in
+--- kaffeine-0.8.5/configure.in.in	2007-04-13 16:54:53.000000000 +0200
++++ kaffeine-0.8.5.new/configure.in.in	2007-07-18 21:47:04.000000000 +0200
 @@ -1,4 +1,11 @@
  #MIN_CONFIG(3.3)
 +
 +KDE_ENABLE_HIDDEN_VISIBILITY
 +
-+AM_INIT_AUTOMAKE(kaffeine, 0.8.4)
++AM_INIT_AUTOMAKE(kaffeine, 0.8.5)
 +
 +AM_MAINTAINER_MODE
 +

More information about the pkg-kde-commits mailing list