From 038e3bdf1e9ef0f7ce6426518a0bbbc28c7c6e7c Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 3 Sep 2014 15:20:43 -0400 Subject: [PATCH] Update packaging * Update copyright * Update for multi-arch * Update descriptions and dependencies --- debian/changelog | 6 +++ debian/control | 18 ++++++--- debian/copyright | 86 ++++++++++++++++++++++++++++++------------ debian/libmoonshot1.install | 2 +- debian/moonshot-ui-dev.install | 4 +- 5 files changed, 83 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index a730dc4..f2ff5dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +moonshot-ui (0.7.1-1) unstable; urgency=medium + + * New upstream version + + -- Sam Hartman Wed, 03 Sep 2014 15:00:33 -0400 + moonshot-ui (0.7-2) unstable; urgency=medium * Depend on dbus-x11 for dbus-launch diff --git a/debian/control b/debian/control index 269412b..2b0d611 100644 --- a/debian/control +++ b/debian/control @@ -2,30 +2,35 @@ Source: moonshot-ui Section: net Priority: optional Maintainer: Sam Hartman -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 9), libatk1.0-dev (>= 1.20), libglib2.0-dev, libgtk2.0-dev, gettext, autotools-dev, libdbus-glib-1-dev, desktop-file-utils, libgee-dev, autopoint, autoconf, autotools-dev, automake, libtool, dh-autoreconf, valac, libgnome-keyring-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.5 Homepage: http://www.project-moonshot.org/ Vcs-Git: http://www.project-moonshot.org/git/moonshot-ui.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/moonshot-ui.git;a=summary Package: moonshot-ui Architecture: any +Multi-Arch: foreign +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11 Description: Moonshot Identity Selector Project moonshot provides federated authentication using EAP, RADIUS and SAML to applications beyond the web platform. + This package provides a service to manage the local identity store + and to select which identity is used with a given service. Package: moonshot-ui-dbg Section: debug Priority: extra Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, moonshot-ui|libmoonshot1 Description: Moonshot Identity Selector Debug Symbols Project moonshot provides federated authentication using EAP, RADIUS - and SAML to applications beyond the web platform. + and SAML to applications beyond the web platform. This package + includes debugging symbols. Package: moonshot-ui-dev Architecture: any @@ -39,6 +44,9 @@ Package: libmoonshot1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Description: Moonshot Identity Shared Library Project moonshot provides federated authentication using EAP, RADIUS - and SAML to applications beyond the web platform. + and SAML to applications beyond the web platform. This library + allows other components to interact with the Moonshot identity store. diff --git a/debian/copyright b/debian/copyright index fe3f718..da3db46 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,30 +1,66 @@ -Format: http://dep.debian.net/deps/dep5 +Format: Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: moonshot-ui -Source: http://www.project-moonshot.org/ +Source: git://git.project-moonshot.org/moonshot-ui.git Files: * -Copyright: -License: proprietary - This is still under contract negotiations. -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines -Files: debian/* -Copyright: 2011 Painless Security, LLC -License: GPL-2 - This package 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; version 2 of the License. - . - This package is distributed in the hope that it will be useful, +Copyright: 2011-2014 JANET(UK) +License: BSD-3-Clause + + +Files: vapi/moonshot-gnome-keyring.vapi +Comment: + This is a hand-hacked vapi file originally produced from + gnome-keyring.h. At this point, it is its own preferred form for + editing at least until vapigen and gnome-keyring.h expose the right + things to make it possible to use directly from Vala. Unfortunately, + vapigen removes the copyright from headers it is producing. The + license from gnome-keyring.h is: +Copyright: 2003, Redhat, Inc. +License: LGPL-2 + +License: BSD-3-Clause: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JANET(UK) nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + +License: LGPL-2 + The Gnome Keyring Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. +. + The Gnome Keyring 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 program. If not, see + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. +. + You should have received a copy of the GNU Library General Public + License along with the Gnome Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. + On Debian systems, the complete text of the GNU Library General + Public License can be found in /usr/share/common-licenses/LGPL-2. diff --git a/debian/libmoonshot1.install b/debian/libmoonshot1.install index d9a174c..db3cbb3 100644 --- a/debian/libmoonshot1.install +++ b/debian/libmoonshot1.install @@ -1,2 +1,2 @@ -usr/lib/libmoonshot.so.* +usr/lib/*/libmoonshot.so.* diff --git a/debian/moonshot-ui-dev.install b/debian/moonshot-ui-dev.install index 59fdf20..c9ab0df 100644 --- a/debian/moonshot-ui-dev.install +++ b/debian/moonshot-ui-dev.install @@ -1,3 +1,3 @@ usr/include/* -usr/lib/*.so -usr/lib/*.a +usr/lib/*/*.so +usr/lib/*/*.a -- 2.1.4