gnl: Update versioning

5 files changed, 14 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 43a2341..5fe2faf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,10 +36,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
    AC_SUBST(AM_DEFAULT_VERBOSITY)])
 
 dnl our libraries and install dirs use major.minor as a version
-GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
+GST_API_VERSION=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
 dnl we override it here if we need to for the release candidate of new series
-GST_MAJORMINOR=0.11
-AC_SUBST(GST_MAJORMINOR)
+GST_API_VERSION=1.0
+AC_SUBST(GST_API_VERSION)
 
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
@@ -106,23 +106,23 @@ AG_GST_GLIB_CHECK([2.31])
 
 dnl checks for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
-AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], [yes])
-AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], [yes])
+AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], [yes])
+AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], [yes])
 
-AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], [yes])
+AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], [yes])
 
 dnl check for uninstalled plugin directories for unit tests
-AG_GST_CHECK_GST_PLUGINS_GOOD($GST_MAJORMINOR, [0.11.0])
+AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [0.11.0])
 
 dnl There are paths for documentation xrefs
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
-GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
-GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`"
+GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`"
+GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_API_VERSION`"
 AC_SUBST(GLIB_PREFIX)
 AC_SUBST(GST_PREFIX)
 AC_SUBST(GSTPB_PREFIX)
 
-AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
+AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
 AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
 
 dnl *** set variables based on configure arguments ***
diff --git a/docs/libs/gnonlin-docs.sgml b/docs/libs/gnonlin-docs.sgml
index db1f307..5cb298c 100644
--- a/docs/libs/gnonlin-docs.sgml
+++ b/docs/libs/gnonlin-docs.sgml
@@ -9,7 +9,7 @@
   <bookinfo>
     <title>GNonLin &GNL_VERSION; Reference Manual</title>
     <releaseinfo>
-      for GStreamer GNonLin Plugins &GST_MAJORMINOR; (&GNL_VERSION;)
+      for GStreamer GNonLin Plugins &GST_API_VERSION; (&GNL_VERSION;)
       The latest version of this documentation can be found on-line at
       <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gnonlin/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gnonlin/html/</ulink>.
     </releaseinfo>
diff --git a/docs/version.entities.in b/docs/version.entities.in
index 13690d2..d1928cd 100644
--- a/docs/version.entities.in
+++ b/docs/version.entities.in
@@ -1,2 +1,2 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
 <!ENTITY GNL_VERSION "@VERSION@">
diff --git a/gnl/Makefile.am b/gnl/Makefile.am
index 2847577..7f8bc35 100644
--- a/gnl/Makefile.am
+++ b/gnl/Makefile.am
@@ -42,5 +42,5 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
 	           $(libgnl_la_LIBADD) \
 	           -ldl \
 	 -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.11' \
+		       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-@GST_API_VERSION@' \
 	> $@
diff --git a/gnonlin.spec.in b/gnonlin.spec.in
index e7f7b8e..4205d57 100644
--- a/gnonlin.spec.in
+++ b/gnonlin.spec.in
@@ -10,7 +10,7 @@ Vendor:		GStreamer Backpackers Team <package@gstreamer.net>
 Source:		http://download.sf.net/gnonlin/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define		gst_majorminor @GST_MAJORMINOR@
+%define		gst_majorminor @GST_API_VERSION@
 %define		gst_req @GST_REQ@
 
 Requires: 	gstreamer >= %{gst_req}