~ubuntu-branches/ubuntu/oneiric/unity/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes-4.16.0-0ubuntu2

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2011-09-20 08:17:34 UTC
  • Revision ID: package-import@ubuntu.com-20110920081734-bpyzw1txrv9fkmcy
Tags: 4.16.0-0ubuntu2
* com.canonical.Unity.gschema.xml:
  - add Update-notifier to the whitelist (LP: #779382)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Upstream changes introduced in version 4.16.0-0ubuntu2
 
2
 This patch has been created by dpkg-source during the package build.
 
3
 Here's the last changelog entry, hopefully it gives details on why
 
4
 those changes were made:
 
5
 .
 
6
 unity (4.16.0-0ubuntu2) oneiric; urgency=low
 
7
 .
 
8
   * com.canonical.Unity.gschema.xml:
 
9
     - add Update-notifier to the whitelist (LP: #779382)
 
10
 .
 
11
 The person named in the Author field signed this changelog entry.
 
12
Author: Didier Roche <didrocks@ubuntu.com>
 
13
Bug-Ubuntu: https://bugs.launchpad.net/bugs/779382
 
14
 
 
15
---
 
16
The information above should follow the Patch Tagging Guidelines, please
 
17
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 
18
are templates for supplementary fields that you might want to add:
 
19
 
 
20
Origin: <vendor|upstream|other>, <url of original patch>
 
21
Bug: <url in upstream bugtracker>
 
22
Bug-Debian: http://bugs.debian.org/<bugnumber>
 
23
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 
24
Forwarded: <no|not-needed|url proving that it has been forwarded>
 
25
Reviewed-By: <name and email of someone who approved the patch>
 
26
Last-Update: <YYYY-MM-DD>
 
27
 
 
28
--- unity-4.16.0.orig/com.canonical.Unity.gschema.xml
 
29
+++ unity-4.16.0/com.canonical.Unity.gschema.xml
 
30
@@ -40,7 +40,7 @@
 
31
   </schema>
 
32
        <schema path="/desktop/unity/panel/" id="com.canonical.Unity.Panel" gettext-domain="unity">
 
33
     <key type="as" name="systray-whitelist">
 
34
-      <default>[ 'JavaEmbeddedFrame', 'Wine', 'scp-dbus-service' ]</default>
 
35
+      <default>[ 'JavaEmbeddedFrame', 'Wine', 'scp-dbus-service', 'Update-notifier' ]</default>
 
36
       <summary>List of client names, resource classes or wm classes to allow in the Panel's systray implementation.</summary>
 
37
       <description>"" (empty) will not allow any tray icons, "all" will allow all tray icons, otherwise there will be an attempt to match each icon to a value here.</description>
 
38
     </key>
 
39
--- unity-4.16.0.orig/services/CMakeLists.txt
 
40
+++ unity-4.16.0/services/CMakeLists.txt
 
41
@@ -39,7 +39,7 @@ set(CFLAGS
 
42
     "-DGETTEXT_PACKAGE=\"unity\""
 
43
     "-DINDICATORDIR=\"${_indicatordir}\""
 
44
     "-DINDICATORICONDIR=\"${_iconsdir}\""
 
45
-    "-Werror -Wall"
 
46
+    "-Wall"
 
47
     )
 
48
 add_definitions(${CFLAGS})
 
49