Merge tag 'upstream/0.7.2' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 19:39:26 +0000 (15:39 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 19:39:26 +0000 (15:39 -0400)
Conflicts:
Makefile.in
aclocal.m4
build-aux/compile
build-aux/config.sub
build-aux/depcomp
build-aux/install-sh
build-aux/ltmain.sh
build-aux/missing
configure
moonshot-ui.spec
po/moonshot-ui.pot
src/moonshot-add-dialog.c
src/moonshot-custom-vbox.c
src/moonshot-id.c
src/moonshot-idcard-store.c
src/moonshot-idcard-widget.c
src/moonshot-identities-manager.c
src/moonshot-identity-management-view.c
src/moonshot-identity-manager-app.c
src/moonshot-identity-request.c
src/moonshot-keyring-store.c
src/moonshot-local-flat-file-store.c
src/moonshot-password-dialog.c
src/moonshot-provisioning-common.c
src/moonshot-server.c
src/moonshot-utils.c
src/moonshot-webp-parser.c

20 files changed:
Makefile.am
configure.ac
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/gbp.conf [new file with mode: 0644]
debian/libmoonshot1.install [new file with mode: 0644]
debian/moonshot-ui-dev.install [new file with mode: 0644]
debian/moonshot-ui.examples [new file with mode: 0644]
debian/moonshot-ui.install [new file with mode: 0644]
debian/moonshot-ui.lintian-overrides [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/source/options [new file with mode: 0644]
libmoonshot/libmoonshot.vapi [deleted file]
po/Makefile.in [new file with mode: 0644]
po/Makevars.template [new file with mode: 0644]
po/POTFILES [new file with mode: 0644]
po/remove-potcdate.sed [new file with mode: 0644]

index 7cd9a6a..c4f0c80 100644 (file)
@@ -65,7 +65,7 @@ src_moonshot_webp_SOURCES = \
         src/moonshot-provisioning-common.vala \
         src/moonshot-id.vala
 
-src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-1.0 $(AM_VALAFLAGS)
+src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-0.8 $(AM_VALAFLAGS)
 src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)  
 src_moonshot_LDADD = $(moonshot_LIBS) 
 src_moonshot_LDFLAGS = -g -O0
index c9f63b4..ac4284e 100644 (file)
@@ -220,7 +220,7 @@ PKG_CHECK_MODULES(moonshot,[
         glib-2.0 >= 2.22
         gobject-2.0 >= 2.22
         $GTK_VERSION
-        gee-1.0 >= 0.5
+        gee-0.8 >= 0.5
         $SERVER_IPC_MODULE
                $MAC
 ])
@@ -231,7 +231,7 @@ PKG_CHECK_MODULES(libmoonshot,[
 
 # i18n stuff
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18.1])
 
 AC_SUBST([GETTEXT_PACKAGE],[PACKAGE_TARNAME])
 AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Define to the gettext package name.])
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..e1986d3
--- /dev/null
@@ -0,0 +1,195 @@
+moonshot-ui (0.7.2-1) unstable; urgency=medium
+
+  * New upstream Version, Closes: #787880
+
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 14 Jul 2015 12:11:29 -0400
+
+moonshot-ui (0.7.1-3) unstable; urgency=medium
+
+  * Depend on libgee-0.8-dev, Closes: #784651
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 21 May 2015 16:14:24 -0400
+
+moonshot-ui (0.7.1-2) unstable; urgency=medium
+
+  * Merge in upstream change to properly decode base64 certificates with
+    whitespace.
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 25 Mar 2015 01:00:11 -0400
+
+moonshot-ui (0.7.1-1) unstable; urgency=medium
+
+  * New upstream version
+  * Move dbus launch script to libmoonshot1
+  * Because the dbus interface between moonshot-ui and libmoonshot1 may
+    not be entirely stable, create versioned dependency.
+  * Initial upload to Debian, Closes: #760411
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 03 Sep 2014 15:34:52 -0400
+
+moonshot-ui (0.7-2) unstable; urgency=medium
+
+  * Depend on dbus-x11 for dbus-launch
+
+ -- Sam Hartman <hartmans@debian.org>  Fri, 23 May 2014 10:20:03 -0400
+
+moonshot-ui (0.7-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 19 May 2014 21:23:49 -0400
+
+moonshot-ui (0.6-8) unstable; urgency=low
+
+  * Update handling of requests containing passwords and avoid duplicate
+    identity
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 13 Nov 2013 22:33:52 -0500
+
+moonshot-ui (0.6-7) unstable; urgency=low
+
+  * Merge in upstream support for flatstore-users
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 29 Oct 2013 17:59:42 -0400
+
+moonshot-ui (0.6-6) unstable; urgency=low
+
+  * Merge upstream bug fixes
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 29 Oct 2013 10:38:05 -0400
+
+moonshot-ui (0.6-5) unstable; urgency=low
+
+  * Install default identity example
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 10 Oct 2013 10:29:54 -0400
+
+moonshot-ui (0.6-4) unstable; urgency=low
+
+  * Add debug info package
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 10 Oct 2013 10:28:35 -0400
+
+moonshot-ui (0.6-3) unstable; urgency=low
+
+  * Include gnome keyring and moonshot-webp fixes
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 08 Oct 2013 09:09:38 -0400
+
+moonshot-ui (0.6-2) UNRELEASED; urgency=low
+
+  * New upstream version
+  * Increment shlibs version for libmoonshot
+
+ -- Sam Hartman <hartmans@debian.org>  Thu, 03 Oct 2013 15:51:10 -0400
+
+moonshot-ui (0.5+20130510-1.1) UNRELEASED; urgency=low
+
+  * New upstream version
+  * Fix headless add identity cards
+  * 
+
+ -- Kevin Wasserman <krwasserman@painless-security.com>  Thu, 16 May 2013 13:40:12 -0400
+
+moonshot-ui (0.5+20130510-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Sam Hartman <hartmans@debian.org>  Fri, 10 May 2013 14:46:01 -0400
+
+moonshot-ui (0.5+20130429-3) unstable; urgency=low
+
+  * Fix assertion on no identities
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 30 Apr 2013 18:06:05 -0400
+
+moonshot-ui (0.5+20130429-2) unstable; urgency=low
+
+  * Updates to fix assertion failure
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 30 Apr 2013 18:05:21 -0400
+
+moonshot-ui (0.5+20130429-1) unstable; urgency=low
+
+  * New Upstream version
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 29 Apr 2013 14:58:00 -0400
+
+moonshot-ui (0.5+20130421-2) unstable; urgency=low
+
+  * New upstream version
+  * Fix service removal
+  * Fix bogus identities
+  * Upstream version
+  * Upstream version
+
+ -- Sam Hartman <hartmans@debian.org>  Sun, 21 Apr 2013 13:49:09 -0400
+
+moonshot-ui (0.5+20130326-1) UNRELEASED; urgency=low
+
+  * New upstream version
+  * Fixes headless operation
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 26 Mar 2013 12:51:47 -0400
+
+moonshot-ui (0.0.2+20130319-1) unstable; urgency=low
+
+  * Merge in upstream changes
+  * Script for auto dbus launch in headless
+
+ -- Sam Hartman <hartmans@debian.org>  Tue, 19 Mar 2013 10:45:15 -0400
+
+moonshot-ui (0.0.2+20120131-2) unstable; urgency=low
+
+  * Update from master branch
+
+ -- Sam Hartman <hartmans@project-moonshot.org>  Fri, 18 May 2012 20:49:17 -0400
+
+moonshot-ui (0.0.2+20120131-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Sam Hartman <hartmans@project-moonshot.org>  Tue, 31 Jan 2012 16:33:48 -0500
+
+moonshot-ui (0.0.2+20120119-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Sam Hartman <hartmans@project-moonshot.org>  Thu, 19 Jan 2012 10:46:01 -0500
+
+moonshot-ui (0.0.2+20120117-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Sam Hartman <hartmans@project-moonshot.org>  Tue, 17 Jan 2012 18:06:50 -0500
+
+moonshot-ui (0.0.2+20110913-2) unstable; urgency=low
+
+  * Fix shared libraries
+
+ -- Sam Hartman <hartmans@project-moonshot.org>  Tue, 13 Sep 2011 10:52:47 -0400
+
+moonshot-ui (0.0.2+20110913-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Sam Hartman <hartmans@project-moonshot.org>  Tue, 13 Sep 2011 08:41:37 -0400
+
+moonshot-ui (0.0.2+20110704-1) unstable; urgency=low
+
+  * New Upstream version
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 04 Jul 2011 06:16:04 -0400
+
+moonshot-ui (0.0.2+20110621-1) unstable; urgency=low
+
+  * New Upstream release
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 13 Jun 2011 08:06:34 -0400
+
+moonshot-ui (0.0.1+20110504-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 04 May 2011 13:28:57 -0400
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..bef99e1
--- /dev/null
@@ -0,0 +1,53 @@
+Source: moonshot-ui
+Section: net
+Priority: optional
+Maintainer: Sam Hartman <hartmans@debian.org>
+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-0.8-dev, autopoint, autoconf, autotools-dev, automake, libtool,
+ dh-autoreconf, valac, libgnome-keyring-dev
+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, libmoonshot1 (= ${binary:Version})
+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}, 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.  This package
+ includes debugging symbols.
+
+Package: moonshot-ui-dev
+Architecture: any
+Section: libdevel
+Depends: libmoonshot1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Moonshot Identity Development Files
+ Project moonshot provides federated authentication using EAP, RADIUS
+ and SAML to applications beyond the web platform. 
+
+Package: libmoonshot1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Breaks: moonshot-ui (<< 0.7.1-1~)
+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.  This library
+ allows other components to interact with the Moonshot identity store.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..da3db46
--- /dev/null
@@ -0,0 +1,66 @@
+Format: Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: moonshot-ui
+Source: git://git.project-moonshot.org/moonshot-ui.git
+
+Files: *
+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
+ 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 Library General
+ Public License can be found in /usr/share/common-licenses/LGPL-2.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..704e657
--- /dev/null
@@ -0,0 +1,3 @@
+[DEFAULT]
+pristine-tar=True
+debian-branch=debian
diff --git a/debian/libmoonshot1.install b/debian/libmoonshot1.install
new file mode 100644 (file)
index 0000000..6e984eb
--- /dev/null
@@ -0,0 +1,2 @@
+usr/lib/*/libmoonshot.so.*
+usr/lib/*/moonshot-ui/*
diff --git a/debian/moonshot-ui-dev.install b/debian/moonshot-ui-dev.install
new file mode 100644 (file)
index 0000000..c9ab0df
--- /dev/null
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*/*.so
+usr/lib/*/*.a
diff --git a/debian/moonshot-ui.examples b/debian/moonshot-ui.examples
new file mode 100644 (file)
index 0000000..f72e148
--- /dev/null
@@ -0,0 +1 @@
+webprovisioning/default-identity.msht
diff --git a/debian/moonshot-ui.install b/debian/moonshot-ui.install
new file mode 100644 (file)
index 0000000..4befca1
--- /dev/null
@@ -0,0 +1,4 @@
+etc/moonshot/*
+usr/bin/*
+usr/share/*
+
diff --git a/debian/moonshot-ui.lintian-overrides b/debian/moonshot-ui.lintian-overrides
new file mode 100644 (file)
index 0000000..d3e22cb
--- /dev/null
@@ -0,0 +1,2 @@
+moonshot-ui: binary-without-manpage
+
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..4513d6c
--- /dev/null
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+       dh $@  --with autoreconf
+
+override_dh_strip:
+       dh_strip --dbg-package=moonshot-ui-dbg
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644 (file)
index 0000000..7423a2d
--- /dev/null
@@ -0,0 +1 @@
+single-debian-patch
diff --git a/libmoonshot/libmoonshot.vapi b/libmoonshot/libmoonshot.vapi
deleted file mode 100644 (file)
index 8662596..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Vala binding between libmoonshot helper library */
-
-[CCode (cheader_filename = "libmoonshot.h")]
-namespace Moonshot {
-    [Compact]
-    [CCode (cname = "MoonshotError", free_function = "moonshot_error_free")]
-    public class Error {
-        public int code;
-        public string message;
-    }
-
-    /* A service matching rule; duplicated in moonshot-id.vala */
-    [CCode (cname = "MoonshotServiceRule")]
-    public struct ServiceRule {
-        public string pattern;
-        public string always_confirm;
-    }
-
-    [CCode (cname = "moonshot_get_identity")]
-    public bool get_identity (string nai,
-                              string password,
-                              string service,
-                              out string nai_out,
-                              out string password_out,
-                              out string server_certificate_hash_out,
-                              out string ca_certificate_out,
-                              out string subject_name_constraint_out,
-                              out string subject_alt_name_constraint_out,
-                              out Moonshot.Error error);
-
-    [CCode (cname = "moonshot_get_default_identity")]
-    public bool get_default_identity (out string nai_out,
-                                      out string password_out,
-                                      out string server_certificate_hash_out,
-                                      out string ca_certificate_out,
-                                      out string subject_name_constraint_out,
-                                      out string subject_alt_name_constraint_out,
-                                      out Moonshot.Error error);
-
-    [CCode (cname = "moonshot_install_id_card")]
-    public bool install_id_card (string display_name,
-                                 string? user_name,
-                                 string? password,
-                                 string? realm,
-                                 string rules_patterns[],
-                                 string rules_always_confirm[],
-                                 string services[],
-                                 string? ca_cert,
-                                 string? subject,
-                                 string? subject_alt,
-                                 string? server_cert,
-                                 int force_flat_file_store,
-                                 out Moonshot.Error error);
-}
diff --git a/po/Makefile.in b/po/Makefile.in
new file mode 100644 (file)
index 0000000..379ac26
--- /dev/null
@@ -0,0 +1,429 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.17
+GETTEXT_MACRO_VERSION = 0.17
+
+PACKAGE = moonshot-ui
+VERSION = 0.7.2
+PACKAGE_BUGREPORT = moonshot-community@jiscmail.ac.uk
+
+SHELL = /bin/sh
+
+
+srcdir = .
+top_srcdir = ..
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+datadir = ${datarootdir}
+localedir = ${datarootdir}/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# ${SHELL} /home/hartmans/moonshot/moonshot/ui/build-aux/install-sh does not start with $(SHELL), so we add it.
+# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) ${SHELL} /home/hartmans/moonshot/moonshot/ui/build-aux/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/hartmans/moonshot/moonshot/ui/build-aux/install-sh
+MKDIR_P = /bin/mkdir -p
+mkdir_p = /bin/mkdir -p
+
+GMSGFMT_ = /usr/bin/msgfmt
+GMSGFMT_no = /usr/bin/msgfmt
+GMSGFMT_yes = /usr/bin/msgfmt
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = /usr/bin/msgfmt
+MSGFMT_no = /usr/bin/msgfmt
+MSGFMT_yes = /usr/bin/msgfmt
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = /usr/bin/xgettext
+XGETTEXT_no = /usr/bin/xgettext
+XGETTEXT_yes = /usr/bin/xgettext
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = /usr/bin/msgmerge --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+       @echo "$(MSGFMT) -c -o $@ $<"; \
+       $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+       @lang=`echo $* | sed -e 's,.*/,,'`; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+       cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+       sed -e '/^#/d' $< > t-$@
+       mv t-$@ $@
+
+
+all: check-macro-version all-yes
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+       @test "$(GETTEXT_MACRO_VERSION)" = "0.17" \
+         || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version 0.17" 1>&2; \
+              exit 1; \
+            }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+       test ! -f $(srcdir)/$(DOMAIN).pot || \
+         test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+       @test ! -f $(srcdir)/$(DOMAIN).pot || { \
+         echo "touch stamp-po" && \
+         echo timestamp > stamp-poT && \
+         mv stamp-poT stamp-po; \
+       }
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+       if LC_ALL=C grep 'GNU moonshot-ui' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+         package_gnu='GNU '; \
+       else \
+         package_gnu=''; \
+       fi; \
+       if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+         msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+       else \
+         msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+       fi; \
+       case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+         '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+           $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS)  \
+             --files-from=$(srcdir)/POTFILES.in \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+           ;; \
+         *) \
+           $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS)  \
+             --files-from=$(srcdir)/POTFILES.in \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --package-name="$${package_gnu}moonshot-ui" \
+             --package-version='0.7.2' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+           ;; \
+       esac
+       test ! -f $(DOMAIN).po || { \
+         if test -f $(srcdir)/$(DOMAIN).pot; then \
+           sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+           sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+           if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+           else \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+             mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+           fi; \
+         else \
+           mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+         fi; \
+       }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+       $(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+       @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+       if test -f "$(srcdir)/$${lang}.po"; then \
+         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+         echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+         cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+       else \
+         $(MAKE) $${lang}.po-create; \
+       fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           $(INSTALL_DATA) $(srcdir)/$$file \
+                           $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+         for file in Makevars; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+install-data-no: all
+install-data-yes: all
+       $(mkdir_p) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkdir_p) $(DESTDIR)$$dir; \
+         if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+         $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+         echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+             rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+           fi; \
+         done; \
+       done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+       else \
+         : ; \
+       fi
+installdirs-data-no:
+installdirs-data-yes:
+       $(mkdir_p) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkdir_p) $(DESTDIR)$$dir; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+           fi; \
+         done; \
+       done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+uninstall-data-no:
+uninstall-data-yes:
+       catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+           rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+         done; \
+       done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+       rm -f remove-potcdate.sed
+       rm -f stamp-poT
+       rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+       rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+       rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+       @echo "This command is intended for maintainers to use;"
+       @echo "it deletes files that may require special tools to rebuild."
+       rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+       $(MAKE) update-po
+       @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+       dists="$(DISTFILES)"; \
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         dists="$$dists Makevars.template"; \
+       fi; \
+       if test -f $(srcdir)/$(DOMAIN).pot; then \
+         dists="$$dists $(DOMAIN).pot stamp-po"; \
+       fi; \
+       if test -f $(srcdir)/ChangeLog; then \
+         dists="$$dists ChangeLog"; \
+       fi; \
+       for i in 0 1 2 3 4 5 6 7 8 9; do \
+         if test -f $(srcdir)/ChangeLog.$$i; then \
+           dists="$$dists ChangeLog.$$i"; \
+         fi; \
+       done; \
+       if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+       for file in $$dists; do \
+         if test -f $$file; then \
+           cp -p $$file $(distdir) || exit 1; \
+         else \
+           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+         fi; \
+       done
+
+update-po: Makefile
+       $(MAKE) $(DOMAIN).pot-update
+       test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+       $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+       @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+       echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+       exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+       @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+       if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+       tmpdir=`pwd`; \
+       echo "$$lang:"; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+       cd $(srcdir); \
+       if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+         if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+           rm -f $$tmpdir/$$lang.new.po; \
+         else \
+           if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+             :; \
+           else \
+             echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+             exit 1; \
+           fi; \
+         fi; \
+       else \
+         echo "msgmerge for $$lang.po failed!" 1>&2; \
+         rm -f $$tmpdir/$$lang.new.po; \
+       fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+       @:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+       cd $(top_builddir) \
+         && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/po/Makevars.template b/po/Makevars.template
new file mode 100644 (file)
index 0000000..32692ab
--- /dev/null
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES b/po/POTFILES
new file mode 100644 (file)
index 0000000..116e01a
--- /dev/null
@@ -0,0 +1 @@
+     ../src/moonshot-identity-management-view.vala
diff --git a/po/remove-potcdate.sed b/po/remove-potcdate.sed
new file mode 100644 (file)
index 0000000..edb38d7
--- /dev/null
@@ -0,0 +1,11 @@
+/^"POT-Creation-Date: .*"$/{
+x
+s/P/P/
+ta
+g
+d
+bb
+:a
+x
+:b
+}