[Pkg-kde-commits] rev 288 - people/dato/packages/trunk/amarok/debian

Adeodato Sim?? dato-guest@haydn.debian.org
Thu, 09 Dec 2004 11:44:01 -0700


Author: dato-guest
Date: 2004-12-09 11:43:49 -0700 (Thu, 09 Dec 2004)
New Revision: 288

Modified:
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/control
   people/dato/packages/trunk/amarok/debian/rules
Log:
- Don't suggest konqueror, shlibs:Depends will get it now because of the
  sidebar stuff.

- Prevent bug/.svn from being installed.


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2004-12-09 18:22:25 UTC (rev 287)
+++ people/dato/packages/trunk/amarok/debian/changelog	2004-12-09 18:43:49 UTC (rev 288)
@@ -9,6 +9,7 @@
 
   * debian/amarok.install:
     - add files for the konqueror sidebar.
+    - this makes amarok depend on konqueror, and thus closes: #282523.
 
   * Taglib 1.3 is now in the archive:
     - removed debian/patches/taglib-1.2-suffices.patch.
@@ -21,10 +22,6 @@
   * Make amarok recommend: kdemultimedia-kio-plugins, since otherwise it won't
     be able to play audio CDs. Added note stating so to README.Debian.
 
-  * Make amarok suggest: konqueror, since it's used to open directories in the
-    tag dialog. Suggests and not Recommends since its a very marginal usage.
-    (Closes: #282523)
-
   * Added note to README.Debian explaining why the amarokapp and
     amarok_xmmswrapper2 binaries are shipped in /usr/lib/amarok instead of
     /usr/bin, differing from upstream.
@@ -37,7 +34,7 @@
     force automake-1.6 (used by upstream) in admin/detect-autoconf.sh (patch:
     automake-1.6.patch).
 
- -- Adeodato Simó <asp16@alu.ua.es>  Thu, 09 Dec 2004 19:09:26 +0100
+ -- Adeodato Simó <asp16@alu.ua.es>  Thu, 09 Dec 2004 19:34:36 +0100
 
 amarok (1.1.1-1) unstable; urgency=low
 

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2004-12-09 18:22:25 UTC (rev 287)
+++ people/dato/packages/trunk/amarok/debian/control	2004-12-09 18:43:49 UTC (rev 288)
@@ -9,7 +9,6 @@
 Architecture: any
 Depends: amarok-engines | amarok-engine, ${shlibs:Depends}
 Recommends: kdemultimedia-kio-plugins
-Suggests: konqueror
 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.

Modified: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules	2004-12-09 18:22:25 UTC (rev 287)
+++ people/dato/packages/trunk/amarok/debian/rules	2004-12-09 18:43:49 UTC (rev 288)
@@ -31,8 +31,8 @@
 	if test -d debian/bug && test "experimental" = \
 	$(shell dpkg-parsechangelog  | awk '/Distribution/ {print $$2}'); then \
 	  for p in $(DEB_ALL_PACKAGES); do \
-	    mkdir debian/$$p/usr/share/bug; \
-	    cp -a debian/bug debian/$$p/usr/share/bug/$$p; \
+	    mkdir -p debian/$$p/usr/share/bug/$$p; \
+	    cp debian/bug/* debian/$$p/usr/share/bug/$$p; \
 	  done; \
 	fi