← Back to branch summary

~ubuntu-branches/debian/squeeze/devicekit-disks/squeeze

« back to all changes in this revision

Viewing changes to debian/patches/07-media-player-icon.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl, Martin Pitt, Michael Biebl
  • Date: 2009-11-05 14:26:06 UTC
  • mfrom: (1.2.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20091105142606-gv7df6uk7s7voro1
Tags: 009-1
http://bugs.debian.org/548758
http://bugs.debian.org/545032
[ Martin Pitt ]
* New upstream release.
* 08-dont-probe-dm-devices.patch: Update for new release.
* Drop 07-media-player-icon.patch as well, it was included upstream in 008.
* debian/devicekit-disks.postinst: Update udev after installation to pick up
  (changes of) our udev rules. (Closes: #548758)
* debian/control: Add missing udev dependency.
* debian/control: Add dependencies to various file system tools which DK-D
  uses to implement its functionality:
  - Recommends: dosfstools, mtools, ntfs-3g (the more popular ones)
  - Suggests: xfsprogs, reiserfsprogs, mdadm, cryptsetup
* Add 00git-lv-nopolicy.patch: Fix LVM LVs to have NOPOLICY=1 again.
  (Accepted into upstream trunk.)

[ Michael Biebl ]
* debian/patches/08-dont-probe-dm-devices.patch
  - Skip probing dm devices (using devkit-disks-part-id) for which DM_HIDE
    is set. (Closes: #545032)
  - Instead of checking for DKD_DM_STATE, test if DM_NAME is setup.
* Add debian/README.source which refers to the quilt documentation.
* debian/control: Add Recommends on ntfsprogs for proper NTFS support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07-media-player-icon.patch
1
 
From 425dc0aaf6c34992e45165434e56ad72a9308937 Mon Sep 17 00:00:00 2001
2
 
From: Martin Pitt <martin.pitt@ubuntu.com>
3
 
Date: Tue, 13 Oct 2009 15:13:57 +0200
4
 
Subject: [PATCH 4/4] =?utf-8?q?Bug=2024499=20=E2=80=93=20media=20players=20have=20USB=20drive=20icon?=
5
 
MIME-Version: 1.0
6
 
Content-Type: text/plain; charset=utf-8
7
 
Content-Transfer-Encoding: 8bit
8
 
 
9
 
Set "media-player" icon for devices which have ID_MEDIA_PLAYER (as set by
10
 
media-player-info).
11
 
---
12
 
 data/95-devkit-disks.rules |    4 ++++
13
 
 1 files changed, 4 insertions(+), 0 deletions(-)
14
 
 
15
 
Index: devicekit-disks/data/95-devkit-disks.rules
16
 
===================================================================
17
 
--- devicekit-disks.orig/data/95-devkit-disks.rules     2009-10-16 22:57:48.000000000 +0200
18
 
+++ devicekit-disks/data/95-devkit-disks.rules  2009-10-16 23:02:57.000000000 +0200
19
 
@@ -95,6 +95,10 @@
20
 
 #
21
 
 ENV{ID_MEDIA_PLAYER}=="?*", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player"
22
 
 
23
 
+# Generic music player
24
 
+#
25
 
+ENV{ID_MEDIA_PLAYER}=="?*", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player"
26
 
+
27
 
 # Apple iPod Video
28
 
 #
29
 
 ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1209", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player-ipod-white"