Merge lp:~unit193/xubuntu-docs/pkging-updates into lp:xubuntu-docs/zesty

Proposed by Unit 193 on 2017-04-07
Status: Merged
Merged at revision: 635
Proposed branch: lp:~unit193/xubuntu-docs/pkging-updates
Merge into: lp:xubuntu-docs/zesty
Diff against target: 90 lines (+18/-11)
3 files modified
debian/changelog (+13/-5)
debian/control (+3/-4)
debian/copyright (+2/-2)
To merge this branch: bzr merge lp:~unit193/xubuntu-docs/pkging-updates
Reviewer Review Type Date Requested Status
Pasi Lallinaho 2017-04-07 Pending
Review via email: mp+322175@code.launchpad.net

Description of the Change

Packaging updates from upload to Zesty.

To post a comment you must log in.

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 2017-04-06 22:19:27 +0000
3+++ debian/changelog 2017-04-07 00:26:10 +0000
4@@ -1,14 +1,12 @@
5-xubuntu-docs (17.04) UNRELEASED; urgency=medium
6+xubuntu-docs (17.04) zesty; urgency=medium
7
8 [ flocculant ]
9- * Changes to contributor docs following review
10- * Changes as per review
11+ * Changes to contributor docs.
12
13 [ Krytarik Raido ]
14 * Syntax, formatting, typo, and wording fixes.
15
16 [ Pasi Lallinaho ]
17- * d/copyright: Update copyright year for both user and contributor documentation
18 * Improvements for contributor docs:
19 - Update the tracker description (and more importantly, link)
20 in the important places section.
21@@ -22,6 +20,7 @@
22 - Add documentation for the documentation team
23 - Control which elements get a ToC printed with them
24 * General fixes:
25+ - Update copyright year for both user and contributor documentation
26 - Fix icon placement inside notes etc.
27 - Update development release entity
28 - Clean up the header navigation template
29@@ -32,7 +31,16 @@
30 * Update the startpage to be release-agnostic
31 * Synchronize translations from Launchpad manually
32
33- -- Pasi Lallinaho <pasi@shimmerproject.org> Thu, 06 Apr 2017 13:53:56 +0300
34+ [ Unit 193 ]
35+ * d/copyright:
36+ - Update years.
37+ - Switch to https on the format url.
38+ * d/control:
39+ - Update maintainer to Xubuntu Documentation Team <xubuntu-devel@lists.ubuntu.com>
40+ - Drop versioned depend on coreutils.
41+ * Update standards-version to 3.9.8.
42+
43+ -- Unit 193 <unit193@ubuntu.com> Thu, 06 Apr 2017 19:54:40 -0400
44
45 xubuntu-docs (16.10) yakkety; urgency=medium
46
47
48=== modified file 'debian/control'
49--- debian/control 2016-03-10 21:26:26 +0000
50+++ debian/control 2017-04-07 00:26:10 +0000
51@@ -1,9 +1,8 @@
52 Source: xubuntu-docs
53 Section: doc
54 Priority: optional
55-Maintainer: Ubuntu Documentation Team <ubuntu-doc@lists.ubuntu.com>
56-Build-Depends: coreutils (>= 8.16),
57- debhelper (>= 9),
58+Maintainer: Xubuntu Documentation Team <xubuntu-devel@lists.ubuntu.com>
59+Build-Depends: debhelper (>= 9),
60 default-jre,
61 docbook-xml,
62 docbook-xsl,
63@@ -12,7 +11,7 @@
64 fop,
65 gnome-doc-utils,
66 xsltproc
67-Standards-Version: 3.9.6
68+Standards-Version: 3.9.8
69
70 Package: xubuntu-docs
71 Architecture: all
72
73=== modified file 'debian/copyright'
74--- debian/copyright 2015-08-31 21:55:12 +0000
75+++ debian/copyright 2017-04-07 00:26:10 +0000
76@@ -1,4 +1,4 @@
77-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
78+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
79 Upstream-Name: Xubuntu documentation
80 Upstream-Contact: Xubuntu Documentation Team <xubuntu-devel@lists.ubuntu.com>
81 Source: https://launchpad.net/xubuntu-docs
82@@ -7,7 +7,7 @@
83
84 Files: *
85 Copyright: 2004-2012, Ubuntu Documentation Team, The Xubuntu Team
86- 2012-2015, The Xubuntu Documentation Team
87+ 2012-2017, The Xubuntu Documentation Team
88 License: CC-BY-SA-2.5
89
90 License: CC-BY-SA-2.5

Subscribers

People subscribed via source and target branches