bumped version number to 1.3.5.

2002-03-11  Sven Neumann  <sven@gimp.org>

	* configure.in: bumped version number to 1.3.5.

	* NEWS: updated.

	* themes/Default/imagerc: fixed typos.

2002-03-11  Sven Neumann  <sven@gimp.org>

	* POTIFLES.in: fixed stupid error, need to refer to gimp-tips.xml.in,
	not the generated header.

	* Makefile.am: removed unneeded POTFILES rule.

	* update.sh: removed redundant call to intltool-extract.

ChangeLog

@@ -1,3 +1,11 @@
+2002-03-11  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: bumped version number to 1.3.5.
+
+	* NEWS: updated.
+	
+	* themes/Default/imagerc: fixed typos.
+
 2002-03-11  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimplayerlistview.[ch]: added a GimpAnchorItemFunc

NEWS

@@ -6,6 +6,11 @@ GIMP 1.3 is the development branch of The GIMP. Here's where the
 development takes place on the road to the next stable release
 dubbed GIMP 1.4.
 
+Overview of Changes in GIMP 1.3.5
+=================================
+- Made tool options dockable [Mitch]
+
+
 Overview of Changes in GIMP 1.3.4
 =================================
 - Improved image status bar and image title [Mitch]

configure.in

@@ -19,7 +19,7 @@ GTKDOC_REQUIRED_VERSION=0.9
 #
 GIMP_MAJOR_VERSION=1
 GIMP_MINOR_VERSION=3
-GIMP_MICRO_VERSION=4
+GIMP_MICRO_VERSION=5
 GIMP_INTERFACE_AGE=0
 GIMP_BINARY_AGE=0
 GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION

themes/Default/imagerc

@@ -97,8 +97,8 @@ style "gimp-icons"
     }
   stock["gimp-selection-subtract"] =
     {
-      { "images/stock-button-selection-substract.png", *, *, "gtk-button" },
+      { "images/stock-button-selection-subtract.png", *, *, "gtk-button" },
-      { "images/stock-button-selection-substract.png", *, *, * }
+      { "images/stock-button-selection-subtract.png", *, *, * }
     }
   stock["gimp-selection-intersect"] =
     {

tips/ChangeLog

@@ -1,3 +1,12 @@
+2002-03-11  Sven Neumann  <sven@gimp.org>
+
+	* POTIFLES.in: fixed stupid error, need to refer to gimp-tips.xml.in,
+	not the generated header.
+
+	* Makefile.am: removed unneeded POTFILES rule.
+
+	* update.sh: removed redundant call to intltool-extract.
+
 2002-03-09  Sven Neumann  <sven@gimp.org>
 
 	* Makefile.am: added update-po rule, improved dist-hook rule.

tips/Makefile.am

@@ -25,8 +25,6 @@ EXTRA_DIST = \
 
 CLEANFILES = $(GETTEXT_PACKAGE)-tips.po
 
-DISTCLEANFILES = POTFILES
-
 MAINTAINERCLEANFILES = $(tipsdata_DATA)
 
 
@@ -37,25 +35,7 @@ GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-packa
 
 MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE)-tips --dist
 
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
+$(srcdir)/$(GETTEXT_PACKAGE)-tips.pot: POTFILES.in
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' 						\
-		    -e "s/^\[.*\] +//" 					\
-		    -e '/^[ 	]*$$/d' 				\
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-$(srcdir)/$(GETTEXT_PACKAGE)-tips.pot: $(POTFILES)
 	$(GENPOT)
 
 update-po: $(srcdir)/$(GETTEXT_PACKAGE)-tips.pot

tips/POTFILES.in

@@ -1 +1 @@
-tips/gimp-tips.xml.in.h
+tips/gimp-tips.xml.in

tips/update.sh

@@ -23,13 +23,11 @@ echo ./update.sh da    created new pot file and updated the da.po file
 
 elif [ "x$1" = "x" ]; then 
 
-intltool-extract --type=gettext/xml gimp-tips.xml.in
 echo "Building the $PACKAGE.pot ..."
 intltool-update --gettext-package $PACKAGE --pot
 
 else
 
-intltool-extract --type=gettext/xml gimp-tips.xml.in
 echo "Building the $PACKAGE.pot, merging and updating ..."
 intltool-update --gettext-package $PACKAGE $1