2011-03-20 [colin] 3.7.8cvs67

	* configure.ac
		Drop the *_DISABLE_DEPRECATED. We'll put them back
		when we'll have time to handle them

diff --git a/ChangeLog b/ChangeLog
index 374b82e0b700acdeacf7a6616b64b44883524e94..c235bda40e10241dcf94c9bc7842b200b0c21712 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-20 [colin]     3.7.8cvs67
+
+       * configure.ac
+               Drop the *_DISABLE_DEPRECATED. We'll put them back
+               when we'll have time to handle them
+

 2011-03-18 [paul]      3.7.8cvs66
 
        * src/textview.c
 2011-03-18 [paul]      3.7.8cvs66
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index f4474eeb8fd3fb4b43956d93ee15f7de85078012..6db9a22d87f85e5fb4fe90f650659c4181f0dc03 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4140,3 +4140,4 @@
 ( cvs diff -u -r 1.100.2.77 -r 1.100.2.78 AUTHORS;  cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/gtk/authors.h;  cvs diff -u -r 1.115.2.234 -r 1.115.2.235 src/main.c;  ) > 3.7.8cvs64.patchset
 ( cvs diff -u -r 1.42.2.52 -r 1.42.2.53 po/fr.po;  ) > 3.7.8cvs65.patchset
 ( cvs diff -u -r 1.96.2.230 -r 1.96.2.231 src/textview.c;  ) > 3.7.8cvs66.patchset
 ( cvs diff -u -r 1.100.2.77 -r 1.100.2.78 AUTHORS;  cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/gtk/authors.h;  cvs diff -u -r 1.115.2.234 -r 1.115.2.235 src/main.c;  ) > 3.7.8cvs64.patchset
 ( cvs diff -u -r 1.42.2.52 -r 1.42.2.53 po/fr.po;  ) > 3.7.8cvs65.patchset
 ( cvs diff -u -r 1.96.2.230 -r 1.96.2.231 src/textview.c;  ) > 3.7.8cvs66.patchset

+( cvs diff -u -r 1.654.2.4215 -r 1.654.2.4216 configure.ac;  ) > 3.7.8cvs67.patchset

diff --git a/configure.ac b/configure.ac
index c22c1946ea95e85d6e7fe1029c6981d15ed0f17a..e36ceaab5588868bd4064566c6d1d703ae2d3e4a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=66
+EXTRA_VERSION=67

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -156,7 +156,8 @@ fi
 CFLAGS="$CFLAGS -Wall -Wno-pointer-sign"
 
 if test $USE_MAINTAINER_MODE = yes; then
 CFLAGS="$CFLAGS -Wall -Wno-pointer-sign"
 
 if test $USE_MAINTAINER_MODE = yes; then

-       CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
+       CFLAGS="-g -Wall -Wno-pointer-sign"
+#      CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"

 fi
 
 pthread_name=
 fi
 
 pthread_name=