rev 8527 - in kde-extras/amarok/trunk/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Tue Dec 25 22:13:57 UTC 2007
Author: modax-guest
Date: 2007-12-25 22:13:57 +0000 (Tue, 25 Dec 2007)
New Revision: 8527
Added:
kde-extras/amarok/trunk/debian/patches/01_am_maintainer_mode.patch
kde-extras/amarok/trunk/debian/patches/02_disable_no_undefined.patch
kde-extras/amarok/trunk/debian/patches/03_no_libadd_in_convenience_libs.diff
kde-extras/amarok/trunk/debian/patches/04_gmo_files_at_build_time.patch
kde-extras/amarok/trunk/debian/patches/05_disable-final.diff
kde-extras/amarok/trunk/debian/patches/10_queuemedia.patch
Removed:
kde-extras/amarok/trunk/debian/patches/am_maintainer_mode.patch
kde-extras/amarok/trunk/debian/patches/disable-final.diff
kde-extras/amarok/trunk/debian/patches/disable_no_undefined.patch
kde-extras/amarok/trunk/debian/patches/gmo_files_at_build_time.patch
kde-extras/amarok/trunk/debian/patches/no_libadd_in_convenience_libs.diff
kde-extras/amarok/trunk/debian/patches/queuemedia.patch
Modified:
kde-extras/amarok/trunk/debian/changelog
kde-extras/amarok/trunk/debian/patches/series
Log:
Use sequence number for filenames of the patches (more convenient for me)
Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog 2007-12-25 18:13:17 UTC (rev 8526)
+++ kde-extras/amarok/trunk/debian/changelog 2007-12-25 22:13:57 UTC (rev 8527)
@@ -35,8 +35,10 @@
* Ship only README from upstream source in /usr/share/doc/amarok.
* debian/README.Debian: remove a note about installing ruby, because it's a
dependency and gets installed anyway.
+ * Prepend sequence number to the filenames of debian/patches. Edit
+ debian/patches/series accordingly.
- -- Modestas Vainius <modestas at vainius.eu> Tue, 25 Dec 2007 16:55:58 +0200
+ -- Modestas Vainius <modestas at vainius.eu> Wed, 26 Dec 2007 00:09:17 +0200
amarok (1.4.8-1) unstable; urgency=low
Copied: kde-extras/amarok/trunk/debian/patches/01_am_maintainer_mode.patch (from rev 8524, kde-extras/amarok/trunk/debian/patches/am_maintainer_mode.patch)
===================================================================
--- kde-extras/amarok/trunk/debian/patches/01_am_maintainer_mode.patch (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/01_am_maintainer_mode.patch 2007-12-25 22:13:57 UTC (rev 8527)
@@ -0,0 +1,11 @@
+--- admin/configure.in.min.orig
++++ 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
+
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+
+ dnl generate the config header
Copied: kde-extras/amarok/trunk/debian/patches/02_disable_no_undefined.patch (from rev 8524, kde-extras/amarok/trunk/debian/patches/disable_no_undefined.patch)
===================================================================
--- kde-extras/amarok/trunk/debian/patches/02_disable_no_undefined.patch (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/02_disable_no_undefined.patch 2007-12-25 22:13:57 UTC (rev 8527)
@@ -0,0 +1,18 @@
+--- admin/acinclude.m4.in.orig
++++ admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+ KDE_USE_CLOSURE_TRUE="#"
+ KDE_USE_CLOSURE_FALSE=""
+ KDE_NO_UNDEFINED=""
+- case $host in
+- *-*-linux-gnu)
+- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+- [KDE_NO_UNDEFINED=""])],
+- [KDE_NO_UNDEFINED=""])
+- ;;
+- esac
+ fi
+ AC_SUBST(KDE_USE_CLOSURE_TRUE)
+ AC_SUBST(KDE_USE_CLOSURE_FALSE)
Copied: kde-extras/amarok/trunk/debian/patches/03_no_libadd_in_convenience_libs.diff (from rev 8524, kde-extras/amarok/trunk/debian/patches/no_libadd_in_convenience_libs.diff)
===================================================================
--- kde-extras/amarok/trunk/debian/patches/03_no_libadd_in_convenience_libs.diff (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/03_no_libadd_in_convenience_libs.diff 2007-12-25 22:13:57 UTC (rev 8527)
@@ -0,0 +1,11 @@
+--- amarok/src/statusbar/Makefile.am.orig
++++ amarok/src/statusbar/Makefile.am
+@@ -9,8 +9,6 @@
+ -I$(top_srcdir)/amarok/src/engine \
+ -I$(top_builddir)/amarok/src/ \
+ $(all_includes)
+-
+-libstatusbar_la_LIBADD = $(LIB_QT)
+
+ libstatusbar_la_SOURCES = \
+ statusBarBase.cpp \
Copied: kde-extras/amarok/trunk/debian/patches/04_gmo_files_at_build_time.patch (from rev 8524, kde-extras/amarok/trunk/debian/patches/gmo_files_at_build_time.patch)
===================================================================
--- kde-extras/amarok/trunk/debian/patches/04_gmo_files_at_build_time.patch (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/04_gmo_files_at_build_time.patch 2007-12-25 22:13:57 UTC (rev 8527)
@@ -0,0 +1,11 @@
+--- admin/cvs.sh.orig
++++ admin/cvs.sh
+@@ -204,7 +204,7 @@
+ ###
+ ### Then make messages
+ ###
+-if test -d po; then
++if test -d po && false; then
+ LIST=`find ./po -name "*.po"`
+ for i in $LIST; do
+ file2=`echo $i | sed -e "s#\.po#\.gmo#"`
Copied: kde-extras/amarok/trunk/debian/patches/05_disable-final.diff (from rev 8524, kde-extras/amarok/trunk/debian/patches/disable-final.diff)
===================================================================
--- kde-extras/amarok/trunk/debian/patches/05_disable-final.diff (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/05_disable-final.diff 2007-12-25 22:13:57 UTC (rev 8527)
@@ -0,0 +1,10 @@
+--- amarok/src/Makefile.am.orig
++++ amarok/src/Makefile.am
+@@ -8,6 +8,7 @@
+ KONQSIDEBAR_SUBDIR = konquisidebar
+ endif
+
++KDE_OPTIONS = nofinal
+
+ lib_LTLIBRARIES = libamarok.la
+
Copied: kde-extras/amarok/trunk/debian/patches/10_queuemedia.patch (from rev 8524, kde-extras/amarok/trunk/debian/patches/queuemedia.patch)
===================================================================
--- kde-extras/amarok/trunk/debian/patches/10_queuemedia.patch (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/10_queuemedia.patch 2007-12-25 22:13:57 UTC (rev 8527)
@@ -0,0 +1,37 @@
+diff -u -Nrua amarok.orig/src/amarokcore/amarokdcophandler.cpp amarok/src/amarokcore/amarokdcophandler.cpp
+--- amarok.orig/src/amarokcore/amarokdcophandler.cpp 2006-10-26 22:40:20.000000000 +0200
++++ amarok/src/amarokcore/amarokdcophandler.cpp 2007-02-08 21:11:45.000000000 +0100
+@@ -585,6 +585,11 @@
+ Playlist::instance()->insertMedia(urls);
+ }
+
++ void DcopPlaylistHandler::queueMedia(const KURL &url)
++ {
++ Playlist::instance()->insertMedia(KURL::List( url ), Playlist::Queue);
++ }
++
+ void DcopPlaylistHandler::clearPlaylist()
+ {
+ Playlist::instance()->clear();
+diff -u -Nrua amarok.orig/src/amarokcore/amarokdcophandler.h amarok/src/amarokcore/amarokdcophandler.h
+--- amarok.orig/src/amarokcore/amarokdcophandler.h 2006-10-26 22:40:20.000000000 +0200
++++ amarok/src/amarokcore/amarokdcophandler.h 2007-02-08 21:11:56.000000000 +0100
+@@ -125,6 +125,7 @@
+ virtual int getTotalTrackCount();
+ virtual QString saveCurrentPlaylist();
+ virtual void addMedia(const KURL &);
++ virtual void queueMedia(const KURL &);
+ virtual void addMediaList(const KURL::List &);
+ virtual void clearPlaylist();
+ virtual QString currentTrackUniqueId();
+diff -u -Nrua amarok.orig/src/amarokcore/amarokdcopiface.h amarok/src/amarokcore/amarokdcopiface.h
+--- amarok.orig/src/amarokcore/amarokdcopiface.h 2006-10-26 22:40:20.000000000 +0200
++++ amarok/src/amarokcore/amarokdcopiface.h 2007-02-08 21:12:12.000000000 +0100
+@@ -127,6 +127,7 @@
+
+ /* These two methods are used by mediacontrol. DO NOT TOUCH! */
+ virtual void addMedia(const KURL &) = 0; ///< Add audio media specified by the url.
++ virtual void queueMedia(const KURL &) = 0; ///< Queue audio media specified by the url.
+ virtual void addMediaList(const KURL::List &) = 0; ///< Add some audio media specified by the url.
+ virtual void clearPlaylist() = 0; ///< Clears the playlist.
+ virtual QString currentTrackUniqueId() = 0; ///< Return the current track's unique ID
Deleted: kde-extras/amarok/trunk/debian/patches/am_maintainer_mode.patch
Deleted: kde-extras/amarok/trunk/debian/patches/disable-final.diff
Deleted: kde-extras/amarok/trunk/debian/patches/disable_no_undefined.patch
Deleted: kde-extras/amarok/trunk/debian/patches/gmo_files_at_build_time.patch
Deleted: kde-extras/amarok/trunk/debian/patches/no_libadd_in_convenience_libs.diff
Deleted: kde-extras/amarok/trunk/debian/patches/queuemedia.patch
Modified: kde-extras/amarok/trunk/debian/patches/series
===================================================================
--- kde-extras/amarok/trunk/debian/patches/series 2007-12-25 18:13:17 UTC (rev 8526)
+++ kde-extras/amarok/trunk/debian/patches/series 2007-12-25 22:13:57 UTC (rev 8527)
@@ -1,6 +1,6 @@
-am_maintainer_mode.patch -p0
-disable_no_undefined.patch -p0
-no_libadd_in_convenience_libs.diff -p0
-gmo_files_at_build_time.patch -p0
-disable-final.diff -p0
-queuemedia.patch -p0
+01_am_maintainer_mode.patch -p0
+02_disable_no_undefined.patch -p0
+03_no_libadd_in_convenience_libs.diff -p0
+04_gmo_files_at_build_time.patch -p0
+05_disable-final.diff -p0
+10_queuemedia.patch -p0
More information about the pkg-kde-commits
mailing list