[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#612908: diff (quilt) file



Here are the changes in the revision I had uploaded:

--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+mpdscribble (0.22-3) unstable; urgency=low
+
+  * New Maintainer (Closes: #612908).
+  * debian/control:
+    - Bumped standards version to 3.9.3.
+  * debian/copyright:
+    - Switched to DEP-5 format 1.0.
+  * Added "status" support to its init.d script.
+  * Bumped debhelper compatibility level to 8.
+
+ -- Daniel Martí <danielmarti.debian@gmail.com>  Sat, 03 Mar 2012 09:33:57 +0100
+
 mpdscribble (0.22-2) unstable; urgency=low
 
   * QA upload.
--- a/compat
+++ b/compat
@@ -1 +1 @@
-7
+8
--- a/control
+++ b/control
@@ -1,13 +1,13 @@
 Source: mpdscribble
 Section: sound
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 7.0.50), 
+Maintainer: Daniel Martí <danielmarti.debian@gmail.com>
+Build-Depends: debhelper (>= 9), 
     autotools-dev, 
     libsoup2.4-dev, 
     libmpdclient-dev,
     po-debconf
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/mpdscribble/trunk/
 Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/mpdscribble/trunk/
 Homepage: http://mpd.wikia.com/wiki/Client:Mpdscribble
--- a/copyright
+++ b/copyright
@@ -1,7 +1,6 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=420
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mpdscribble
-Upstream-Maintainer: Max Kellermann <max@duempel.org>
+Upstream-Contact: Max Kellermann <max@duempel.org>
 Upstream-Source: http://sourceforge.net/project/showfiles.php?group_id=81117
 
 Files: *
@@ -10,7 +9,7 @@
  On Debian systems the full text of the GNU General Public License can be found
  in the `/usr/share/common-licenses/GPL-2' file.
 
-Files: src/log.c, src/cmdline.c, src/daemon.c
+Files: src/log.c src/cmdline.c src/daemon.c
 Copyright: (c) 2004-2008 The Music Player Daemon Project
 License: GPL-2+
  On Debian systems the full text of the GNU General Public License can be found
@@ -22,18 +21,14 @@
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
-
  - Redistributions of source code must retain the above copyright
  notice, this list of conditions and the following disclaimer.
-
  - Redistributions in binary form must reproduce the above copyright
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
-
  - Neither the name of the Music Player Daemon nor the names of its
  contributors may be used to endorse or promote products derived from
  this software without specific prior written permission.
-
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -47,7 +42,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: Copyright 2005-2009 Michal Čihař <nijel@debian.org>
+Copyright: 2005-2009 Michal Čihař <nijel@debian.org>
 License: GPL-2+
  On Debian systems the full text of the GNU General Public License can be found
- in the `/usr/share/common-licenses/GP-2L' file.
+ in the `/usr/share/common-licenses/GPL-2' file.
--- a/mpdscribble.init
+++ b/mpdscribble.init
@@ -54,6 +54,9 @@
     sleep 1
     sh $0 start
     ;;
+  status)
+    status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+    ;;
   *)
     N=/etc/init.d/$NAME
     echo "Usage: $N {start|stop|restart|force-reload}" >&2

I hope they are of use to you.

Cheers!
-- 
Daniel Martí - mvdan.cc - 0x58BF72C3

Attachment: signature.asc
Description: Digital signature


Reply to: