elementaryart team mailing list archive

[Corentin Noël <tintou@xxxxxxxxxx>]

Corentin Noël has proposed merging lp:~tintou/switchboard/deb-packaging-isis into lp:~elementary-os/switchboard/deb-packaging with lp:~tintou/switchboard/libpeas-isis as a prerequisite.

Requested reviews:
  Rico Tzschichholz (ricotz)
Related bugs:
  Bug #1228000 in Switchboard: "Use libpeas for plugs"
  https://bugs.launchpad.net/switchboard/+bug/1228000

For more details, see:
https://code.launchpad.net/~tintou/switchboard/deb-packaging-isis/+merge/195423

Changed Gtk version to 3.10
Added Libpeas dependance
Bump to debhelper 9
-- 
https://code.launchpad.net/~tintou/switchboard/deb-packaging-isis/+merge/195423
Your team elementaryart (old) is subscribed to branch lp:~elementary-os/switchboard/deb-packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-20 09:23:01 +0000
+++ debian/changelog	2013-11-15 16:45:15 +0000
@@ -1,3 +1,9 @@
+switchboard (2.0.0) untable; urgency=low
+
+  * Now using libpeas
+
+ -- Corentin "tintou" Noël <tintou@xxxxxxxxxx>  Sat, 09 Nov 2013 14:29:41 +0100
+
 switchboard (1.0.1) precise; urgency=low
 
   * No more appmenu

=== modified file 'debian/compat'
--- debian/compat	2011-06-23 16:33:42 +0000
+++ debian/compat	2013-11-15 16:45:15 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2013-09-30 06:40:54 +0000
+++ debian/control	2013-11-15 16:45:15 +0000
@@ -3,22 +3,32 @@
 Priority: optional
 Maintainer: Sergey "Shnatsel" Davidoff <shnatsel@xxxxxxxxx>
 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),
                libunity-dev,
+<<<<<<< TREE
                valac (>= 0.18)
 Standards-Version: 3.8.4
+=======
+               libpeas-dev,
+               valac-0.18 | valac (>= 0.18),
+               gobject-introspection,
+               libgirepository1.0-dev
+Standards-Version: 3.9.3
+>>>>>>> MERGE-SOURCE
 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: ${misc:Depends},
+         ${shlibs:Depends},
+         libswitchboard2 (= ${binary:Version})
 Pre-Depends: dpkg (>= 1.15.6)
 Description: Modular desktop settings hub
  Desktop application that manages Switchboard Plugs.
@@ -27,10 +37,26 @@
 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)
  Desktop application that manages Switchboard Plugs.
  .
  This package contains debugging symbols for switchboard.
+
+Package: libswitchboard-dev
+Section: libdevel
+Architecture: any
+Depends: libswitchboard2 (= ${binary:Version})
+Description: Headers for Switchboard library
+ Development headers for the Switchboard library.
+
+Package: libswitchboard2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Library managing Plugs designed for Switchboard
+ Library for the Switchboard library.

=== added file 'debian/libswitchboard-dev.install'
--- debian/libswitchboard-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libswitchboard-dev.install	2013-11-15 16:45:15 +0000
@@ -0,0 +1,5 @@
+usr/include/switchboard/*
+usr/lib/*/pkgconfig/switchboard.pc
+usr/share/vala/vapi/switchboard.vapi
+usr/share/vala/vapi/switchboard.deps
+usr/share/gir-1.0/Switchboard*.gir

=== added file 'debian/libswitchboard2.install'
--- debian/libswitchboard2.install	1970-01-01 00:00:00 +0000
+++ debian/libswitchboard2.install	2013-11-15 16:45:15 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libswitchboard.so*

=== modified file 'debian/source/format'
--- debian/source/format	2011-06-23 16:33:42 +0000
+++ debian/source/format	2013-11-15 16:45:15 +0000
@@ -1,1 +1,1 @@
-3.0 (native)
+3.0 (quilt)

=== added file 'debian/switchboard.install'
--- debian/switchboard.install	1970-01-01 00:00:00 +0000
+++ debian/switchboard.install	2013-11-15 16:45:15 +0000
@@ -0,0 +1,2 @@
+usr/bin/switchboard
+usr/share/applications/switchboard.desktop
\ No newline at end of file