Xubuntu Default Settings

Merge lp:~bluesabre/xubuntu-default-settings/b2_fixes into lp:~xubuntu-dev/xubuntu-default-settings/trunk

  1. b2_fixes
  2. Merge into trunk
Proposed by Sean Davis
Status: Merged
Merged at revision: 459
Proposed branch: lp:~bluesabre/xubuntu-default-settings/b2_fixes
Merge into: lp:~xubuntu-dev/xubuntu-default-settings/trunk
Diff against target: 95 lines (+19/-12)
5 files modified
debian/changelog (+9/-0)
debian/control (+1/-1)
debian/copyright (+8/-7)
debian/xubuntu-default-settings.gsettings-override (+0/-3)
usr/share/xubuntu/applications/defaults.list (+1/-1)
To merge this branch: bzr merge lp:~bluesabre/xubuntu-default-settings/b2_fixes
Reviewer Review Type Date Requested Status
Thaddaeus Tintenfisch (community) Approve
Jackson Doak Approve
Pasi Lallinaho (community) community Approve
Micah Gersten Pending
Lionel Le Folgoc Pending
Review via email: mp+187127@code.launchpad.net

Description of the change

The changes in this branch are summed up by the following debian/changelog...

xubuntu-default-settings (13.10.6) UNRELEASED; urgency=low

  * defaults.list - Use parole for mpegurl mimetype (lp: #1221426)
  * xubuntu-default-settings.gsettings-override - Remove unsupported key (lp: #1227637)
  * debian/control - Update standards version to 3.9.4
  * debian/copyright - Update to latest format specification

 -- Sean Davis <email address hidden> Mon, 23 Sep 2013 19:28:58 -0400

To post a comment you must log in.
Revision history for this message
Pasi Lallinaho (knome) :
review: Approve (community)
Revision history for this message
Jackson Doak (noskcaj) :
review: Approve
Revision history for this message
Thaddaeus Tintenfisch (thad-fisch-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-09-20 19:44:00 +0000
3+++ debian/changelog 2013-09-24 00:30:20 +0000
4@@ -1,3 +1,12 @@
5+xubuntu-default-settings (13.10.6) UNRELEASED; urgency=low
6+
7+ * defaults.list - Use parole for mpegurl mimetype (lp: #1221426)
8+ * xubuntu-default-settings.gsettings-override - Remove unsupported key (lp: #1227637)
9+ * debian/control - Update standards version to 3.9.4
10+ * debian/copyright - Update to latest format specification
11+
12+ -- Sean Davis <smd.seandavis@gmail.com> Mon, 23 Sep 2013 19:28:58 -0400
13+
14 xubuntu-default-settings (13.10.5) saucy; urgency=low
15
16 * New wallpaper for saucy (lp: #1228098):
17
18=== modified file 'debian/control'
19--- debian/control 2013-07-04 18:05:00 +0000
20+++ debian/control 2013-09-24 00:30:20 +0000
21@@ -3,7 +3,7 @@
22 Priority: optional
23 Maintainer: Xubuntu Developers <xubuntu-devel@lists.ubuntu.com>
24 Build-Depends: debhelper (>= 8.1.3~), intltool
25-Standards-Version: 3.9.2
26+Standards-Version: 3.9.4
27 Homepage: https://launchpad.net/xubuntu-default-settings
28 Vcs-Bzr: lp:xubuntu-default-settings
29 Vcs-Browser: http://bazaar.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/files
30
31=== modified file 'debian/copyright'
32--- debian/copyright 2013-03-03 22:53:18 +0000
33+++ debian/copyright 2013-09-24 00:30:20 +0000
34@@ -1,10 +1,11 @@
35-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
36-Name: Xubuntu Default Settings
37-Maintainer: Xubuntu Team <xubuntu-devel@lists.ubuntu.com>
38+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
39+Upstream-Name: Xubuntu Default Settings
40+Upstream-Contact: Xubuntu Team <xubuntu-devel@lists.ubuntu.com>
41
42 Files: *
43-Copyright: 2007-2009, Cody A.W. Somerville <cody-somerville@ubuntu.com>
44+Copyright: 2013, Sean Davis <smd-seandavis@ubuntu.com>
45 2007-2011, Lionel Le Folgoc <mrpouit@ubuntu.com>
46+ 2007-2009, Cody A.W. Somerville <cody-somerville@ubuntu.com>
47 2006-2008, Gauvain Pocentek <gauvainpocentek@ubuntu.com>
48 2005-2008, Jani Monoses <jani@ubuntu.com>
49 License: GPL-2+
50@@ -12,15 +13,15 @@
51 it under the terms of the GNU General Public License as published by
52 the Free Software Foundation; either version 2 of the License, or
53 (at your option) any later version.
54-
55+ .
56 This package is distributed in the hope that it will be useful,
57 but WITHOUT ANY WARRANTY; without even the implied warranty of
58 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
59 GNU General Public License for more details.
60-
61+ .
62 You should have received a copy of the GNU General Public License
63 along with this package; if not, write to the Free Software
64 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
65-
66+ .
67 On Debian systems the full text of the GNU General Public License version 2
68 can be found in the `/usr/share/common-licenses/GPL-2' file.
69
70=== modified file 'debian/xubuntu-default-settings.gsettings-override'
71--- debian/xubuntu-default-settings.gsettings-override 2013-07-05 17:47:06 +0000
72+++ debian/xubuntu-default-settings.gsettings-override 2013-09-24 00:30:20 +0000
73@@ -2,9 +2,6 @@
74 interested-media-players=[ 'gmusicbrowser' ]
75 show-notify-osd-on-scroll=false
76
77-[com.ubuntu.update-notifier]
78-auto-launch=false
79-
80 [org.gnome.desktop.interface]
81 gtk-theme='Greybird'
82 icon-theme='elementary-xfce-darker'
83
84=== modified file 'usr/share/xubuntu/applications/defaults.list'
85--- usr/share/xubuntu/applications/defaults.list 2013-03-16 23:01:39 +0000
86+++ usr/share/xubuntu/applications/defaults.list 2013-09-24 00:30:20 +0000
87@@ -96,7 +96,7 @@
88 application/x-zoo=file-roller.desktop
89 application/zip=file-roller.desktop
90 audio/mpeg=gmusicbrowser.desktop
91-audio/mpegurl=gmusicbrowser.desktop
92+audio/mpegurl=parole.desktop
93 audio/vnd.rn-realaudio=parole.desktop
94 audio/x-flac=gmusicbrowser.desktop
95 audio/x-m4a=gmusicbrowser.desktop

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: