[Pkg-cli-apps-commits] r3740 - in /packages/muine/trunk/debian: InotifyPlugin.dll.config changelog compat control copyright menu muine.1 muine.docs muine.exe.config muine.install muine.manpages muine.menu patches/ rules watch

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Mon Feb 25 20:58:29 UTC 2008


Author: meebey
Date: Mon Feb 25 20:58:29 2008
New Revision: 3740

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3740
Log:
Integrated muine love from Barry deFreese <bddebian at comcast.net>


Added:
    packages/muine/trunk/debian/InotifyPlugin.dll.config
    packages/muine/trunk/debian/compat
    packages/muine/trunk/debian/muine.docs
    packages/muine/trunk/debian/muine.exe.config
    packages/muine/trunk/debian/muine.manpages
    packages/muine/trunk/debian/muine.menu
      - copied, changed from r3739, packages/muine/trunk/debian/menu
    packages/muine/trunk/debian/patches/
Removed:
    packages/muine/trunk/debian/menu
Modified:
    packages/muine/trunk/debian/changelog
    packages/muine/trunk/debian/control
    packages/muine/trunk/debian/copyright
    packages/muine/trunk/debian/muine.1
    packages/muine/trunk/debian/muine.install
    packages/muine/trunk/debian/rules
    packages/muine/trunk/debian/watch

Added: packages/muine/trunk/debian/InotifyPlugin.dll.config
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/InotifyPlugin.dll.config?rev=3740&op=file
==============================================================================
--- packages/muine/trunk/debian/InotifyPlugin.dll.config (added)
+++ packages/muine/trunk/debian/InotifyPlugin.dll.config Mon Feb 25 20:58:29 2008
@@ -1,0 +1,3 @@
+<configuration>
+<dllmap dll="libintofiyglue" target="/usr/lib/muine/libinotifyglue.so"/>
+</configuration>

