[pkg-kde-commits] rev 2927 - people/dato/packages/trunk/amarok/debian/patches

[Adeodato Simó]

Author: adeodato
Date: 2006-01-17 20:43:00 +0000 (Tue, 17 Jan 2006)
New Revision: 2927

Modified:
   people/dato/packages/trunk/amarok/debian/patches/am_maintainer_mode.patch
   people/dato/packages/trunk/amarok/debian/patches/disable-final.diff
   people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch
   people/dato/packages/trunk/amarok/debian/patches/gmo_files_at_build_time.patch
   people/dato/packages/trunk/amarok/debian/patches/no_libadd_in_convenience_libs.diff
   people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
Log:
Move patches to -p0.

Modified: people/dato/packages/trunk/amarok/debian/patches/am_maintainer_mode.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/am_maintainer_mode.patch	2006-01-17 20:40:40 UTC (rev 2926)
+++ people/dato/packages/trunk/amarok/debian/patches/am_maintainer_mode.patch	2006-01-17 20:43:00 UTC (rev 2927)
@@ -1,5 +1,5 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
+--- admin/configure.in.min
++++ admin/configure.in.min
 @@ -38,6 +38,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
  AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs

Modified: people/dato/packages/trunk/amarok/debian/patches/disable-final.diff
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/disable-final.diff	2006-01-17 20:40:40 UTC (rev 2926)
+++ people/dato/packages/trunk/amarok/debian/patches/disable-final.diff	2006-01-17 20:43:00 UTC (rev 2927)
@@ -1,5 +1,5 @@
---- a/amarok/src/Makefile.am
-+++ b/amarok/src/Makefile.am
+--- amarok/src/Makefile.am
++++ amarok/src/Makefile.am
 @@ -8,6 +8,7 @@
      KONQSIDEBAR_SUBDIR = konquisidebar
  endif

Modified: people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch	2006-01-17 20:40:40 UTC (rev 2926)
+++ people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch	2006-01-17 20:43:00 UTC (rev 2927)
@@ -1,5 +1,5 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
+--- admin/acinclude.m4.in
++++ admin/acinclude.m4.in
 @@ -1665,15 +1665,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""

Modified: people/dato/packages/trunk/amarok/debian/patches/gmo_files_at_build_time.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/gmo_files_at_build_time.patch	2006-01-17 20:40:40 UTC (rev 2926)
+++ people/dato/packages/trunk/amarok/debian/patches/gmo_files_at_build_time.patch	2006-01-17 20:43:00 UTC (rev 2927)
@@ -1,5 +1,5 @@
---- a/admin/cvs.sh
-+++ b/admin/cvs.sh
+--- admin/cvs.sh
++++ admin/cvs.sh
 @@ -196,7 +196,7 @@
  ###
  ### Then make messages

Modified: people/dato/packages/trunk/amarok/debian/patches/no_libadd_in_convenience_libs.diff
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/no_libadd_in_convenience_libs.diff	2006-01-17 20:40:40 UTC (rev 2926)
+++ people/dato/packages/trunk/amarok/debian/patches/no_libadd_in_convenience_libs.diff	2006-01-17 20:43:00 UTC (rev 2927)
@@ -1,5 +1,5 @@
---- a/amarok/src/statusbar/Makefile.am
-+++ b/amarok/src/statusbar/Makefile.am
+--- amarok/src/statusbar/Makefile.am
++++ amarok/src/statusbar/Makefile.am
 @@ -9,8 +9,6 @@
      -I$(top_srcdir)/amarok/src/engine \
      -I$(top_builddir)/amarok/src/ \

Modified: people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-01-17 20:40:40 UTC (rev 2926)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-01-17 20:43:00 UTC (rev 2927)
@@ -1,5 +1,5 @@
---- a/amarok/src/loader/loader.cpp
-+++ b/amarok/src/loader/loader.cpp
+--- amarok/src/loader/loader.cpp
++++ amarok/src/loader/loader.cpp
 @@ -66,7 +66,7 @@
                      // this argument cannot be passed to the running amarokapp
                      // or KCmdLineArgs would exit the application
@@ -18,8 +18,8 @@
  
      m_proc = new QProcess( args, this );
      m_proc->setCommunication( QProcess::Stdout );
---- a/amarok/src/socketserver.cpp
-+++ b/amarok/src/socketserver.cpp
+--- amarok/src/socketserver.cpp
++++ amarok/src/socketserver.cpp
 @@ -193,23 +193,23 @@
  
      //can I get a pointer to the data section of a QCString?
@@ -48,8 +48,8 @@
  
      resize( sizeHint() + QSize(20,0) );
      // Center the widget on screen
---- a/amarok/src/amarokcore/main.cpp
-+++ b/amarok/src/amarokcore/main.cpp
+--- amarok/src/amarokcore/main.cpp
++++ amarok/src/amarokcore/main.cpp
 @@ -77,6 +77,8 @@
      aboutData.addCredit( "Stefan Siegel", I18N_NOOP( "Patches, Bugfixes" ), "kde at sdas.de" );
      aboutData.addCredit( "Whitehawk Stormchaser", I18N_NOOP( "Tester, patches" ), "zerokode at gmx.net" );
@@ -59,8 +59,8 @@
      KApplication::disableAutoDcopRegistration();
 
      App::initCliArgs( argc, argv );
---- a/amarok/src/amarokcore/crashhandler.cpp
-+++ b/amarok/src/amarokcore/crashhandler.cpp
+--- amarok/src/amarokcore/crashhandler.cpp
++++ amarok/src/amarokcore/crashhandler.cpp
 @@ -125,7 +125,7 @@
              QCString gdb;
              gdb  = "gdb --nw -n --batch -x ";