2006-09-04 [paul] 2.4.0cvs139

	* tools/make.themes.project
		use "AUTOMAKE_OPTIONS = dist-bzip2"
		instead of homebrewed "make release"

diff --git a/ChangeLog b/ChangeLog
index 48be764c68f2101a89bbb172cbf048a2a62122cc..b0049e6bc99dc257285819a7babe585c9ec8b626 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-04 [paul]      2.4.0cvs139
+
+       * tools/make.themes.project
+               use "AUTOMAKE_OPTIONS = dist-bzip2"
+               instead of homebrewed "make release"
+

 2006-09-03 [colin]     2.4.0cvs138
 
        * src/folderview.c
 2006-09-03 [colin]     2.4.0cvs138
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 5945c727c45be1ae7f7a89a273a20aa794e83373..bf2a8c39a034860973bad14bde5d9cf47eee4a87 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1830,3 +1830,4 @@
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_other.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/prefs_spelling.c;  ) > 2.4.0cvs136.patchset
 ( cvs diff -u -r 1.382.2.305 -r 1.382.2.306 src/compose.c;  ) > 2.4.0cvs137.patchset
 ( cvs diff -u -r 1.207.2.118 -r 1.207.2.119 src/folderview.c;  ) > 2.4.0cvs138.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_other.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/prefs_spelling.c;  ) > 2.4.0cvs136.patchset
 ( cvs diff -u -r 1.382.2.305 -r 1.382.2.306 src/compose.c;  ) > 2.4.0cvs137.patchset
 ( cvs diff -u -r 1.207.2.118 -r 1.207.2.119 src/folderview.c;  ) > 2.4.0cvs138.patchset

+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/make.themes.project;  ) > 2.4.0cvs139.patchset

diff --git a/configure.ac b/configure.ac
index 2464cc0d2c8065cb4d46714b1660cad7e6449349..7cf73c39b6fb9b7c27f503e484f8cfc8fc566732 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=138
+EXTRA_VERSION=139

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/tools/make.themes.project b/tools/make.themes.project
index a0dba8b81e04e9ed31b1e824553fa741dffffeca..4f15c488455016b6837791a6a36f85aa86eff8eb 100644 (file)
--- a/tools/make.themes.project
+++ b/tools/make.themes.project
@@ -150,22 +150,15 @@ function createMakefileAm()
 {
   cd ${DDIR}
   MA=Makefile.am
 {
   cd ${DDIR}
   MA=Makefile.am

-  echo "EXTRA_DIST = INSTALL "${NOTES} ${NAME} > $MA
+  echo "AUTOMAKE_OPTIONS = dist-bzip2" > $MA
+  echo "" >> $MA
+  echo "EXTRA_DIST = INSTALL "${NOTES} ${NAME} >> $MA

   echo "" >> $MA
   echo -n "SUBDIRS =" >> $MA
   for dir in *;
   do test -d "$dir" && echo -n " ${dir}" >> $MA;
   done;
   echo "" >> $MA
   echo "" >> $MA
   echo -n "SUBDIRS =" >> $MA
   for dir in *;
   do test -d "$dir" && echo -n " ${dir}" >> $MA;
   done;
   echo "" >> $MA

-  echo "" >> $MA
-  echo "BZIP2_ENV =" >> $MA
-  echo "" >> $MA
-  echo "release: distdir" >> $MA
-  echo "       -chmod -R a+r \$(distdir)" >> $MA
-  echo "       GZIP=\$(GZIP_ENV) \$(AMTAR)\$(TAR) chozf \$(distdir).tar.gz \$(distdir)" >> $MA
-  echo "       BZIP2=\$(BZIP2_ENV) \$(AMTAR)\$(TAR) --bzip2 -chof \$(distdir).tar.bz2 \$(distdir)" >> $MA
-  echo "       -rm -rf \$(distdir)" >> $MA
-  echo "" >> $MA

   cd ".."
   echo "Created Makefile.am"
 }
   cd ".."
   echo "Created Makefile.am"
 }