[Commits] commitHelper 1.2 1.3 PATCHSETS 1.34 1.35 ChangeLog 1.34 1.35 configure.ac 1.35 1.36

[miras at claws-mail.org]

Update of /home/claws-mail/contacts
In directory claws-mail:/tmp/cvs-serv8082

Modified Files:
	commitHelper PATCHSETS ChangeLog configure.ac 
Log Message:
2011-12-03 [mir]	0.6.0cvs35

	* commitHelper
	    Due to changed configure.ac

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/contacts/configure.ac,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- configure.ac	30 Nov 2011 23:35:12 -0000	1.35
+++ configure.ac	3 Dec 2011 15:21:32 -0000	1.36
@@ -2,8 +2,8 @@
 AC_INIT(src/claws-contacts.c)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SUBDIRS(extentions)
 AC_COPYRIGHT([Copyright (c) 2011 Michael Rasmussen.])
-
 PACKAGE=claws-contacts
 
 dnl version number
@@ -12,7 +12,7 @@
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -45,6 +45,7 @@
     AC_DEFINE_UNQUOTED(PIXDIR, "${ac_pwd}/pixmaps", [Directory with various pixmaps])
     PLUGINDIR="${ac_pwd}/plugins"
 	EXTENSIONDIR="${ac_pwd}/extensions"
+	AC_DEFINE_UNQUOTED(EXTENSIONDIR, "$EXTENSIONDIR", [Where is extensions located])
 else
     if test "x$prefix" = "xNONE"; then
 	prefix=$ac_default_prefix
@@ -55,6 +56,7 @@
     AC_DEFINE_UNQUOTED(PIXDIR, "${prefix}/share/claws-contacts/pixmaps", [Directory with various pixmaps])
     PLUGINDIR="${prefix}/lib/claws-contacts/plugins"
 	EXTENSIONDIR="${prefix}/lib/claws-contacts/extensions"
+	AC_DEFINE_UNQUOTED(EXTENSIONDIR, "$EXTENSIONDIR", [Where is extensions located])
 fi
 AC_SUBST(PLUGINDIR)
 AC_SUBST(EXTENSIONDIR)

Index: commitHelper
===================================================================
RCS file: /home/claws-mail/contacts/commitHelper,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commitHelper	7 Sep 2011 21:03:58 -0000	1.2
+++ commitHelper	3 Dec 2011 15:21:32 -0000	1.3
@@ -2,7 +2,7 @@
 args=`echo $@`
 tmpfile=${0##*/}.tmp
 
-head -n 22 configure.ac | grep VERSION= > $tmpfile
+head -n 24444 configure.ac | grep VERSION= > $tmpfile
 source $tmpfile
 EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
 nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}"

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/contacts/PATCHSETS,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- PATCHSETS	30 Nov 2011 23:35:12 -0000	1.34
+++ PATCHSETS	3 Dec 2011 15:21:32 -0000	1.35
@@ -32,3 +32,4 @@
 ( cvs diff -u -r 1.11 -r 1.12 plugins/ldap/ldap-plugin.c;  cvs diff -u -r 1.2 -r 1.3 src/dbus/dbus-service.c;  ) > 0.6.0cvs32.patchset
 ( cvs diff -u -r 1.10 -r 1.11 src/contactwindow.c;  ) > 0.6.0cvs33.patchset
 ( cvs diff -u -r 1.2 -r 1.3 Makefile.am;  cvs diff -u -r 1.1 -r 1.2 TODO;  cvs diff -u -r 1.34 -r 1.35 configure.ac;  diff -u /dev/null extensions/.cvsignore;  diff -u /dev/null extensions/Makefile.am;  diff -u /dev/null extensions/export/.cvsignore;  diff -u /dev/null extensions/export/Makefile.am;  diff -u /dev/null extensions/export/ldifexport_extension.c;  diff -u /dev/null extensions/import/.cvsignore;  diff -u /dev/null extensions/import/Makefile.am;  diff -u /dev/null extensions/import/ldifimport_extension.c;  cvs diff -u -r 1.2 -r 1.3 src/Makefile.am;  cvs diff -u -r 1.2 -r 1.3 src/claws-contacts.c;  diff -u /dev/null src/extension-loader.c;  diff -u /dev/null src/extension-loader.h;  diff -u /dev/null src/extension.c;  diff -u /dev/null src/extension.h;  cvs diff -u -r 1.4 -r 1.5 src/mainwindow.c;  cvs diff -u -r 1.2 -r 1.3 src/mainwindow.h;  ) > 0.6.0cvs34.patchset
+( cvs diff -u -r 1.2 -r 1.3 commitHelper;  ) > 0.6.0cvs35.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/contacts/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeLog	30 Nov 2011 23:35:12 -0000	1.34
+++ ChangeLog	3 Dec 2011 15:21:32 -0000	1.35
@@ -1,3 +1,8 @@
+2011-12-03 [mir]	0.6.0cvs35
+
+	* commitHelper
+	    Due to changed configure.ac
+
 2011-11-30 [mir]	0.6.0cvs34
 
 	* Makefile.am