rev 8525 - kde-extras/amarok/trunk/debian
Modestas Vainius
modax-guest at alioth.debian.org
Tue Dec 25 15:46:07 UTC 2007
Author: modax-guest
Date: 2007-12-25 15:46:06 +0000 (Tue, 25 Dec 2007)
New Revision: 8525
Added:
kde-extras/amarok/trunk/debian/amarok-yauap.install
Removed:
kde-extras/amarok/trunk/debian/amarok-gstreamer.install
kde-extras/amarok/trunk/debian/cdbs/
Modified:
kde-extras/amarok/trunk/debian/README.Debian
kde-extras/amarok/trunk/debian/TODO
kde-extras/amarok/trunk/debian/changelog
kde-extras/amarok/trunk/debian/control
kde-extras/amarok/trunk/debian/rules
Log:
The road to 1.4.8-2. Some major packaging changes underway.
Next task is to silence lintian/linda and solve more bugs...
Modified: kde-extras/amarok/trunk/debian/README.Debian
===================================================================
--- kde-extras/amarok/trunk/debian/README.Debian 2007-12-24 22:02:54 UTC (rev 8524)
+++ kde-extras/amarok/trunk/debian/README.Debian 2007-12-25 15:46:06 UTC (rev 8525)
@@ -4,8 +4,7 @@
A couple of notes which you may find useful:
- starting with Amarok 1.4, lyrics downloading is implemented in a
- separate Ruby script; if you want to use this feature, you'll have
- to install the 'ruby' package.
+ separate Ruby script;
- Last.fm stream support is also implemented with the help of a Ruby
script.
Modified: kde-extras/amarok/trunk/debian/TODO
===================================================================
--- kde-extras/amarok/trunk/debian/TODO 2007-12-24 22:02:54 UTC (rev 8524)
+++ kde-extras/amarok/trunk/debian/TODO 2007-12-25 15:46:06 UTC (rev 8525)
@@ -1,7 +0,0 @@
-- ponder shipping one package only, with libxine1 in Depends and the
- rest in recommends
-
-- possibly for 1.4.1-2: hit NEW for -dbg (#368840) and -helix (#353504)
-
-- cdbs/kde.mk from svn.debian.org/pkg-kde sets DEB_INSTALL_DOCS_ALL to
- empty.
Deleted: kde-extras/amarok/trunk/debian/amarok-gstreamer.install
Added: kde-extras/amarok/trunk/debian/amarok-yauap.install
===================================================================
--- kde-extras/amarok/trunk/debian/amarok-yauap.install (rev 0)
+++ kde-extras/amarok/trunk/debian/amarok-yauap.install 2007-12-25 15:46:06 UTC (rev 8525)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/services/amarok_yauap-engine_plugin.desktop
+debian/tmp/usr/lib/kde3/libamarok_yauap-engine_plugin.la
+debian/tmp/usr/lib/kde3/libamarok_yauap-engine_plugin.so
Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog 2007-12-24 22:02:54 UTC (rev 8524)
+++ kde-extras/amarok/trunk/debian/changelog 2007-12-25 15:46:06 UTC (rev 8525)
@@ -1,3 +1,43 @@
+amarok (1.4.8-2~pre1) unstable; urgency=low
+
+ * Remove amarok-gstreamer.install because there is no gstreamer engine
+ anymore.
+ * Drop internal cdbs/kde.mk in favour of the one shipped with cdbs. Merge
+ missing functionality (cvs-make/automake) into debian/rules.
+ * Auto-guess automake /usr/share directory.
+ * New binary packages:
+ - amarok-dbg - debugging symbols (Closes: #368840)
+ - amarok-yauap - Yauap Commandline Audio Player engine:
+ * Add libdbus-qt-1-dev to Build-Depends
+ * Pass --with-yauap to configure
+ * Add amarok-yauap.install
+ * Rework interdependences among amarok binary packages:
+ - Drop amarok-engine virtual package. Amarok and its engines ABI are not
+ even compatible between Amarok point releases so virtual package is
+ not practical here.
+ - Make amarok depend on any of its engines (via alternate dependences)
+ of the same binary version. Default engine is amarok-xine. Edit
+ amarok-xine description accordingly.
+ - Make all amarok engines recommend amarok strictly of the same binary
+ version. Here Recommends instead of Depends breaks circular dependency
+ (Closes: #368485).
+ - Make all amarok engines conflict with all amarok versions non-equal to
+ their binary version. This should also ensure that partial upgrades are
+ never allowed (Closes: #432219).
+ - Downgrade amarok-engines to amarok Suggests.
+ - Convert amarok-engines package to arch:all as it's a metapackage. Edit
+ amarok-engines description because it's longer going to be installed by
+ default.
+ * Add "Homepage" field in debian/control, remove homepage reference from
+ amarok description.
+ * Disable /usr/share/doc/amarok-* symlinks in debian/rules. They just
+ complicate packaging unnecessarily and make lintian unhappy.
+ * 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.
+
+ -- Modestas Vainius <modestas at vainius.eu> Tue, 25 Dec 2007 16:55:58 +0200
+
amarok (1.4.8-1) unstable; urgency=low
[ Adeodato Simó ]
Modified: kde-extras/amarok/trunk/debian/control
===================================================================
--- kde-extras/amarok/trunk/debian/control 2007-12-24 22:02:54 UTC (rev 8524)
+++ kde-extras/amarok/trunk/debian/control 2007-12-25 15:46:06 UTC (rev 8525)
@@ -5,7 +5,7 @@
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Adeodato Simó <dato at net.com.org.es>
Build-Depends: cdbs, debhelper, quilt, bzip2, automake, libtool,
kdelibs4-dev, kdebase-dev,
- libxine-dev,
+ libxine-dev, libdbus-qt-1-dev,
libtag1-dev, libsqlite3-dev, libtunepimp-dev,
libmysqlclient15-dev, libpq-dev,
libvisual-0.4-dev, libsdl1.2-dev,
@@ -14,12 +14,13 @@
Standards-Version: 3.7.3
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/amarok/trunk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/amarok/trunk/
+Homepage: http://amarok.kde.org
Package: amarok
Architecture: any
-Depends: amarok-engines | amarok-engine, ruby, unzip, ${shlibs:Depends}
+Depends: amarok-xine (= ${binary:Version}) | amarok-yauap (= ${binary:Version}), ruby, unzip, ${shlibs:Depends}
Recommends: kdemultimedia-kio-plugins
-Suggests: libvisual-0.4-plugins, konqueror | www-browser, python, python-qt3, libqt0-ruby1.8
+Suggests: amarok-engines, libvisual-0.4-plugins, konqueror | www-browser, python, python-qt3, libqt0-ruby1.8
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.
@@ -41,23 +42,45 @@
.
Support for libvisual visualization plugins is also compiled in (you need
to have libvisual-0.4-plugins installed to be able to use it).
- .
- Homepage: http://amarok.kde.org
Package: amarok-engines
-Architecture: any
-Depends: amarok-xine
+Architecture: all
+Depends: amarok-xine (>= ${source:Version}), amarok-yauap (>= ${source:Version})
Description: output engines for the Amarok audio player
- This package depends on all the available Amarok engines, and it's
- installed by default unless you specify a particular engine. You can
+ This package depends on all the available Amarok engines. You can
safely remove it, as you can remove the amarok-$engine packages that
you don't use.
Package: amarok-xine
Architecture: any
-Depends: amarok (= ${binary:Version}), ${shlibs:Depends}
-Provides: amarok-engine
+Depends: ${shlibs:Depends}
+Recommends: amarok (= ${binary:Version})
+Conflicts: amarok (<< ${binary:Version}), amarok (>> ${binary:Version})
Description: xine engine for the Amarok audio player
- This package provides the xine engine for Amarok, which you may prefer
- for some reason over the other engines (e.g., it is the lightest engine
- Dependency-wise).
+ This package provides the xine engine for Amarok. Xine is capable of
+ playing most of media formats and usually does not require any
+ additional configuration therefore this engine is default and highly
+ recommended.
+
+Package: amarok-yauap
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: amarok (= ${binary:Version})
+Conflicts: amarok (<< ${binary:Version}), amarok (>> ${binary:Version})
+Description: yauap engine for the Amarok audio player
+ This package includes Amarok yauap engine, which provides a frontend
+ to Yauap Commandline Audio Player. DBus is used as means of communication
+ between the engine and Yauap. Please note that this package will be of no
+ use for you unless you have Yauap Commandline Audio Player installed
+ and configured properly.
+
+Package: amarok-dbg
+Priority: extra
+Architecture: any
+Depends: amarok (= ${binary:Version})
+Recommends: kdelibs-dbg
+Description: debugging symbols for Amarok
+ This package provides debugging symbols for all binary packages built from
+ amarok source package. It's highly recommended to have this package installed
+ before reporting any Amarok crashes to either Amarok developers or debian
+ package maintainers.
Modified: kde-extras/amarok/trunk/debian/rules
===================================================================
--- kde-extras/amarok/trunk/debian/rules 2007-12-24 22:02:54 UTC (rev 8524)
+++ kde-extras/amarok/trunk/debian/rules 2007-12-25 15:46:06 UTC (rev 8525)
@@ -5,12 +5,10 @@
### CDBS INCLUDES
include /usr/share/cdbs/1/rules/tarball.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/class/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
### VARIABLES
-DEB_KDE_CVS_MAKE := yes
-
DEB_DH_MAKESHLIBS_ARGS_ALL := -n
DEB_INSTALL_DIRS_amarok := usr/lib/amarok
DEB_DH_SHLIBDEPS_ARGS_amarok := -Xusr/lib/kde3/konqsidebar_universalamarok.so
@@ -25,36 +23,49 @@
--with-libmtp \
--with-libkarma \
--enable-mysql \
- --enable-postgresql
+ --enable-postgresql \
+ --with-yauap
-# See debian/TODO
-DEB_INSTALL_DOCS_ALL = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done))
+# Ship upstream README in amarok docs
+DEB_INSTALL_DOCS_ALL =
+DEB_INSTALL_DOCS_amarok = $(DEB_SRCDIR)/README
-###
+### Libtool and Automake updates
+# Autoguess automake /usr/share subdirectory. Insure from failures
+DEB_AUTOMAKE_SHARE_DIR = /usr/share/automake-$(shell automake --version | head -n 1 | sed 's/^automake (GNU automake) \([0-9]\+\.[0-9]\+\).*/\1/')
+ifneq ($(words $(DEB_AUTOMAKE_SHARE_DIR)),1)
+DEB_AUTOMAKE_SHARE_DIR =
+endif
-### Libtool and Automake updates
-post-patches:: debian/stamp-autothings-update
-debian/stamp-autothings-update:
+post-patches:: debian/stamp-automake
+debian/stamp-automake:
cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
- for f in /usr/share/automake-1.10/*; do \
- if test -f $$f && \
- test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
- cp -f $$f $(DEB_SRCDIR)/admin; \
- fi; \
- done
+ if test -n "$(DEB_AUTOMAKE_SHARE_DIR)"; then \
+ for f in $(DEB_AUTOMAKE_SHARE_DIR)/*; do \
+ if test -f $$f && \
+ test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
+ cp -f $$f $(DEB_SRCDIR)/admin; \
+ fi; \
+ done; \
+ fi
+ if test ! -f configure; then \
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common; \
+ fi
touch $@
clean::
- rm -f debian/stamp-autothings-update
+ if test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+ rm -f debian/stamp-automake
### POST-INSTALL HACKING
-# Make directories in /usr/share/doc be symlinks for packages other than amarok
common-binary-post-install-arch::
- for p in $(filter-out amarok,$(DEB_ALL_PACKAGES)); do \
- 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
More information about the pkg-kde-commits
mailing list