[Python-apps-commits] r1878 - in packages/decibel-audio-player/trunk/debian (6 files)

pochu-guest at users.alioth.debian.org pochu-guest at users.alioth.debian.org
Sun Oct 5 10:01:43 UTC 2008


    Date: Sunday, October 5, 2008 @ 10:01:42
  Author: pochu-guest
Revision: 1878

* debian/patches/fix_library_empty_tags.dpatch:
  - Fix Library module not loading when a track has an empty artist
    tag. Closes: #500757.
* debian/control,
  debian/rules:
  - Add patch system.

Added:
  packages/decibel-audio-player/trunk/debian/patches/
  packages/decibel-audio-player/trunk/debian/patches/00list
  packages/decibel-audio-player/trunk/debian/patches/fix_library_empty_tags.dpatch
Modified:
  packages/decibel-audio-player/trunk/debian/changelog
  packages/decibel-audio-player/trunk/debian/control
  packages/decibel-audio-player/trunk/debian/rules

Modified: packages/decibel-audio-player/trunk/debian/changelog
===================================================================
--- packages/decibel-audio-player/trunk/debian/changelog	2008-09-30 14:59:50 UTC (rev 1877)
+++ packages/decibel-audio-player/trunk/debian/changelog	2008-10-05 10:01:42 UTC (rev 1878)
@@ -1,3 +1,14 @@
+decibel-audio-player (0.11-2) unstable; urgency=low
+
+  * debian/patches/fix_library_empty_tags.dpatch:
+    - Fix Library module not loading when a track has an empty artist
+      tag. Closes: #500757.
+  * debian/control,
+    debian/rules:
+    - Add patch system.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sun, 05 Oct 2008 11:57:06 +0200
+
 decibel-audio-player (0.11-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/decibel-audio-player/trunk/debian/control
===================================================================
--- packages/decibel-audio-player/trunk/debian/control	2008-09-30 14:59:50 UTC (rev 1877)
+++ packages/decibel-audio-player/trunk/debian/control	2008-10-05 10:01:42 UTC (rev 1878)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at ubuntu.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: python (>=2.4), python-central (>= 0.5.6)
 Standards-Version: 3.8.0
 Homepage: http://decibel.silent-blade.org/

Added: packages/decibel-audio-player/trunk/debian/patches/00list
===================================================================
--- packages/decibel-audio-player/trunk/debian/patches/00list	                        (rev 0)
+++ packages/decibel-audio-player/trunk/debian/patches/00list	2008-10-05 10:01:42 UTC (rev 1878)
@@ -0,0 +1 @@
+fix_library_empty_tags.dpatch

Added: packages/decibel-audio-player/trunk/debian/patches/fix_library_empty_tags.dpatch
===================================================================
--- packages/decibel-audio-player/trunk/debian/patches/fix_library_empty_tags.dpatch	                        (rev 0)
+++ packages/decibel-audio-player/trunk/debian/patches/fix_library_empty_tags.dpatch	2008-10-05 10:01:42 UTC (rev 1878)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_library_empty_tags.dpatch by Emilio Pozuelo Monfort <pochu at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500757
+## DP: Fix Library module so that it doesn't fail when a file has an empty artist tag
+
+ at DPATCH@
+diff -ruNp decibel-audio-player-0.11/src/modules/Library.py decibel-audio-player-0.11.new/src/modules/Library.py
+--- decibel-audio-player-0.11/src/modules/Library.py	2008-08-21 09:55:28.000000000 +0200
++++ decibel-audio-player-0.11.new/src/modules/Library.py	2008-10-05 11:46:45.000000000 +0200
+@@ -361,7 +361,7 @@ class Library(modules.Module):
+         """ Load the given library """
+         rows     = []
+         path     = os.path.join(ROOT_PATH, name)
+-        prevChar = None
++        prevChar = ''
+ 
+         # Make sure the version number is the good one
+         if not os.path.exists(os.path.join(path, 'VERSION_%u' % VERSION)):
+@@ -375,7 +375,7 @@ class Library(modules.Module):
+             if len(artist[ART_NAME]) != 0: currChar = unicode(artist[ART_NAME], errors='replace')[0]
+             else:                          currChar = prevChar
+ 
+-            if prevChar is None or (prevChar != currChar and not (prevChar.isdigit() and currChar.isdigit())):
++            if prevChar != currChar and not (prevChar.isdigit() and currChar.isdigit()):
+                 prevChar = currChar
+                 if currChar.isdigit(): rows.append((None, '<b>0 - 9</b>',         TYPE_HEADER, None, None))
+                 else:                  rows.append((None, '<b>%s</b>' % currChar, TYPE_HEADER, None, None))

Modified: packages/decibel-audio-player/trunk/debian/rules
===================================================================
--- packages/decibel-audio-player/trunk/debian/rules	2008-09-30 14:59:50 UTC (rev 1877)
+++ packages/decibel-audio-player/trunk/debian/rules	2008-10-05 10:01:42 UTC (rev 1878)
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
 
-build:
+build: patch
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp




More information about the Python-apps-commits mailing list