Switchboard

Merge lp:~elementary-pantheon/switchboard/deb-packaging-isis into lp:~elementary-os/switchboard/deb-packaging

  1. deb-packaging-isis
  2. Merge into deb-packaging
Proposed by Corentin Noël
Status: Superseded
Proposed branch: lp:~elementary-pantheon/switchboard/deb-packaging-isis
Merge into: lp:~elementary-os/switchboard/deb-packaging
Prerequisite: lp:~elementary-pantheon/switchboard/switchboard-gmodule
Diff against target: 215 lines (+80/-53)
8 files modified
debian/changelog (+7/-1)
debian/compat (+1/-1)
debian/control (+36/-10)
debian/copyright (+25/-39)
debian/libswitchboard-2.0-0.install (+1/-0)
debian/libswitchboard-2.0-dev.install (+5/-0)
debian/rules (+2/-2)
debian/switchboard.install (+3/-0)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard/deb-packaging-isis
Reviewer Review Type Date Requested Status
Rico Tzschichholz Needs Fixing
Cody Garver (community) Needs Information
Review via email: mp+195423@code.launchpad.net

This proposal supersedes a proposal from 2013-11-15.

This proposal has been superseded by a proposal from 2014-01-02.

Description of the change

Changed Gtk version to 3.10
Bump to debhelper 9

To post a comment you must log in.
Revision history for this message
Rico Tzschichholz (ricotz) wrote : Posted in a previous version of this proposal

Propose it against the correct branch https://code.launchpad.net/~elementary-os/switchboard/deb-packaging

review: Disapprove
Revision history for this message
Corentin Noël (tintou) wrote :

Indeed, I forgot to change that

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

rebase it on the actual target branch, so only add your intended changes of r20

review: Needs Fixing
Revision history for this message
Rico Tzschichholz (ricotz) wrote :

