[Kst] extragear/graphics/kst

[Matthew D Truch]

SVN commit 452157 by truch:

[Perhaps this isn't allowed, so let me know if I've overstepped my bounds.]

Conglomerate kst version numbers so they only have to be changed in one 
place (in configure.in.in).  This makes it much easier (and safer) to 
create a kst release.  Extra helpful for people making rpms (or slack 
packages) from subversion and who want to have version numbers that
actually change more often than the rare times kst is officially released.

Don Wiebe contributed the bulk of this patch.


 M  +8 -1      configure.in.in  
 M  +2 -3      devel-docs/RELEASE  
 D             kst.lsm  
 A             kst.lsm.in  
 M  +1 -1      kst.spec.in  
 M  +4 -4      kst/Makefile.am  
 M  +0 -1      kst/extensions/js/bind_kst.cpp  
 M  +0 -1      kst/kstdebug.cpp  
 M  +0 -1      kst/kstdebugdialog_i.cpp  
 D             kst/kstversion.h  
 M  +0 -1      kst/main.cpp  


--- trunk/extragear/graphics/kst/configure.in.in #452156:452157
@@ -2,11 +2,18 @@
 AC_C_BIGENDIAN
 AC_PROG_YACC
 AM_PROG_LEX
-dnl AC_OUTPUT(kst/kst.spec)
+dnl AC_OUTPUT(kst/kst.spec kst/kst.lsm)
 
 AC_HEADER_TIME
 AC_CHECK_HEADERS(sys/time.h)
 
+KST_VERSION=1.2.0_devel
+KST_LIBKST_VERSION=1:2:0
+
+AC_SUBST([KST_VERSION])
+AC_SUBST([KST_LIBKST_VERSION])
+AC_DEFINE_UNQUOTED([KSTVERSION], ["${KST_VERSION}"], [Define to the KST version number])
+
 # PIOLIB Test
 ac_piolib_includes=""
 ac_piolib_libraries=""
--- trunk/extragear/graphics/kst/devel-docs/RELEASE #452156:452157
@@ -3,9 +3,8 @@
 - update from CVS
 - edit RELEASE.NOTES
 - run a regression test and make sure it completely passes
-- update kst/kstversion.h to set the version number
-- set the version numbers in kst.lsm and kst.spec.in
-- set the libkst version number
+- update configure.in.in to set the version number and the libkst interface
+  version
 - update ../doc
 - make sure documentation has correct version for the <releaseinfo> tag
   of index.docbook and correct version of KST, QT, and KDE in the installation
--- trunk/extragear/graphics/kst/kst.spec.in #452156:452157
@@ -4,7 +4,7 @@
 
 Summary: A data viewing program for KDE.
 Name: kst
-Version: 1.2.0_devel
+Version: @KST_VERSION@
 Release: 1
 Source0: kst-%{version}.tar.gz
 Group: X11/Applications/Scientific
--- trunk/extragear/graphics/kst/kst/Makefile.am #452156:452157
@@ -28,7 +28,7 @@
 	kstscalar.cpp $(PROCPS_COPY) \
 	kststring.cpp
 
-libkst_la_LDFLAGS = -version-info 1:2:0 -no-undefined $(all_libraries)
+libkst_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ -no-undefined $(all_libraries)
 libkst_la_LIBADD = $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE)
 
 noinst_LTLIBRARIES = libkstplot.la libkstnonguiapp.la
@@ -69,7 +69,7 @@
 	eparse.c \
 	escan.c
 
-libkstmath_la_LDFLAGS = -version-info 1:2:0 $(all_libraries)
+libkstmath_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries)
 libkstmath_la_LIBADD = $(LIB_KDECORE) libkst.la
 
 d2asc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -112,7 +112,7 @@
 	comboboxselection_i.cpp \
 	editmultiplewidget.ui
 
-libkstguiapp_la_LDFLAGS = -version-info 1:2:0 $(all_libraries)
+libkstguiapp_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries)
 #libkstguiapp_la_LIBADD = $(LIB_KIO) libkstmath.la libkst.la
 libkstguiapp_la_LIBADD = $(LIB_KIO) libkstmath.la
 
@@ -227,7 +227,7 @@
 include_HEADERS = kstdatasource.h kstobject.h kst_export.h kstsharedptr.h rwlock.h
 
 libkstapp_la_LIBADD = $(LIB_KDEPRINT) libkstplot.la libkstguiapp.la $(LIB_KMDI)
-libkstapp_la_LDFLAGS = -version-info 1:2:0 $(all_libraries)
+libkstapp_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries)
 
 kst_SOURCES = main.cpp
 kst_LDADD = libkstapp.la
--- trunk/extragear/graphics/kst/kst/extensions/js/bind_kst.cpp #452156:452157
@@ -43,7 +43,6 @@
 #include <kstdatacollection.h>
 #include <kstdebug.h>
 #include <kstdoc.h>
-#include <kstversion.h>
 #include <kstviewwindow.h>
 
 #include <kdebug.h>
--- trunk/extragear/graphics/kst/kst/kstdebug.cpp #452156:452157
@@ -19,7 +19,6 @@
 #include "kstdatasource.h"
 #include "kstdebug.h"
 #include "kstdoc.h"
-#include "kstversion.h"
 #include "logevents.h"
 
 #include <kapplication.h>
--- trunk/extragear/graphics/kst/kst/kstdebugdialog_i.cpp #452156:452157
@@ -31,7 +31,6 @@
 #include "kstdebugdialog_i.h"
 #include "kstdoc.h"
 #include "kstlogwidget.h"
-#include "kstversion.h"
 
 /*
  *  Constructs a KstDebugDialogI which is a child of 'parent', with the
--- trunk/extragear/graphics/kst/kst/main.cpp #452156:452157
@@ -38,7 +38,6 @@
 #include "kstsvector.h"
 #include "kstavector.h"
 #include "kstvcurve.h"
-#include "kstversion.h"
 #include "plugincollection.h"