Modified: packages/muine/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/changelog?rev=3740&op=diff
==============================================================================
--- packages/muine/trunk/debian/changelog (original)
+++ packages/muine/trunk/debian/changelog Mon Feb 25 20:58:29 2008
@@ -1,10 +1,85 @@
-muine (0.8.5-2) unstable; urgency=low
-
-  * Rebuild with gstreamer 0.10 as that is the current favourite
-    gstreamer API version.  (Closes: #381784, #381112)
-
- -- Dave Beckett <dajobe at debian.org>  Sun,  6 Aug 2006 16:37:00 -0700
-
+muine (0.8.8-1) unstable; urgency=low
+
+  * QA upload.
+    + Set maintainer to Debian QA Group <packages at qa.debian.org>.
+  * Acknowledge NMUs.
+  * Fix watch file. (Closes: #449835).
+  * New upstream release.
+    + Drop all previous patches.
+    + Updated NDesk managed DBus import. (Closes: #440817, #427263).
+    + Use external NDesk dbus. (Closes: #415419).
+  * Move build system from CDBS to debhelper.
+  * Move from simple-patchsys to quilt.
+  * Remove -X revisions on build-depends.
+  * Add authors and copyright holders in debian/copyright.
+    + Point link to GPL-2.
+  * Remove unneeded dirs file.
+  * Escape hyphens in manpage.
+  * 10_desktop_encoding.diff. (Remove deprecated encoding from desktop file.)
+  * Bump Standards Version to 3.7.3.
+    + Menu policy transition.
+
+ -- Barry deFreese <bddebian at comcast.net>  Tue, 19 Feb 2008 16:53:03 -0500
+
+muine (0.8.7-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control:
+    - Build-depend on libndesk-dbus1.0-cil, libndesk-dbus-glib1.0-cil
+    - Dropped libdbus-1-cil from build-depends
+
+ -- Luk Claes <luk at debian.org>  Sun, 13 Jan 2008 05:17:32 +0000
+
+muine (0.8.7-1.1) unstable; urgency=low
+
+  * Non-Maintainer Upload (NMU)
+  * Add patch stolen from upstream SVN to allow building with FLAC >= 1.1.3
+    (Closes: #427751).
+  * Add dependency on gstreamer0.10-plugins-good as muine uses gconfaudiosink
+    from gconfelements, which is in -plugins-good (Closes: #421047).
+  * Add note about parts being available under the MIT License to
+    debian/copyright (Closes: #426473).
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 14 Jun 2007 19:28:19 +0200
+
+muine (0.8.7-1) unstable; urgency=high
+
+  * New upstream release
+    - Require Gtk# 2.6 or newer
+    - Build-depend on mono-gmcs, gtk# 2.6
+    - Build-depend on libmono-cairo2.0-cil
+  * muine.install
+     - Drop debian/tmp/usr/lib/mono/gac/*
+     - Drop debian/tmp/usr/lib/mono/muine/*
+     - Add debian/tmp/usr/lib/muine/*dll*
+  * Build-depend on mono-gmcs, gtk# 2.6
+  * Urgency high to get rid of gstreamer 0.8 at
+    the request of the security team (Closes: #410442)
+
+ -- Dave Beckett <dajobe at debian.org>  Tue, 13 Feb 2007 00:07:32 -0800
+
+muine (0.8.6-1) experimental; urgency=low
+
+  * New upstream release 
+    - Fixes muine crash when importing folder (Closes: #389303)
+  * Update home page (Closes: #387516)
+  * Rebuild with gstreamer 0.10 using Build-Depends: changes taken from
+    Ubuntu packaging (Closes: #381784, #381112)
+  * Update Build-Depends to require cli-common-dev (>= 0.4.4)
+  * Use new icons
+
+ -- Dave Beckett <dajobe at debian.org>  Fri, 17 Nov 2006 18:37:16 -0800
+
+muine (0.8.5-1.1) unstable; urgency=medium
+
+   * Non-maintainer upload.
+   * Add a dependency on gstreamer0.8-plugins, since we need it (and
+     gstreamer0.8-misc, which -plugins depends on) to start, and it
+     isn't caught by dh_shlibdeps due to dynamic loading.
+     (Closes: #243389)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Sun, 24 Sep 2006 21:26:13 +0200
+  
 muine (0.8.5-1) unstable; urgency=low
 
   * New upstream release

Added: packages/muine/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/compat?rev=3740&op=file
==============================================================================
--- packages/muine/trunk/debian/compat (added)
+++ packages/muine/trunk/debian/compat Mon Feb 25 20:58:29 2008
@@ -1,0 +1,1 @@
+5

Modified: packages/muine/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/control?rev=3740&op=diff
==============================================================================
--- packages/muine/trunk/debian/control (original)
+++ packages/muine/trunk/debian/control Mon Feb 25 20:58:29 2008
@@ -1,23 +1,24 @@
 Source: muine
 Section: gnome
 Priority: optional
-Maintainer: Dave Beckett <dajobe at debian.org>
-Build-Depends: debhelper (>= 5), mono-mcs (>= 1.1.6) | c-sharp-compiler, mono-gac, libgtk-cil (>= 1.0), libgconf-cil (>= 1.0), libgnome-cil (>= 1.0), libglade-cil (>= 1.0), libgtk2.0-dev (>= 2.4.0), libgdbm-dev (>= 1.8.0), libogg-dev (>= 1.0), libvorbis-dev (>= 1.0), libid3tag0-dev (>= 0.15.1b-3), libflac-dev (>= 1.1.2-1), autotools-dev, cdbs, libmono-dev (>= 1.1.6), libgconf2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.4.0), libgnome2-dev (>= 2.4.0), libgstreamer0.10-dev (>= 0.10.0), intltool, libgtk2.0-cil (>= 1.9.2), libgnome2.0-cil (>= 1.9.2), libglade2.0-cil (>= 1.9.2), libgconf2.0-cil (>= 1.9.2), libdbus-1-cil (>= 0.61-3), gnome-icon-theme (>= 2.8.0), cli-common-dev (>= 0.4.0), monodoc-base
-Standards-Version: 3.7.2.0
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends: debhelper (>= 5), quilt, mono-gmcs (>= 1.1.13) | c-sharp-2.0-compiler, mono-gac, libgtk2.0-dev (>= 2.6.0), libgdbm-dev (>= 1.8.0), libogg-dev (>= 1.0), libvorbis-dev (>= 1.0), libid3tag0-dev (>= 0.15.1b-3), libflac-dev (>= 1.1.2), autotools-dev, libmono-dev (>= 1.1.6), libgconf2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.4.0), libgnome2-dev (>= 2.4.0), libgstreamer0.10-dev (>= 0.10.0), gstreamer0.10-plugins-good (>= 0.10.0), intltool, libgtk2.0-cil (>= 1.9.2), libgnome2.0-cil (>= 1.9.2), libglade2.0-cil (>= 1.9.2), libgconf2.0-cil (>= 1.9.2), libndesk-dbus1.0-cil (>= 0.4), libndesk-dbus-glib1.0-cil (>= 0.3), gnome-icon-theme (>= 2.8.0), cli-common-dev (>= 0.5.4), monodoc-base (>= 1.1.10), libmono-cairo2.0-cil (>= 1.1.13)
+Standards-Version: 3.7.3
+Homepage: http://muine-player.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/muine/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/
 
 Package: muine
 Architecture: any
-Depends: ${shlibs:Depends}, gstreamer0.10-gnomevfs (>= 0.10.0), ${misc:Depends}, ${cli:Depends}
+Depends: ${shlibs:Depends}, gstreamer0.10-gnomevfs (>= 0.10.0), ${misc:Depends}, ${cli:Depends}, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good
 Description: Simple playlist based music player
  Muine is an innovative music player. It has a simple interface designed to 
  allow the user to easily construct playlists from albums and/or single songs.
  Its goal is to be simply a music player, not to become a robust music
  management application.  It includes a plugin interface.
  .
- The package includes the CIL assemblies to access the D-BUS interface
+ The package includes the CIL assemblies to access the D-Bus interface
  to Muine and to compile plugins for Muine.
- .
- Homepage: http://muine.gooeylinux.org
 
 Package: muine-plugin-trayicon
 Architecture: all
@@ -32,9 +33,8 @@
 
 Package: muine-plugin-inotify
 Architecture: any
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, ${shlibs:Depends}
 Description: INotify Plugin for the Muine music player
  This package enables INotify support for the Muine music
  player to enable watching of music directories for new and removed
  files and directories.
-

Modified: packages/muine/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/copyright?rev=3740&op=diff
==============================================================================
--- packages/muine/trunk/debian/copyright (original)
+++ packages/muine/trunk/debian/copyright Mon Feb 25 20:58:29 2008
@@ -1,11 +1,23 @@
 This package was debianized by Link Dupont <link at subpop.net> on
 Thu,  5 Feb 2004 13:44:55 -0800.
 
-It was downloaded from http://muine.gooeylinux.org/
+Homepage: http://muine-player.org/
 
-Upstream Author: Jorn Baayen <jbaayen at gnome.org>
+Upstream Authors:
+	Jorn Baayen <jbaayen at gnome.org>
+	Lee Willis <lee at leewillis.co.uk>
+	Việt Yên Nguyá»
n <nguyen at cs.utwente.nl>
+	Tamara Roberson <tamara.roberson at gmail.com>
+	Peter Johanson <peter at peterjohanson.com>
 
 Copyright:
+	Copyright (C) 2003-2007 Jorn Baayen <jbaayen at gnome.org>
+	Copyright (C) 2004 Lee Willis <lee at leewillis.co.uk>
+	Copyright (C) 2005 Tamara Roberson <tamara.roberson at gmail.com>
+	Copyright (C) 2005 Ronald S. Bultje; 2007 Novell, Inc.
+	Copyright (C) 2004 Sean Cier
+	Copyright (C) 2000 Robert Kaye
+	Copyright (C) 2005 John McCutchan
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,5 +33,32 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
    02110-1301 USA.
 
+
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+
+Some parts like deps/dbus-sharp/, dbus-sharp-glib/ and
+plugins/NotificationArea.cs are also available under the MIT License:
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),  
+   to deal in the Software without restriction, including without limitation  
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,  
+   and/or sell copies of the Software, and to permit persons to whom the  
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in 
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+   DEALINGS IN THE SOFTWARE.
+
+See the respective source file header for any alternative licensing option
+that might be available if you want to use something else then the GPL which
+the entire work is available under.

Modified: packages/muine/trunk/debian/muine.1
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/muine.1?rev=3740&op=diff
==============================================================================
--- packages/muine/trunk/debian/muine.1 (original)
+++ packages/muine/trunk/debian/muine.1 Mon Feb 25 20:58:29 2008
@@ -11,7 +11,7 @@
 playing and album-cover fetching.
 .LP
 Muine does not have any options apart from the standard GTK
-and GNOME ones that can be found via \fBmuine --help\fR.
+and GNOME ones that can be found via \fBmuine \-\-help\fR.
 .SH AUTHOR
 Manual page authored by Dave Beckett for Debian and made available
 under the same license as Muine.

Added: packages/muine/trunk/debian/muine.docs
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/muine.docs?rev=3740&op=file
==============================================================================
--- packages/muine/trunk/debian/muine.docs (added)
+++ packages/muine/trunk/debian/muine.docs Mon Feb 25 20:58:29 2008
@@ -1,0 +1,4 @@
+NEWS
+README
+PLUGINS
+TODO

Added: packages/muine/trunk/debian/muine.exe.config
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/muine.exe.config?rev=3740&op=file
==============================================================================
--- packages/muine/trunk/debian/muine.exe.config (added)
+++ packages/muine/trunk/debian/muine.exe.config Mon Feb 25 20:58:29 2008
@@ -1,0 +1,4 @@
+<configuration>
+<dllmap dll="libmuine" target="/usr/lib/muine/libmuine.so"/>
+<dllmap dll="musicbrainz" target="libmusicbrainz.so.4"/>
+</configuration>

Modified: packages/muine/trunk/debian/muine.install
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/muine.install?rev=3740&op=diff
==============================================================================
--- packages/muine/trunk/debian/muine.install (original)
+++ packages/muine/trunk/debian/muine.install Mon Feb 25 20:58:29 2008
@@ -1,8 +1,6 @@
-debian/tmp/etc/gconf/schemas/muine.schemas
+debian/tmp/etc/gconf/schemas/muine.schemas usr/share/gconf/schemas/
 debian/tmp/usr/bin/muine
-debian/tmp/usr/lib/mono/gac/*
-debian/tmp/usr/lib/mono/muine/*
-debian/tmp/usr/lib/monodoc/sources/*
+debian/tmp/usr/lib/muine/*dll*
 debian/tmp/usr/lib/muine/muine.exe*
 debian/tmp/usr/lib/muine/muine.exe
 debian/tmp/usr/lib/muine/libmuine.so*
@@ -10,4 +8,4 @@
 debian/tmp/usr/share/applications/muine.desktop
 debian/tmp/usr/share/dbus-1/services/*
 debian/tmp/usr/share/locale
-debian/tmp/usr/share/pixmaps/muine.png
+debian/tmp/usr/share/icons/hicolor/*/apps/*.*

Added: packages/muine/trunk/debian/muine.manpages
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/muine.manpages?rev=3740&op=file
==============================================================================
--- packages/muine/trunk/debian/muine.manpages (added)
+++ packages/muine/trunk/debian/muine.manpages Mon Feb 25 20:58:29 2008
@@ -1,0 +1,1 @@
+debian/muine.1

Copied: packages/muine/trunk/debian/muine.menu (from r3739, packages/muine/trunk/debian/menu)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/muine.menu?rev=3740&op=diff
==============================================================================
--- packages/muine/trunk/debian/menu (original)
+++ packages/muine/trunk/debian/muine.menu Mon Feb 25 20:58:29 2008
@@ -1,2 +1,2 @@
-?package(muine):needs="X11" section="Apps/Sound" \
+?package(muine):needs="X11" section="Applications/Sound" \
   title="Muine Music player" command="/usr/bin/muine"

Modified: packages/muine/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/rules?rev=3740&op=diff
==============================================================================
--- packages/muine/trunk/debian/rules (original)
+++ packages/muine/trunk/debian/rules Mon Feb 25 20:58:29 2008
@@ -3,43 +3,91 @@
 
 export MONO_SHARED_DIR=$(CURDIR)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/gnome.mk
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-DEB_INSTALL_MANPAGES_muine := debian/muine.1
-DEB_CONFIGURE_EXTRA_FLAGS := 
-DEB_DH_MAKESHLIBS_ARGS := -Xlibmuine -Xlibinotify
-#DEB_MAKE_ENVVARS := 
+CFLAGS = -Wall -g
 
-common-configure-indep::
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+include /usr/share/quilt/quilt.make
+
+config.status: patch configure
+	dh_testdir
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc \
+		--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+		--enable-gstreamer=0.10
+
 	mkdir -p $(MONO_SHARED_DIR)/.wapi
 
-binary-predeb/muine::
-	dh_shlibdeps
-	dh_makeclilibs
-	dh_clideps -d
+build: build-stamp
+build-stamp: config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
 
-binary-post-install/muine::
-	chmod 644 debian/muine/usr/lib/muine/muine.exe
-	find debian -name \*.dll -exec chmod 644 {} \;
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
 
-common-binary-predeb-indep::
-	find debian -name \*.dll -exec chmod 644 {} \;
-	dh_makeclilibs
-	dh_clideps
-
-clean::
-#	rm -f data/muine.desktop data/muine.schemas
 	rm -f ./libtool src/AmazonSearchService.cs
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 	rm -f  debian/muine.substvars.new
 	find . -name \*.mdb -print | xargs rm -f
 
-# cdbs leaves junk around after patching
-	if test -r config.guess.cdbs-orig ; then \
-	  mv -f config.guess.cdbs-orig config.guess; \
-	fi
-	if test -r config.sub.cdbs-orig ; then \
-	  mv -f config.sub.cdbs-orig config.sub; \
-	fi
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_install -i --list-missing
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_strip -i
+	dh_clistrip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_clifixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_clideps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch:
+	dh_testdir
+	dh_testroot
+	dh_install -a --list-missing
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
+	dh_installmenu -a
+	dh_installman -a
+	dh_desktop -a
+	dh_strip -a
+	dh_clistrip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_clifixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_clideps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch

Modified: packages/muine/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/watch?rev=3740&op=diff
==============================================================================
--- packages/muine/trunk/debian/watch (original)
+++ packages/muine/trunk/debian/watch Mon Feb 25 20:58:29 2008
@@ -1,2 +1,2 @@
 version=3
-http://www.muine-player.org/wiki/Download http://muine-player.org/releases/muine-(.*)\.tar\.gz debian uupdate
+http://www.muine-player.org/releases/muine-([\d.]+)\.tar\.gz




More information about the Pkg-cli-apps-commits mailing list