conduit r1498 - in trunk: . conduit conduit/modules/GoogleModule/gdata scripts

[jstowers svn gnome org]

Author: jstowers
Date: Tue Jun  3 22:10:50 2008
New Revision: 1498
URL: http://svn.gnome.org/viewvc/conduit?rev=1498&view=rev

Log:
2008-06-04  John Stowers  <john stowers gmail com>

	* Makefile.am:
	* NEWS:
	* conduit/__init__.py:
	* conduit/modules/GoogleModule/gdata/Makefile.am:
	* configure.ac: Is it possible to wear two brown paper
	bags simultaenously?



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/conduit/__init__.py
   trunk/conduit/modules/GoogleModule/gdata/Makefile.am
   trunk/configure.ac
   trunk/scripts/ChangeLog
   trunk/scripts/release.sh

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Jun  3 22:10:50 2008
@@ -3,7 +3,7 @@
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-nautilus-extension --disable-eog-plugin
 
 release: dist
-	svn cp ../trunk/ ../tags/$(VERSION)	
+	svn cp ../trunk/ svn+ssh://jstowers svn gnome org/svn/conduit/tags/$(VERSION) -m "Release $(VERSION)"	
 	scp $(PACKAGE)-$(VERSION).tar.gz jstowers master gnome org:
 	ssh jstowers master gnome org install-module $(PACKAGE)-$(VERSION).tar.gz
 

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Jun  3 22:10:50 2008
@@ -1,6 +1,14 @@
-NEW in 0.3.12:
+NEW in 0.3.11.2:
 ==============
-* Magic
+* Brown paper bag release
+
+* Fixed #536485, Google Data Provider (Andreas BÃttger)
+
+Translations:
+None
+
+Help Manual Translations:
+None
 
 NEW in 0.3.11.1:
 ==============

Modified: trunk/conduit/__init__.py
==============================================================================
--- trunk/conduit/__init__.py	(original)
+++ trunk/conduit/__init__.py	Tue Jun  3 22:10:50 2008
@@ -47,7 +47,7 @@
     if not PYTHONDIR in sys.path:
         sys.path.insert(0, PYTHONDIR)
 else:
-    VERSION =                   "0.3.12"
+    VERSION =                   "0.3.11.2"
     LOCALE_DIR =                os.path.join(DIRECTORY, "po")
     SHARED_DATA_DIR =           os.path.join(DIRECTORY, "data")
     GLADE_FILE =                os.path.join(DIRECTORY, "data","conduit.glade")

Modified: trunk/conduit/modules/GoogleModule/gdata/Makefile.am
==============================================================================
--- trunk/conduit/modules/GoogleModule/gdata/Makefile.am	(original)
+++ trunk/conduit/modules/GoogleModule/gdata/Makefile.am	Tue Jun  3 22:10:50 2008
@@ -1,4 +1,4 @@
-SUBDIRS = calendar contacts exif geo media photos
+SUBDIRS = apps base calendar codesearch contacts docs exif geo media photos spreadsheet
 
 conduit_handlersdir = $(libdir)/conduit/modules/GoogleModule/gdata
 conduit_handlers_PYTHON = __init__.py auth.py service.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jun  3 22:10:50 2008
@@ -1,4 +1,4 @@
-AC_INIT([conduit], [0.3.12],[john stowers gmail com],[conduit])
+AC_INIT([conduit], [0.3.11.2],[john stowers gmail com],[conduit])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_SRCDIR(conduit/__init__.py)
 AC_CONFIG_MACRO_DIR([m4])
@@ -133,12 +133,17 @@
 conduit/modules/GoogleModule/Makefile
 conduit/modules/GoogleModule/atom/Makefile
 conduit/modules/GoogleModule/gdata/Makefile
+conduit/modules/GoogleModule/gdata/apps/Makefile
+conduit/modules/GoogleModule/gdata/base/Makefile
 conduit/modules/GoogleModule/gdata/calendar/Makefile
+conduit/modules/GoogleModule/gdata/codesearch/Makefile
 conduit/modules/GoogleModule/gdata/contacts/Makefile
+conduit/modules/GoogleModule/gdata/docs/Makefile
 conduit/modules/GoogleModule/gdata/exif/Makefile
 conduit/modules/GoogleModule/gdata/geo/Makefile
 conduit/modules/GoogleModule/gdata/media/Makefile
 conduit/modules/GoogleModule/gdata/photos/Makefile
+conduit/modules/GoogleModule/gdata/spreadsheet/Makefile
 conduit/modules/ShutterflyModule/Makefile
 conduit/modules/ShutterflyModule/shutterfly/Makefile
 conduit/modules/RhythmboxModule/Makefile

Modified: trunk/scripts/release.sh
==============================================================================
--- trunk/scripts/release.sh	(original)
+++ trunk/scripts/release.sh	Tue Jun  3 22:10:50 2008
@@ -6,7 +6,7 @@
 fi
 
 ./scripts/maintainer.py \
-    --revision=0.3.11.1 \
+    --revision=0.3.11.2 \
     --package-name=Conduit \
     --package-version=0.3.12 \
     --package-module=conduit \