[GNUnet-SVN] r25088 - in gnunet-update: . po src/gnunet_update

[gnunet]

Author: harsha
Date: 2012-11-21 17:32:37 +0100 (Wed, 21 Nov 2012)
New Revision: 25088

Added:
   gnunet-update/src/gnunet_update/gnunet-update.conf
   gnunet-update/src/gnunet_update/gnunet-update.in
Removed:
   gnunet-update/bin/
   gnunet-update/etc/
Modified:
   gnunet-update/configure.ac
   gnunet-update/po/
   gnunet-update/src/gnunet_update/
   gnunet-update/src/gnunet_update/Makefile.am
Log:
- build system fixes

Modified: gnunet-update/configure.ac
===================================================================
--- gnunet-update/configure.ac  2012-11-21 16:28:56 UTC (rev 25087)
+++ gnunet-update/configure.ac  2012-11-21 16:32:37 UTC (rev 25088)
@@ -182,7 +182,7 @@
 
 AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing 
read-only architecture-independent data])
 
-# Set PACKAGE_SOURCE_DIR in gnunet_gtk_config.h.
+# Set PACKAGE_SOURCE_DIR in gnunet_update_config.h.
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [source dir])
 

Index: gnunet-update/po
===================================================================
--- gnunet-update/po    2012-11-21 16:28:56 UTC (rev 25087)
+++ gnunet-update/po    2012-11-21 16:32:37 UTC (rev 25088)

Property changes on: gnunet-update/po
___________________________________________________________________
Modified: svn:ignore
## -4,3 +4,5 ##
 Makefile.in
 Makefile
 gnunet-ext.pot
+gnunet-update.pot
+
Index: gnunet-update/src/gnunet_update
===================================================================
--- gnunet-update/src/gnunet_update     2012-11-21 16:28:56 UTC (rev 25087)
+++ gnunet-update/src/gnunet_update     2012-11-21 16:32:37 UTC (rev 25088)

Property changes on: gnunet-update/src/gnunet_update
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,3 ##
 Makefile
 Makefile.in
-
+gnunet-update
Modified: gnunet-update/src/gnunet_update/Makefile.am
===================================================================
--- gnunet-update/src/gnunet_update/Makefile.am 2012-11-21 16:28:56 UTC (rev 
25087)
+++ gnunet-update/src/gnunet_update/Makefile.am 2012-11-21 16:32:37 UTC (rev 
25088)
@@ -1,3 +1,18 @@
+
+bin_SCRIPTS = gnunet-update
+EXTRA_DIST = \
+  gnunet-update.in
+
+do_subst = sed -e 's,address@hidden@],$(pkgpythondir),g' \
+       -e 's,address@hidden@],$(prefix),g'
+
+gnunet-update: gnunet-update.in Makefile
+       $(do_subst) < $(srcdir)/gnunet-update.in > gnunet-update
+       chmod +x gnunet-update
+
+dist_sysconf_DATA = \
+  gnunet-update.conf
+
 gnunet_update_PYTHON = \
   __init__.py \
   __main__.py \
@@ -12,3 +27,6 @@
   install_manifest.py
 
 gnunet_updatedir = $(pkgpythondir)
+
+dist_pkgdata_DATA = \
+  defaults.conf
\ No newline at end of file

Copied: gnunet-update/src/gnunet_update/gnunet-update.conf (from rev 25083, 
gnunet-update/etc/gnunet-update.conf)
===================================================================
--- gnunet-update/src/gnunet_update/gnunet-update.conf                          
(rev 0)
+++ gnunet-update/src/gnunet_update/gnunet-update.conf  2012-11-21 16:32:37 UTC 
(rev 25088)
@@ -0,0 +1,40 @@
+# This file is part of GNUnet.
+# (C) 2011 Christian Grothoff (and other contributing authors)
+#
+# GNUnet 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 2, or (at your
+# option) any later version.
+#
+# GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+# 
+# File:    etc/gnunet-update.conf
+# Author:  Sree Harsha Totakura
+
+# Default configuration file
+
+# This section is for meta information; it influences what is written to the
+# metadata 
+[META]
+# Specify where the current release is stored. Successive package builds will
+# use the incremented number. This option is only relevant while generating a
+# package; it is not required while installing or updating
+# RELEASE_COUNTER_FILE = /home/user/.gnunet-update/release-counter
+
+# This section is for signing and verifying the integrity of downloaded updates
+[SECURITY]
+# Specify which GPG key to use for signing by its Fingerprint
+PGP_SIGN_KEY =  8A4E D0A1 71C2 5EA3 4E9D  FD41 DE57 BF3A 7C61 3D78
+
+# If you don't want to be prompted for your private key password during 
signing,
+# you may specify your private key password here. This option is only relevant
+# while generating a package; it is not required while installing or updating
+# PGP_SIGN_KEY_PASSWORD = private_key_secret

Copied: gnunet-update/src/gnunet_update/gnunet-update.in (from rev 25083, 
gnunet-update/bin/gnunet-update)
===================================================================
--- gnunet-update/src/gnunet_update/gnunet-update.in                            
(rev 0)
+++ gnunet-update/src/gnunet_update/gnunet-update.in    2012-11-21 16:32:37 UTC 
(rev 25088)
@@ -0,0 +1,38 @@
+#!/bin/bash
+# This file is part of GNUnet.
+# (C) 2001--2011 Christian Grothoff (and other contributing authors)
+#
+# GNUnet 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 2, or (at your
+# option) any later version.
+#
+# GNUnet 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 GNUnet; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#File:     bin/gnunet-update
+#Author:   Sree Harsha Totakura
+#
+# Bash script interface for gnunet-update python modules
+
+PYTHON_PACKAGE_DIR="@pkgpythondir@"
+if [ ! -n $GNUNET_UPDATE_HOME ]
+then
+    GNUNET_UPDATE_HOME="@prefix@"
+    export GNUNET_UPDATE_HOME=$GNUNET_UPDATE_HOME
+fi
+
+PYTHON=`which python`
+if [ $? != 0 ]; then
+       echo "We need python for executing gnunet-update"
+       exit 1
+fi
+$PYTHON $PYTHON_PACKAGE_DIR $@
+exit $?
\ No newline at end of file