[Commits] ChangeLog 1.396.2.3556 1.396.2.3557 Makefile.am 1.24.2.29 1.24.2.30 PATCHSETS 1.1.2.4387 1.1.2.4388 configure.ac 1.654.2.4454 1.654.2.4455

[claws at claws-mail.org]

Update of /home/claws-mail/claws
In directory srv:/tmp/cvs-serv9510

Modified Files:
      Tag: gtk2
	ChangeLog Makefile.am PATCHSETS configure.ac 
Log Message:
2012-06-30 [paul]	3.8.1cvs1

	* Makefile.am
		fix bug 2579, 'Installed headers redefine autotools-specific constants' 

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/claws/configure.ac,v
retrieving revision 1.654.2.4454
retrieving revision 1.654.2.4455
diff -u -d -r1.654.2.4454 -r1.654.2.4455
--- configure.ac	27 Jun 2012 09:50:19 -0000	1.654.2.4454
+++ configure.ac	30 Jun 2012 09:03:19 -0000	1.654.2.4455
@@ -12,7 +12,7 @@
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/Makefile.am,v
retrieving revision 1.24.2.29
retrieving revision 1.24.2.30
diff -u -d -r1.24.2.29 -r1.24.2.30
--- Makefile.am	25 Nov 2009 22:14:00 -0000	1.24.2.29
+++ Makefile.am	30 Jun 2012 09:03:19 -0000	1.24.2.30
@@ -68,8 +68,6 @@
 pkgconfig_DATA = claws-mail.pc
 
 clawsincludedir = $(pkgincludedir)
-clawsinclude_HEADERS = \
-	config.h
 
 relnotesdir = $(docdir)
 relnotes_DATA = RELEASE_NOTES

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/claws/PATCHSETS,v
retrieving revision 1.1.2.4387
retrieving revision 1.1.2.4388
diff -u -d -r1.1.2.4387 -r1.1.2.4388
--- PATCHSETS	27 Jun 2012 09:02:21 -0000	1.1.2.4387
+++ PATCHSETS	30 Jun 2012 09:03:19 -0000	1.1.2.4388
@@ -4375,3 +4375,4 @@
 ( cvs diff -u -r 1.213.2.207 -r 1.213.2.208 src/folder.c;  ) > 3.8.0cvs56.patchset
 ( cvs diff -u -r 1.654.2.4451 -r 1.654.2.4452 configure.ac;  cvs diff -u -r 1.9.2.24 -r 1.9.2.25 po/cs.po;  cvs diff -u -r 1.58.2.49 -r 1.58.2.50 po/de.po;  cvs diff -u -r 1.60.2.64 -r 1.60.2.65 po/es.po;  cvs diff -u -r 1.42.2.57 -r 1.42.2.58 po/fr.po;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 po/hu.po;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 po/id_ID.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/lt.po;  cvs diff -u -r 1.50.2.43 -r 1.50.2.44 po/pt_BR.po;  cvs diff -u -r 1.2.2.35 -r 1.2.2.36 po/sk.po;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 po/sv.po;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 po/zh_CN.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/zh_TW.po;  cvs diff -u -r 1.1.2.78 -r 1.1.2.79 src/gtk/authors.h;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 tools/claws.i18n.status.pl;  ) > 3.8.0cvs57.patchset
 ( cvs diff -u -r 1.654.2.4452 -r 1.654.2.4453 configure.ac;  ) > 3.8.0cvs58.patchset
+( cvs diff -u -r 1.24.2.29 -r 1.24.2.30 Makefile.am;  ) > 3.8.1cvs1.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/claws/ChangeLog,v
retrieving revision 1.396.2.3556
retrieving revision 1.396.2.3557
diff -u -d -r1.396.2.3556 -r1.396.2.3557
--- ChangeLog	27 Jun 2012 09:50:18 -0000	1.396.2.3556
+++ ChangeLog	30 Jun 2012 09:03:18 -0000	1.396.2.3557
@@ -1,3 +1,8 @@
+2012-06-30 [paul]	3.8.1cvs1
+
+	* Makefile.am
+		fix bug 2579, 'Installed headers redefine autotools-specific constants'
+
 2012-06-27 [paul]	3.8.1
 	* NEWS
 	* README