Merge lp:~elementary-dev-community/capnet-assist/deb-packaging into lp:~elementary-os/capnet-assist/deb-packaging

Proposed by Cameron Norman
Status: Merged
Merged at revision: 3
Proposed branch: lp:~elementary-dev-community/capnet-assist/deb-packaging
Merge into: lp:~elementary-os/capnet-assist/deb-packaging
Diff against target: 115 lines (+36/-44)
5 files modified
debian/changelog (+2/-2)
debian/compat (+1/-1)
debian/control (+2/-2)
debian/copyright (+30/-39)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~elementary-dev-community/capnet-assist/deb-packaging
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+261324@code.launchpad.net

This proposal supersedes a proposal from 2015-06-07.

Description of the change

These are basically the changes that the MATE dev made, except I made the package non-native instead of native (https://www.debian.org/doc/manuals/maint-guide/first.en.html#non-native-dh-make).

To post a comment you must log in.
3. By Cody Garver

Newer email address

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 2015-06-06 23:01:39 +0000
3+++ debian/changelog 2015-06-07 21:00:38 +0000
4@@ -1,5 +1,5 @@
5-capnet-assist (0.1) trusty; urgency=low
6+capnet-assist (0.1-1) trusty; urgency=low
7
8 * Initial release
9
10- -- Cody Garver <cody@elementaryos.org> Mon, 06 Apr 2015 19:47:02 -0500
11+ -- Cody Garver <cody@elementary.io> Mon, 06 Apr 2015 19:47:02 -0500
12
13=== modified file 'debian/compat'
14--- debian/compat 2015-06-06 23:01:39 +0000
15+++ debian/compat 2015-06-07 21:00:38 +0000
16@@ -1,1 +1,1 @@
17-7
18+9
19
20=== modified file 'debian/control'
21--- debian/control 2015-06-06 23:01:39 +0000
22+++ debian/control 2015-06-07 21:00:38 +0000
23@@ -1,9 +1,9 @@
24 Source: capnet-assist
25 Section: net
26 Priority: optional
27-Maintainer: Cody Garver <cody@elementaryos.org>
28+Maintainer: Cody Garver <cody@elementary.io>
29 Build-Depends: cmake (>= 2.8),
30- debhelper (>= 7.0.50~),
31+ debhelper (>= 9),
32 libglib2.0-dev,
33 libgtk-3-dev,
34 libwebkitgtk-3.0-dev,
35
36=== modified file 'debian/copyright'
37--- debian/copyright 2015-06-06 23:01:39 +0000
38+++ debian/copyright 2015-06-07 21:00:38 +0000
39@@ -1,39 +1,30 @@
40-This work was packaged for Debian by:
41-
42- Cody Garver <cody@elementaryos.org> on Thu, 22 Aug 2013
43-
44-It was downloaded from:
45-
46- https://launchpad.net/capnet-assist
47-
48-Upstream Author(s):
49-
50- Sergio Spinatelli <spinatelli.sergio@gmail.com>
51-
52-Copyright:
53-
54- Copyright (C) 2013 Sergio Spinatelli
55-
56-License:
57-
58- This program is free software: you can redistribute it and/or modify
59- it under the terms of the GNU General Public License as published by
60- the Free Software Foundation, either version 3 of the License, or
61- (at your option) any later version.
62-
63- This package is distributed in the hope that it will be useful,
64- but WITHOUT ANY WARRANTY; without even the implied warranty of
65- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
66- GNU General Public License for more details.
67-
68- You should have received a copy of the GNU General Public License
69- along with this program. If not, see <http://www.gnu.org/licenses/>.
70-
71-On Debian systems, the complete text of the GNU General
72-Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
73-
74-The Debian packaging is:
75-
76- Copyright (C) 2013 Cody Garver <cody@elementaryos.org>
77-
78-and is licensed under the GPL version 3, see above.
79+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
80+Upstream-Name: capnet-assist
81+Upstream-Contact: Cody Garver <cody@elementary.io>
82+Source: https://launchpad.net/capnet-assist
83+
84+Files: debian/*
85+Copyright: 2013-2015 Cody Garver <cody@elementary.io>
86+ 2015 Martin Wimpress <code@flexion.org>
87+License: GPL-3
88+
89+Files: *
90+Copyright: 2013 Sergio Spinatelli <spinatelli.sergio@gmail.com>
91+License: GPL-3
92+
93+License: GPL-3
94+ This program is free software: you can redistribute it and/or modify
95+ it under the terms of the GNU General Public License as published by
96+ the Free Software Foundation, either version 3 of the License, or
97+ (at your option) any later version.
98+ .
99+ This package is distributed in the hope that it will be useful,
100+ but WITHOUT ANY WARRANTY; without even the implied warranty of
101+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
102+ GNU General Public License for more details.
103+ .
104+ You should have received a copy of the GNU General Public License
105+ along with this program. If not, see <http://www.gnu.org/licenses/>.
106+ .
107+ On Debian systems, the complete text of the GNU General
108+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
109
110=== added directory 'debian/source'
111=== added file 'debian/source/format'
112--- debian/source/format 1970-01-01 00:00:00 +0000
113+++ debian/source/format 2015-06-07 21:00:38 +0000
114@@ -0,0 +1,1 @@
115+3.0 (quilt)

Subscribers

People subscribed via source and target branches