summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-05-17 09:13:02 +0000
committerCarl Worth <cworth@cworth.org>2005-05-17 09:13:02 +0000
commit5cc39a708c623cbe6a8c5efdad538778b2fbadd7 (patch)
tree87516e7872251b7621f8e038cca4e8ee211d4a36
parentec84ace5a6830778d29d36f9fc87361e8545f57b (diff)
Remove #ifdef munging since we once again support either #if or #ifdef.
-rw-r--r--ChangeLog5
-rw-r--r--RELEASING7
-rwxr-xr-xutil/cairo-api-update1
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6739f7588..5a5ee99fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-05-17 Carl Worth <cworth@cworth.org>
+ * util/cairo-api-update: Remove #ifdef munging since we once again
+ support either #if or #ifdef.
+
+2005-05-17 Carl Worth <cworth@cworth.org>
+
* RELEASING: Update instructions to match output of 'make
distcheck'
diff --git a/RELEASING b/RELEASING
index 31a711efc..c6513f451 100644
--- a/RELEASING
+++ b/RELEASING
@@ -32,11 +32,14 @@ fixes are committed. Here are the steps to follow:
snapshot. Summarize major changes briefly in a style similar
to other entries in NEWS. Take special care to note any
incompatible changes in the API. These should be easy to find
- by looking for cairo.h in the ChangeLog. Additionally, the
+ by looking for cairo*.h in the ChangeLog. Additionally, the
output of the following command should be examined using the
previous snapshot tag:
- cvs diff -r SNAPSHOT_X_Y_Z src/cairo.h
+ cvs diff -r SNAPSHOT_X_Y_Z src/*.h
+
+ [Hmm, it would be nice to have a pattern for that command that
+ would exclude private header files.]
4) Increment CAIRO_VERSION in configure.in
diff --git a/util/cairo-api-update b/util/cairo-api-update
index 5cc2386cc..e16df43fd 100755
--- a/util/cairo-api-update
+++ b/util/cairo-api-update
@@ -52,7 +52,6 @@ cairo_api_update() {
s/CAIRO_OPERATOR_IN_REVERSE/CAIRO_OPERATOR_DEST_IN/g
s/CAIRO_OPERATOR_OUT_REVERSE/CAIRO_OPERATOR_DEST_OUT/g
s/CAIRO_OPERATOR_ATOP_REVERSE/CAIRO_OPERATOR_DEST_ATOP/g
- s/^#\([ ]*\)ifdef[ ]*CAIRO_HAS/#\1if CAIRO_HAS/g
}
' $backup > $file