<ricotz> tintou, since this is a new switchboard library you can start with 0 rather than 2
<tintou> ricotz: yes, but I think it's maybe better to follow switchboard version scheme
<ricotz> usr/lib/*/libswitchboard.so needs to go in the dev package
<ricotz> tintou, no, if you want a version then call it libswitchboard-2.0.so.0
<ricotz> which would be an API version

review: Needs Fixing
Revision history for this message
Cody Garver (codygarver) wrote :

Instead of "untable" in the debian/changelog, it should say "UNRELEASED"

review: Needs Fixing
Revision history for this message
Cody Garver (codygarver) wrote :

Why change debian/source/format from "native" to "quilt" if there are no patches?

review: Needs Information
Revision history for this message
Corentin Noël (tintou) wrote :

Okay, so I've changed the branch:
 * using native instead of quilt
 * UNRELEASED instead of untable
 * libswitchboard2 -> libswitchboard-2.0
 * added .so to libswitchboard-dev

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

The package which contains libswitchboard-2.0.so.0 needs to be calls libswitchboard-2.0-0

review: Needs Fixing
Revision history for this message
Rico Tzschichholz (ricotz) wrote :

libswitchboard-dev > libswitchboard-2.0-dev

review: Needs Fixing
lp:~elementary-pantheon/switchboard/deb-packaging-isis updated
19. By Corentin Noël

Version 2.0, added libpeas, new libswitchboard-2.0-0 package, compat 9…

20. By Corentin Noël

Fixed library development package name

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

The Switchboard-2.0.typelib file needs to be located in a package named "gir1.2-switchboard-2.0"

review: Needs Fixing
lp:~elementary-pantheon/switchboard/deb-packaging-isis updated
21. By Corentin Noël

added gir package

22. By Corentin Noël

fixed copyright

23. By Corentin Noël

Ported to the gmodule one

24. By Corentin Noël

changelog now says now using gmodule

25. By Corentin Noël

Now in 2014

26. By Corentin Noël

Fixed some warnings and packaging path

27. By Corentin Noël

Correct path

28. By Corentin Noël

fixed issues

29. By Corentin Noël

Now with a working version

30. By Corentin Noël

Droped useless override_dh_auto_install

Unmerged revisions

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-06-20 09:23:01 +0000
3+++ debian/changelog 2014-01-02 16:50:05 +0000
4@@ -1,3 +1,9 @@
5+switchboard (2.0.0) UNRELEASED; urgency=low
6+
7+ * Now using gmodule
8+
9+ -- Corentin "tintou" Noël <tintou@mailoo.org> Sat, 09 Nov 2013 14:29:41 +0100
10+
11 switchboard (1.0.1) precise; urgency=low
12
13 * No more appmenu
14@@ -20,4 +26,4 @@
15
16 * Initial Release.
17
18- -- Sergey "Shnatsel" Davidoff <shnatsel@gmail.com> Thu, 23 Jun 2011 20:00:31 +0400
19+ -- Sergey "Shnatsel" Davidoff <shnatsel@gmail.com> Thu, 23 Jun 2011 20:00:31 +0400
20\ No newline at end of file
21
22=== modified file 'debian/compat'
23--- debian/compat 2011-06-23 16:33:42 +0000
24+++ debian/compat 2014-01-02 16:50:05 +0000
25@@ -1,1 +1,1 @@
26-7
27+9
28
29=== modified file 'debian/control'
30--- debian/control 2013-09-30 06:40:54 +0000
31+++ debian/control 2014-01-02 16:50:05 +0000
32@@ -3,34 +3,60 @@
33 Priority: optional
34 Maintainer: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
35 Build-Depends: cmake (>= 2.8),
36- debhelper (>= 7.0.50~),
37+ debhelper (>= 9),
38 libclutter-gtk-1.0-dev,
39 libgee-dev (>= 0.5.3),
40 libglib2.0-dev (>= 2.26.0),
41 libgranite-dev,
42- libgtk-3-dev (>= 3.6.0),
43+ libgtk-3-dev (>= 3.10.0),
44 libunity-dev,
45- valac (>= 0.18)
46-Standards-Version: 3.8.4
47+ valac (>= 0.22)
48+Standards-Version: 3.9.5
49 Homepage: https://launchpad.net/switchboard
50 Vcs-Bzr: lp:switchboard
51-Vcs-Browser: https://code.launchpad.net/~switchboard-devs/switchboard/switchboard
52+Vcs-Browser: https://code.launchpad.net/~elementary-pantheon/switchboard/switchboard
53
54 Package: switchboard
55 Architecture: any
56-Depends: ${misc:Depends}, ${shlibs:Depends}
57+Depends: libswitchboard-2.0-0 (= ${binary:Version}),
58+ ${misc:Depends},
59+ ${shlibs:Depends}
60 Pre-Depends: dpkg (>= 1.15.6)
61-Description: Modular desktop settings hub
62+Description: Modular Settings Hub
63 Desktop application that manages Switchboard Plugs.
64
65 Package: switchboard-dbg
66 Architecture: any
67 Section: debug
68 Priority: extra
69-Depends: switchboard (= ${binary:Version}), ${misc:Depends}
70+Depends: switchboard (= ${binary:Version}),
71+ ${misc:Depends}
72 Pre-Depends: dpkg (>= 1.15.6)
73 Enhances: switchboard
74-Description: Modular desktop settings hub (debugging symbols)
75+Description: Modular Settings Hub - debug symbols
76 Desktop application that manages Switchboard Plugs.
77 .
78- This package contains debugging symbols for switchboard.
79+ This package contains detached debugging symbols.
80+ .
81+ Most people will not need this package.
82+
83+Package: libswitchboard-2.0-dev
84+Section: libdevel
85+Architecture: any
86+Depends: libswitchboard-2.0-0 (= ${binary:Version}),
87+ ${misc:Depends}
88+Description: Modular Settings Hub - development files
89+ Common library to create plugs (settings panels).
90+ .
91+ This package contains the header and development files which are
92+ needed for building Switchboard plugs.
93+
94+Package: libswitchboard-2.0-0
95+Section: libs
96+Architecture: any
97+Depends: ${misc:Depends},
98+ ${shlibs:Depends}
99+Description: Modular Settings Hub - shared libraries
100+ Common library to create plugs (settings panels).
101+ .
102+ This package contains the shared library.
103\ No newline at end of file
104
105=== modified file 'debian/copyright'
106--- debian/copyright 2011-06-23 16:33:42 +0000
107+++ debian/copyright 2014-01-02 16:50:05 +0000
108@@ -1,39 +1,25 @@
109-This work was packaged for Debian by:
110-
111- Sergey "Shnatsel" Davidoff <shnatsel@gmail.com> on Thu, 23 Jun 2011 20:00:31 +0400
112-
113-It was downloaded from:
114-
115- https://launchpad.net/switchboard
116-
117-Upstream Author(s):
118-
119- Avi Romanoff <aviromanoff@gmail.com>
120-
121-Copyright:
122-
123- Copyright (C) 2011 elementary project
124-
125-License:
126-
127- This program is free software: you can redistribute it and/or modify
128- it under the terms of the GNU General Public License as published by
129- the Free Software Foundation, either version 3 of the License, or
130- (at your option) any later version.
131-
132- This package is distributed in the hope that it will be useful,
133- but WITHOUT ANY WARRANTY; without even the implied warranty of
134- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
135- GNU General Public License for more details.
136-
137- You should have received a copy of the GNU General Public License
138- along with this program. If not, see <http://www.gnu.org/licenses/>.
139-
140-On Debian systems, the complete text of the GNU General
141-Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
142-
143-The Debian packaging is:
144-
145- Copyright (C) 2011 Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
146-
147-and is licensed under the GPL version 3, see above.
148+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
149+Source: https://launchpad.net/switchboard
150+
151+Files: *
152+Copyright: Copyright (C) 2011 Avi Romanoff <aviromanoff@gmail.com>
153+ Copyright (C) 2011-2014 Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
154+ Copyright (C) 2013-2014 Corentin "tintou" Noël <tintou@mailoo.org>
155+ Copyright (C) 2011-2014 elementary project
156+License: GPL-3
157+ This library is free software; you can redistribute it and/or modify it
158+ under the terms of the GNU General Public License as published by the
159+ Free Software Foundation; either version 3 of the License, or (at your
160+ option) any later version.
161+ .
162+ This library is distributed in the hope that it will be useful, but WITHOUT
163+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
164+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
165+ for more details.
166+ .
167+ You should have received a copy of the GNU General Public
168+ License along with this library; if not, write to the
169+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
170+ 02110-1301 USA.
171+ .
172+ See /usr/share/common-licenses/GPL-3 on your debian system.
173\ No newline at end of file
174
175=== added file 'debian/libswitchboard-2.0-0.install'
176--- debian/libswitchboard-2.0-0.install 1970-01-01 00:00:00 +0000
177+++ debian/libswitchboard-2.0-0.install 2014-01-02 16:50:05 +0000
178@@ -0,0 +1,1 @@
179+usr/lib/*/libswitchboard-2.0.so.*
180\ No newline at end of file
181
182=== added file 'debian/libswitchboard-2.0-dev.install'
183--- debian/libswitchboard-2.0-dev.install 1970-01-01 00:00:00 +0000
184+++ debian/libswitchboard-2.0-dev.install 2014-01-02 16:50:05 +0000
185@@ -0,0 +1,5 @@
186+usr/include/switchboard-2.0/*
187+usr/lib/*/libswitchboard-2.0.so
188+usr/lib/*/pkgconfig/switchboard-2.0.pc
189+usr/share/vala/vapi/switchboard-2.0.deps
190+usr/share/vala/vapi/switchboard-2.0.vapi
191\ No newline at end of file
192
193=== modified file 'debian/rules'
194--- debian/rules 2012-08-09 19:56:53 +0000
195+++ debian/rules 2014-01-02 16:50:05 +0000
196@@ -16,7 +16,7 @@
197 dh_strip --dbg-package=switchboard-dbg
198
199 override_dh_auto_install:
200- dh_auto_install --destdir=debian/switchboard
201+ dh_auto_install
202
203 override_dh_builddeb:
204- dh_builddeb -- -Zxz
205+ dh_builddeb -- -Zxz
206\ No newline at end of file
207
208=== added file 'debian/switchboard.install'
209--- debian/switchboard.install 1970-01-01 00:00:00 +0000
210+++ debian/switchboard.install 2014-01-02 16:50:05 +0000
211@@ -0,0 +1,3 @@
212+usr/bin/switchboard
213+usr/share/applications/switchboard.desktop
214+usr/share/locale
215\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: