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
=== modified file 'debian/changelog'
--- debian/changelog 2015-06-06 23:01:39 +0000
+++ debian/changelog 2015-06-07 21:00:38 +0000
@@ -1,5 +1,5 @@
1capnet-assist (0.1) trusty; urgency=low1capnet-assist (0.1-1) trusty; urgency=low
22
3 * Initial release3 * Initial release
44
5 -- Cody Garver <cody@elementaryos.org> Mon, 06 Apr 2015 19:47:02 -05005 -- Cody Garver <cody@elementary.io> Mon, 06 Apr 2015 19:47:02 -0500
66
=== modified file 'debian/compat'
--- debian/compat 2015-06-06 23:01:39 +0000
+++ debian/compat 2015-06-07 21:00:38 +0000
@@ -1,1 +1,1 @@
1719
22
=== modified file 'debian/control'
--- debian/control 2015-06-06 23:01:39 +0000
+++ debian/control 2015-06-07 21:00:38 +0000
@@ -1,9 +1,9 @@
1Source: capnet-assist1Source: capnet-assist
2Section: net2Section: net
3Priority: optional3Priority: optional
4Maintainer: Cody Garver <cody@elementaryos.org>4Maintainer: Cody Garver <cody@elementary.io>
5Build-Depends: cmake (>= 2.8),5Build-Depends: cmake (>= 2.8),
6 debhelper (>= 7.0.50~),6 debhelper (>= 9),
7 libglib2.0-dev,7 libglib2.0-dev,
8 libgtk-3-dev,8 libgtk-3-dev,
9 libwebkitgtk-3.0-dev,9 libwebkitgtk-3.0-dev,
1010
=== modified file 'debian/copyright'
--- debian/copyright 2015-06-06 23:01:39 +0000
+++ debian/copyright 2015-06-07 21:00:38 +0000
@@ -1,39 +1,30 @@
1This work was packaged for Debian by:1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22Upstream-Name: capnet-assist
3 Cody Garver <cody@elementaryos.org> on Thu, 22 Aug 20133Upstream-Contact: Cody Garver <cody@elementary.io>
44Source: https://launchpad.net/capnet-assist
5It was downloaded from:5
66Files: debian/*
7 https://launchpad.net/capnet-assist7Copyright: 2013-2015 Cody Garver <cody@elementary.io>
88 2015 Martin Wimpress <code@flexion.org>
9Upstream Author(s):9License: GPL-3
1010
11 Sergio Spinatelli <spinatelli.sergio@gmail.com>11Files: *
1212Copyright: 2013 Sergio Spinatelli <spinatelli.sergio@gmail.com>
13Copyright:13License: GPL-3
1414
15 Copyright (C) 2013 Sergio Spinatelli15License: GPL-3
1616 This program is free software: you can redistribute it and/or modify
17License:17 it under the terms of the GNU General Public License as published by
1818 the Free Software Foundation, either version 3 of the License, or
19 This program is free software: you can redistribute it and/or modify19 (at your option) any later version.
20 it under the terms of the GNU General Public License as published by20 .
21 the Free Software Foundation, either version 3 of the License, or21 This package is distributed in the hope that it will be useful,
22 (at your option) any later version.22 but WITHOUT ANY WARRANTY; without even the implied warranty of
2323 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 This package is distributed in the hope that it will be useful,24 GNU General Public License for more details.
25 but WITHOUT ANY WARRANTY; without even the implied warranty of25 .
26 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the26 You should have received a copy of the GNU General Public License
27 GNU General Public License for more details.27 along with this program. If not, see <http://www.gnu.org/licenses/>.
2828 .
29 You should have received a copy of the GNU General Public License29 On Debian systems, the complete text of the GNU General
30 along with this program. If not, see <http://www.gnu.org/licenses/>.30 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
31
32On Debian systems, the complete text of the GNU General
33Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
34
35The Debian packaging is:
36
37 Copyright (C) 2013 Cody Garver <cody@elementaryos.org>
38
39and is licensed under the GPL version 3, see above.
4031
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2015-06-07 21:00:38 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)

Subscribers

People subscribed via source and target branches