[Swfdec-commits] 7 commits - configure.ac

[Benjamin Otte]

 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0c336273e9d7569af55da1aceb9f3805b7963507
Merge: 79b2aac... 5fe3138...
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Mar 7 08:44:47 2008 +0100

    Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec/swfdec

commit 79b2aacdae0cd351a5a296451c1a31e96c0ad40f
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Mar 7 08:43:58 2008 +0100

    unset LIBVERSION
    
    nice that we ship 0.6 with a LIBVERSION of 90:0:0. No way to change that anymore.
    I wish there were some smart tools for releasing that checked this...

diff --git a/configure.ac b/configure.ac
index 6f1b731..d095054 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ else
 fi
 AC_DEFINE_UNQUOTED(SWFDEC_LEVEL_DEFAULT, $DEFAULT_DEBUG_LEVEL, [Default debug level used])
 
-SWFDEC_LIBVERSION="90:0:0"
+SWFDEC_LIBVERSION="0:0:0"
 AC_SUBST(SWFDEC_LIBVERSION)
 AM_PROG_LIBTOOL
 
commit 85195848afe049f9b6cb2082ec4a2181772431cd
Merge: 031e024... ce17b26...
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Feb 20 13:23:09 2008 +0100

    Merge commit 'ce17b26313758dfdab4c2b838effe2f6c62f7687'
    
    Conflicts:
    
    	configure.ac

diff --cc configure.ac
index 14c7904,3ce9aa4..6f1b731
--- a/configure.ac
+++ b/configure.ac
@@@ -1,8 -1,8 +1,8 @@@
  AC_PREREQ([2.58])
 -AC_INIT(swfdec,0.6.1)
 +AC_INIT(swfdec,0.7.1)
  
- [nano=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\.*//')]
- if test x"$nano" = x1 ; then
+ [is_dev=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/1/')]
+ if test x"$is_dev" = x1 ; then
    SWFDEC_CVS="yes"
  else
    SWFDEC_CVS="no"
commit 031e02414aec845ace610e751829fcf8f8f099c8
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Feb 20 13:22:13 2008 +0100

    back to development

diff --git a/configure.ac b/configure.ac
index e21fb39..14c7904 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.58])
-AC_INIT(swfdec,0.6.0)
+AC_INIT(swfdec,0.7.1)
 
 [nano=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\.*//')]
 if test x"$nano" = x1 ; then
@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE(1.6)
 dnl AC_CANONICAL_TARGET([])
 AM_MAINTAINER_MODE
 
-SWFDEC_MAJORMINOR=0.6
+SWFDEC_MAJORMINOR=0.7
 AC_SUBST(SWFDEC_MAJORMINOR)
 
 AM_CONFIG_HEADER(config.h)
commit ce17b26313758dfdab4c2b838effe2f6c62f7687
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Feb 20 13:20:51 2008 +0100

    detect development versions using new versioning scheme
    
    see http://lists.freedesktop.org/archives/swfdec/2008-January/001131.html

diff --git a/configure.ac b/configure.ac
index d643204..3ce9aa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ([2.58])
 AC_INIT(swfdec,0.6.1)
 
-[nano=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\.*//')]
-if test x"$nano" = x1 ; then
+[is_dev=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/1/')]
+if test x"$is_dev" = x1 ; then
   SWFDEC_CVS="yes"
 else
   SWFDEC_CVS="no"
commit 5ffb991f91fb2c8f521fbf6208f2908884d810ff
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Feb 20 13:17:16 2008 +0100

    back to development

diff --git a/configure.ac b/configure.ac
index e21fb39..d643204 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.58])
-AC_INIT(swfdec,0.6.0)
+AC_INIT(swfdec,0.6.1)
 
 [nano=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\.*//')]
 if test x"$nano" = x1 ; then
commit 74ecb7966289ce6e307cc27e3e189a4a2178aa21
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Feb 20 13:10:24 2008 +0100

    release 0.6.0

diff --git a/configure.ac b/configure.ac
index d5f1606..e21fb39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.58])
-AC_INIT(swfdec,0.5.90.1)
+AC_INIT(swfdec,0.6.0)
 
 [nano=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\.*//')]
 if test x"$nano" = x1 ; then
@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE(1.6)
 dnl AC_CANONICAL_TARGET([])
 AM_MAINTAINER_MODE
 
-SWFDEC_MAJORMINOR=0.5
+SWFDEC_MAJORMINOR=0.6
 AC_SUBST(SWFDEC_MAJORMINOR)
 
 AM_CONFIG_HEADER(config.h)