[Pkg-kde-commits] rev 415 - in people/dato/packages/trunk/amarok/debian: . patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-01-15 17:47:02 +0100 (Sat, 15 Jan 2005)
New Revision: 415

Removed:
   people/dato/packages/trunk/amarok/debian/patches/sqlite3_in_configure.in.patch
Modified:
   people/dato/packages/trunk/amarok/debian/amarok.install
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/control
   people/dato/packages/trunk/amarok/debian/rules
Log:
Preparing 1.2-beta3-1 packages.


Modified: people/dato/packages/trunk/amarok/debian/amarok.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok.install	2005-01-15 15:33:03 UTC (rev 414)
+++ people/dato/packages/trunk/amarok/debian/amarok.install	2005-01-15 16:47:02 UTC (rev 415)
@@ -12,6 +12,10 @@
 debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.la
 debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.so
 
+debian/tmp/usr/share/apps/konqsidebartng/add/amarok.desktop
+debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.la
+debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.so
+
 debian/tmp/usr/bin/amarok
 debian/tmp/usr/bin/amarokapp		/usr/lib/amarok
 debian/tmp/usr/bin/amarok_xmmswrapper2	/usr/lib/amarok

Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2005-01-15 15:33:03 UTC (rev 414)
+++ people/dato/packages/trunk/amarok/debian/changelog	2005-01-15 16:47:02 UTC (rev 415)
@@ -1,3 +1,32 @@
+amarok (1.2-beta3-1) experimental; urgency=low
+
+  * Packaged third 1.2 beta from upstream:
+
+    + the search text input element is now cleared when the user writes
+      something there. (Closes: #278359)
+
+  * amaroK now includes a sidebar plugin for amarok:
+
+    + debian/amarok.install:
+      - add files for the konqueror sidebar.
+
+    + debian/control:
+      - added kdebase-dev as Build-Dependency.
+
+    + debian/rules:
+      - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that
+        amarok doesn't end up depending on konqueror. (The plugin will be
+        ignored in systems without konqueror installed.)
+
+  * Other changes:
+
+    + removed sqlite3_in_configure.in.patch, no longer necessary in 1.2.
+
+    + added www-browser as an alternative for the konqueror suggests, since
+      upstream fixed the code so that the configured browser is used.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Sat, 15 Jan 2005 17:44:21 +0100
+
 amarok (1.1.1-2) unstable; urgency=high
 
   * Upload to get rid of the dependency on libflac4, which is not longer in

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2005-01-15 15:33:03 UTC (rev 414)
+++ people/dato/packages/trunk/amarok/debian/control	2005-01-15 16:47:02 UTC (rev 415)
@@ -2,14 +2,14 @@
 Section: kde
 Priority: optional
 Maintainer: Adeodato Simó <asp16@alu.ua.es>
-Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), libkjsembed-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
+Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), kdebase-dev (>= 4:3.2), libkjsembed-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
 Standards-Version: 3.6.1
 
 Package: amarok
 Architecture: any
 Depends: amarok-engines | amarok-engine, ${shlibs:Depends}
 Recommends: kdemultimedia-kio-plugins
-Suggests: konqueror
+Suggests: konqueror | www-browser
 Description: versatile and easy to use audio player for KDE
  amaroK tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.

Deleted: people/dato/packages/trunk/amarok/debian/patches/sqlite3_in_configure.in.patch

Modified: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules	2005-01-15 15:33:03 UTC (rev 414)
+++ people/dato/packages/trunk/amarok/debian/rules	2005-01-15 16:47:02 UTC (rev 415)
@@ -8,7 +8,8 @@
 ### VARIABLES
 DEB_DH_MAKESHLIBS_ARGS_ALL := -n
 DEB_INSTALL_DIRS_amarok    := usr/lib/amarok
-DEB_DH_SHLIBDEPS_ARGS      := -Xusr/lib/amarok/amarok_xmmswrapper2
+DEB_DH_SHLIBDEPS_ARGS      := -Xusr/lib/amarok/amarok_xmmswrapper2 \
+                              -Xusr/lib/kde3/konqsidebar_universalamarok.so
 
 DEB_CONFIGURE_EXTRA_FLAGS  := --without-included-sqlite
 
@@ -26,3 +27,6 @@
 	  rm -rf debian/$$p/usr/share/doc/$$p; \
 	  ln -sf amarok debian/$$p/usr/share/doc/$$p; \
 	done
+
+	# Check for not installed files
+	dh_install --no-act --list-missing