Skip to content

Commit

Permalink
bumped version number to 1.3.25, interface_age 1, binary age 1.
Browse files Browse the repository at this point in the history
2004-01-09  Sven Neumann  <[email protected]>

	* configure.in: bumped version number to 1.3.25, interface_age 1,
	binary age 1.

	* Makefile.am
	* gimp-2.0.pc.in
	* gimpthumb-2.0.pc.in
	* gimpui-2.0.pc.in: renamed the pkg-config files.

	* gimptool-2.0.in
	* docs/Makefile.am
	* docs/gimptool-2.0.1.in: renamed gimptool and it's manpage.

	* gimp.spec.in
	* m4macros/gimp-2.0.m4: changed accordingly.
  • Loading branch information
Sven Neumann authored and Sven Neumann committed Jan 9, 2004
1 parent 8e6ce45 commit bd5827d
Show file tree
Hide file tree
Showing 20 changed files with 74 additions and 646 deletions.
8 changes: 4 additions & 4 deletions .cvsignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ config.guess
config.sub
ltmain.sh
gimp.spec
gimptool-1.3
gimptool-2.0
gimptool-win32.c
gimp-1.3.pc
gimpthumb-1.3.pc
gimpui-1.3.pc
gimp-2.0.pc
gimpthumb-2.0.pc
gimpui-2.0.pc
gimp-zip
intltool-extract
intltool-extract.in
Expand Down
17 changes: 17 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
2004-01-09 Sven Neumann <[email protected]>

* configure.in: bumped version number to 1.3.25, interface_age 1,
binary age 1.

* Makefile.am
* gimp-2.0.pc.in
* gimpthumb-2.0.pc.in
* gimpui-2.0.pc.in: renamed the pkg-config files.

* gimptool-2.0.in
* docs/Makefile.am
* docs/gimptool-2.0.1.in: renamed gimptool and it's manpage.

* gimp.spec.in
* m4macros/gimp-2.0.m4: changed accordingly.

2004-01-08 Raphaël Quinet <[email protected]>

* plug-ins/common/jpeg.c: applied a (slightly modified) patch from
Expand Down
10 changes: 5 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ SUBDIRS = \
$(GIMP_DEVEL_DOCS) \
docs

bin_SCRIPTS = gimptool-$(LT_RELEASE) @GIMPINSTALL@
bin_SCRIPTS = gimptool-2.0 @GIMPINSTALL@

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
gimp-$(LT_RELEASE).pc \
gimpthumb-$(LT_RELEASE).pc \
gimpui-$(LT_RELEASE).pc
gimp-2.0.pc \
gimpthumb-2.0.pc \
gimpui-2.0.pc

EXTRA_SCRIPTS = gimpinstall-$(LT_RELEASE)

Expand Down Expand Up @@ -78,7 +78,7 @@ install-exec-hook:
if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \
&& rm -f gimptool \
&& $(LN_S) gimptool-$(LT_RELEASE) gimptool
&& $(LN_S) gimptool-2.0 gimptool
endif

uninstall-local:
Expand Down
21 changes: 11 additions & 10 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,12 @@ AC_SUBST(WMF_REQUIRED_VERSION)
#
GIMP_MAJOR_VERSION=1
GIMP_MINOR_VERSION=3
GIMP_MICRO_VERSION=24
GIMP_INTERFACE_AGE=0
GIMP_BINARY_AGE=0
GIMP_MICRO_VERSION=25
GIMP_INTERFACE_AGE=1
GIMP_BINARY_AGE=1

#GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
GIMP_VERSION=2.0pre1
GIMP_VERSION=2.0pre2

AC_SUBST(GIMP_MAJOR_VERSION)
AC_SUBST(GIMP_MINOR_VERSION)
Expand Down Expand Up @@ -1503,7 +1504,7 @@ devel-docs/libgimpwidgets/version
docs/Makefile
docs/gimp-1.3.1
docs/gimprc-1.3.5
docs/gimptool-1.3.1
docs/gimptool-2.0.1
docs/gimp-remote-1.3.1
tips/Makefile
cursors/Makefile
Expand All @@ -1527,17 +1528,17 @@ po/Makefile.in
po-libgimp/Makefile.in
po-plug-ins/Makefile.in
po-script-fu/Makefile.in
gimptool-1.3
gimp-1.3.pc
gimpthumb-1.3.pc
gimpui-1.3.pc
gimptool-2.0
gimp-2.0.pc
gimpthumb-2.0.pc
gimpui-2.0.pc
gimp.spec
gimp-zip
Makefile
])

AC_CONFIG_COMMANDS([chmod-scripts],
[chmod +x gimptool-1.3])
[chmod +x gimptool-2.0])

AC_CONFIG_COMMANDS([sed-po-makefiles],
[sed -e "/POTFILES =/r po-libgimp/POTFILES" po-libgimp/Makefile.in > po-libgimp/Makefile
Expand Down
2 changes: 1 addition & 1 deletion docs/.cvsignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Makefile.in
gimp-1.3.1
gimprc-1.3.5
gimp-remote-1.3.1
gimptool-1.3.1
gimptool-2.0.1
Wilber.xcf
Wilber_Construction_Kit.xcf
quick_reference
4 changes: 2 additions & 2 deletions docs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

man_MANS = \
gimp-$(LT_RELEASE).1 \
gimptool-$(LT_RELEASE).1 \
gimptool-2.0.1 \
gimprc-$(LT_RELEASE).5 \
gimp-remote-$(LT_RELEASE).1

EXTRA_DIST = \
gimp-$(LT_RELEASE).1.in \
gimprc-$(LT_RELEASE).5.in \
gimptool-$(LT_RELEASE).1.in \
gimptool-2.0.1.in \
gimp-remote-$(LT_RELEASE).1.in \
Wilber.svg \
Wilber.xcf.gz \
Expand Down
225 changes: 0 additions & 225 deletions docs/gimptool-1.3.1.in

This file was deleted.

12 changes: 6 additions & 6 deletions docs/gimptool-2.0.1.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.TH GIMPTOOL-1.3 1 "25 November 2001" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.TH GIMPTOOL-2.0 1 "8 January 2004" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.SH NAME
gimptool-1.3 - script to perform various GIMPy functions
gimptool-2.0 - script to perform various GIMPy functions
.SH SYNOPSIS
.B gimptool-1.3
.B gimptool-2.0
[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version]
[\-\-help] [\-\-quiet] [\-\-silent] [\-n] [\-\-just-print] [\-\-dry-run]
[\-\-recon] [\-\-bindir] [\-\-sbindir] [\-\-libexecdir] [\-\-datadir]
Expand All @@ -25,17 +25,17 @@ gimptool-1.3 - script to perform various GIMPy functions

.SH DESCRIPTION
.PP
\fIgimptool-1.3\fP is a tool that can, among other things, build
\fIgimptool-2.0\fP is a tool that can, among other things, build
plug-ins or scripts and install them if they are distributed in one
source file.
.PP
\fIgimptool-1.3\fP can also be used by programs that need to know what
\fIgimptool-2.0\fP can also be used by programs that need to know what
libraries and include-paths \fIGIMP\fP was compiled with. This is
especially useful in Makefiles.

.SH OPTIONS
.l
\fIgimptool-1.3\fP accepts the following options:
\fIgimptool-2.0\fP accepts the following options:
.TP 8
.B \-\-version
Print the currently installed version of \fIGIMP\fP on the standard output.
Expand Down
Loading

0 comments on commit bd5827d

Please sign in to comment.