xubuntu-artwork

Merge lp:~noskcaj/xubuntu-artwork/trusty into lp:~xubuntu-art/xubuntu-artwork/trusty

  1. trusty
  2. Merge into trusty
Proposed by Jackson Doak
Status: Merged
Merge reported by: Simon Steinbeiß
Merged at revision: not available
Proposed branch: lp:~noskcaj/xubuntu-artwork/trusty
Merge into: lp:~xubuntu-art/xubuntu-artwork/trusty
Diff against target: 62 lines (+13/-7)
4 files modified
debian/changelog (+4/-0)
debian/compat (+1/-1)
debian/control (+3/-3)
debian/copyright (+5/-3)
To merge this branch: bzr merge lp:~noskcaj/xubuntu-artwork/trusty
Reviewer Review Type Date Requested Status
Simon Steinbeiß Approve
Review via email: mp+207366@code.launchpad.net

Description of the change

Minor packaging fixes

To post a comment you must log in.
Revision history for this message
Simon Steinbeiß (ochosi) wrote :

Looks good to me, approved.

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 2014-02-18 14:23:31 +0000
3+++ debian/changelog 2014-02-20 08:43:20 +0000
4@@ -3,6 +3,10 @@
5 * Update icon-theme from github
6 * Bump version in plymouth-theme to 14.04
7 * Fix messages in graphical plymouth-theme
8+ * debian/control:
9+ - Bump standards-version to 3.9.5 (no changes)
10+ - Use debhelper 9
11+ * Use DEP-5 copyright format
12
13 -- Simon Steinbeiss <ochosi@shimmerproject.org> Tue, 18 Feb 2014 15:24:17 +0200
14
15
16=== modified file 'debian/compat'
17--- debian/compat 2009-06-12 19:58:45 +0000
18+++ debian/compat 2014-02-20 08:43:20 +0000
19@@ -1,1 +1,1 @@
20-7
21+9
22
23=== modified file 'debian/control'
24--- debian/control 2012-08-16 15:59:09 +0000
25+++ debian/control 2014-02-20 08:43:20 +0000
26@@ -2,10 +2,10 @@
27 Section: x11
28 Priority: optional
29 Maintainer: Xubuntu Developers <xubuntu-devel@lists.ubuntu.com>
30-Build-Depends: debhelper (>= 7.0.50~)
31-Standards-Version: 3.9.1
32+Build-Depends: debhelper (>= 9)
33+Standards-Version: 3.9.5
34 Vcs-Bzr: lp:xubuntu-artwork
35-Vcs-Browser: http://bazaar.launchpad.net/~xubuntu-art/xubuntu-artwork/maverick/files
36+Vcs-Browser: http://bazaar.launchpad.net/~xubuntu-art/xubuntu-artwork/trusty/files
37
38 Package: xubuntu-artwork
39 Architecture: all
40
41=== modified file 'debian/copyright'
42--- debian/copyright 2012-01-18 22:07:37 +0000
43+++ debian/copyright 2014-02-20 08:43:20 +0000
44@@ -1,6 +1,7 @@
45-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
46-Name: Xubuntu Artwork
47-Maintainer: Xubuntu Team <xubuntu-devel@lists.ubuntu.com>
48+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
49+Upstream-Name: Xubuntu Artwork
50+Upstream-Contact: Xubuntu Team <xubuntu-devel@lists.ubuntu.com>
51+Source: https://launchpad.net/xubuntu-artwork
52
53 Files: lib/*
54 Copyright: 2009 Canonical Ltd.
55@@ -60,6 +61,7 @@
56 2007-2012, Lionel Le Folgoc <mrpouit@ubuntu.com>
57 2006-2008, Gauvain Pocentek <gauvainpocentek@ubuntu.com>
58 2005-2008, Jani Monoses <jani@ubuntu.com>
59+ 2014, Jackson Doak <noskcaj@ubuntu.com>
60 License: GPL-2+
61 On Debian systems the full text of the GNU General Public License can be found
62 in the `/usr/share/common-licenses/GPL-2' file.

Subscribers

People subscribed via source and target branches

to all changes: