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

[Corentin Noël]

Updates for switchboard 2.0

Changed Gtk version to 3.10
Bump to debhelper 9

[Rico Tzschichholz (ricotz)]

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

review: Disapprove

[Corentin Noël (tintou)]

Indeed, I forgot to change that

[Rico Tzschichholz (ricotz)]

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

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

<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

[Cody Garver (codygarver)]

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

review: Needs Fixing

[Cody Garver (codygarver)]

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

review: Needs Information

[Corentin Noël (tintou)]

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

[Rico Tzschichholz (ricotz)]

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

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

libswitchboard-dev > libswitchboard-2.0-dev

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

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]

30. By Corentin Noël on 2014-01-02

Droped useless override_dh_auto_install

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-20 09:23:01 +0000
+++ debian/changelog	2014-01-02 18:44:46 +0000
@@ -1,3 +1,9 @@
+switchboard (2.0.0) UNRELEASED; urgency=low
+
+  * Now using gmodule
+
+ -- Corentin "tintou" Noël <[e-mail]>  Sat, 09 Nov 2013 14:29:41 +0100
+
 switchboard (1.0.1) precise; urgency=low
 
   * No more appmenu
@@ -20,4 +26,4 @@
 
   * Initial Release.
 
- -- Sergey "Shnatsel" Davidoff <[e-mail]>  Thu, 23 Jun 2011 20:00:31 +0400
+ -- Sergey "Shnatsel" Davidoff <[e-mail]>  Thu, 23 Jun 2011 20:00:31 +0400
\ No newline at end of file

=== modified file 'debian/compat'
--- debian/compat	2011-06-23 16:33:42 +0000
+++ debian/compat	2014-01-02 18:44:46 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2013-09-30 06:40:54 +0000
+++ debian/control	2014-01-02 18:44:46 +0000
@@ -3,34 +3,60 @@
 Priority: optional
 Maintainer: Sergey "Shnatsel" Davidoff <[e-mail]>
 Build-Depends: cmake (>= 2.8),
-               debhelper (>= 7.0.50~),
+               debhelper (>= 9),
                libclutter-gtk-1.0-dev,
                libgee-dev (>= 0.5.3),
                libglib2.0-dev (>= 2.26.0),
                libgranite-dev,
-               libgtk-3-dev (>= 3.6.0),
+               libgtk-3-dev (>= 3.10.0),
                libunity-dev,
-               valac (>= 0.18)
-Standards-Version: 3.8.4
+               valac (>= 0.22)
+Standards-Version: 3.9.5
 Homepage: https://launchpad.net/switchboard
 Vcs-Bzr: lp:switchboard
-Vcs-Browser: https://code.launchpad.net/~switchboard-devs/switchboard/switchboard
+Vcs-Browser: https://code.launchpad.net/~elementary-pantheon/switchboard/switchboard
 
 Package: switchboard
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libswitchboard-2.0-0 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Pre-Depends: dpkg (>= 1.15.6)
-Description: Modular desktop settings hub
+Description: Modular Settings Hub
  Desktop application that manages Switchboard Plugs.
 
 Package: switchboard-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: switchboard (= ${binary:Version}), ${misc:Depends}
+Depends: switchboard (= ${binary:Version}),
+         ${misc:Depends}
 Pre-Depends: dpkg (>= 1.15.6)
 Enhances: switchboard
-Description: Modular desktop settings hub (debugging symbols)
+Description: Modular Settings Hub - debug symbols
  Desktop application that manages Switchboard Plugs.
  .
- This package contains debugging symbols for switchboard.
+ This package contains detached debugging symbols.
+ .
+ Most people will not need this package.
+
+Package: libswitchboard-2.0-dev
+Section: libdevel
+Architecture: any
+Depends: libswitchboard-2.0-0 (= ${binary:Version}),
+         ${misc:Depends}
+Description: Modular Settings Hub - development files
+ Common library to create plugs (settings panels).
+ .
+ This package contains the header and development files which are
+ needed for building Switchboard plugs.
+
+Package: libswitchboard-2.0-0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Modular Settings Hub - shared libraries
+ Common library to create plugs (settings panels).
+ .
+ This package contains the shared library.
\ No newline at end of file

=== modified file 'debian/copyright'
--- debian/copyright	2011-06-23 16:33:42 +0000
+++ debian/copyright	2014-01-02 18:44:46 +0000
@@ -1,39 +1,25 @@
-This work was packaged for Debian by:
-
-    Sergey "Shnatsel" Davidoff <[e-mail]> on Thu, 23 Jun 2011 20:00:31 +0400
-
-It was downloaded from:
-
-    https://launchpad.net/switchboard
-
-Upstream Author(s):
-
-    Avi Romanoff <[e-mail]>
-
-Copyright:
-
-    Copyright (C) 2011 elementary project
-
-License:
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU General
-Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-The Debian packaging is:
-
-    Copyright (C) 2011 Sergey "Shnatsel" Davidoff <[e-mail]>
-
-and is licensed under the GPL version 3, see above.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://launchpad.net/switchboard
+
+Files: *
+Copyright: Copyright (C) 2011 Avi Romanoff <[e-mail]>
+           Copyright (C) 2011-2014 Sergey "Shnatsel" Davidoff <[e-mail]>
+           Copyright (C) 2013-2014 Corentin "tintou" Noël <[e-mail]>
+           Copyright (C) 2011-2014 elementary project
+License: GPL-3
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ for more details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301  USA.
+ .
+ See /usr/share/common-licenses/GPL-3 on your debian system.
\ No newline at end of file

=== added file 'debian/libswitchboard-2.0-0.install'
--- debian/libswitchboard-2.0-0.install	1970-01-01 00:00:00 +0000
+++ debian/libswitchboard-2.0-0.install	2014-01-02 18:44:46 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libswitchboard-2.0.so.*
\ No newline at end of file

=== added file 'debian/libswitchboard-2.0-dev.install'
--- debian/libswitchboard-2.0-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libswitchboard-2.0-dev.install	2014-01-02 18:44:46 +0000
@@ -0,0 +1,5 @@
+usr/include/switchboard-2.0/*
+usr/lib/*/libswitchboard-2.0.so
+usr/lib/*/pkgconfig/switchboard-2.0.pc
+usr/share/vala/vapi/switchboard-2.0.deps
+usr/share/vala/vapi/switchboard-2.0.vapi
\ No newline at end of file

=== modified file 'debian/rules'
--- debian/rules	2012-08-09 19:56:53 +0000
+++ debian/rules	2014-01-02 18:44:46 +0000
@@ -15,8 +15,5 @@
 override_dh_strip:
 	dh_strip --dbg-package=switchboard-dbg
 
-override_dh_auto_install:
-	dh_auto_install --destdir=debian/switchboard
-	
 override_dh_builddeb:
-	dh_builddeb -- -Zxz
+	dh_builddeb -- -Zxz
\ No newline at end of file

=== added file 'debian/switchboard.install'
--- debian/switchboard.install	1970-01-01 00:00:00 +0000
+++ debian/switchboard.install	2014-01-02 18:44:46 +0000
@@ -0,0 +1,3 @@
+usr/bin/switchboard
+usr/share/applications/switchboard.desktop
+usr/share/locale
\ No newline at end of file