From b1cac7175ff7729265c508436ed16a96e19f13f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lalinsky@gmail.com>
Date: Sun, 4 Apr 2010 15:01:21 +0000
Subject: [PATCH] Increment version number

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1110983 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 Makefile.am               | 2 +-
 NEWS                      | 1 +
 bindings/c/taglib_c.pc.in | 2 +-
 configure.in.in           | 2 +-
 doc/api-header.html       | 2 +-
 taglib-config.cmake       | 2 +-
 taglib-config.in          | 2 +-
 taglib/Makefile.am        | 3 ++-
 taglib/taglib.pro         | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a7a2bed0..ae647059 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ apidox:
 	fi; \
 	cp $(top_srcdir)/admin/Doxyfile.global taglib.doxyfile; \
 	echo "PROJECT_NAME        = TagLib" >> taglib.doxyfile; \
-	echo "PROJECT_NUMBER      = \"Version 1.6.1\"" >> taglib.doxyfile; \
+	echo "PROJECT_NUMBER      = \"Version 1.6.2\"" >> taglib.doxyfile; \
 	echo "INPUT               = $(srcdir)" >> taglib.doxyfile; \
 	echo "OUTPUT_DIRECTORY    = doc/api" >> taglib.doxyfile; \
 	echo "HTML_OUTPUT         = html" >> taglib.doxyfile; \
diff --git a/NEWS b/NEWS
index ca821caa..b6db8d1b 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ TagLib 1.6.2 (Apr 5, 2010)
  * Fixed compilation of the test runner on Windows.
  * Store ASF attributes larger than 64k in the metadata library object.
  * Ignore trailing non-data atoms when parsing MP4 covr atoms.
+ * Don't upgrade ID3v2.2 frame TDA to TDRC. (BUG:228968)
 
 TagLib 1.6.1 (Oct 31, 2009)
 ===========================
diff --git a/bindings/c/taglib_c.pc.in b/bindings/c/taglib_c.pc.in
index 974177d7..7fb3df6e 100644
--- a/bindings/c/taglib_c.pc.in
+++ b/bindings/c/taglib_c.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: TagLib C Bindings
 Description: Audio meta-data library (C bindings)
 Requires: taglib
-Version: 1.6.1
+Version: 1.6.2
 Libs: -L${libdir} -ltag_c
 Cflags: -I${includedir}/taglib 
diff --git a/configure.in.in b/configure.in.in
index 8fce9997..d0374906 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -38,7 +38,7 @@ dnl Perform program name transformation
 AC_ARG_PROGRAM
 
 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(taglib,1.6.1)
+AM_INIT_AUTOMAKE(taglib,1.6.2)
 
 dnl almost the same like KDE_SET_PEFIX but the path is /usr/local
 dnl
diff --git a/doc/api-header.html b/doc/api-header.html
index f15880c0..dee15c46 100644
--- a/doc/api-header.html
+++ b/doc/api-header.html
@@ -17,7 +17,7 @@
             <td>
               <div id="intro">
                 <table border="0" height="119" cellpadding="0" cellspacing="0" width="100%">
-                    <tr><td valign="top"><h1>TagLib 1.6.1 ($title)</h1></td></tr>
+                    <tr><td valign="top"><h1>TagLib 1.6.2 ($title)</h1></td></tr>
                     <tr>
                       <td valign="bottom">
                         <div id="links">
diff --git a/taglib-config.cmake b/taglib-config.cmake
index 39630a0c..ec25fc73 100644
--- a/taglib-config.cmake
+++ b/taglib-config.cmake
@@ -35,7 +35,7 @@ do
 	  flags="$flags -I$includedir/taglib"
 	  ;;
     --version)
-	  echo 1.6.1
+	  echo 1.6.2
 	  ;;
     --prefix)
 	  echo $prefix
diff --git a/taglib-config.in b/taglib-config.in
index 95992a0b..453860fa 100644
--- a/taglib-config.in
+++ b/taglib-config.in
@@ -35,7 +35,7 @@ do
 	  flags="$flags -I$includedir/taglib"
 	  ;;
     --version)
-	  echo 1.6.1
+	  echo 1.6.2
 	  ;;
     --prefix)
 	  echo $prefix
diff --git a/taglib/Makefile.am b/taglib/Makefile.am
index 73667aa8..5c150135 100644
--- a/taglib/Makefile.am
+++ b/taglib/Makefile.am
@@ -46,8 +46,9 @@ taglib_includedir = $(includedir)/taglib
 #  7:0:6 -- TagLib 1.6 RC1
 #  7:1:6 -- TagLib 1.6
 #  8:0:7 -- TagLib 1.6.1
+#  8:1:7 -- TagLib 1.6.2
 
-libtag_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 8:0:7
+libtag_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 8:1:7
 libtag_la_LIBADD = ./mpeg/libmpeg.la ./ogg/libogg.la ./flac/libflac.la ./mpc/libmpc.la \
 	./ape/libape.la ./toolkit/libtoolkit.la ./wavpack/libwavpack.la \
 	./trueaudio/libtrueaudio.la ./riff/libriff.la \
diff --git a/taglib/taglib.pro b/taglib/taglib.pro
index c0d8ba11..7783545e 100644
--- a/taglib/taglib.pro
+++ b/taglib/taglib.pro
@@ -9,7 +9,7 @@ CONFIG -= qt
 DEFINES += HAVE_ZLIB=1 NDEBUG WITH_ASF WITH_MP4
 LIBS += -lz
 TARGET = TagLib
-VERSION = 1.6
+VERSION = 1.6.2
 DEPENDPATH += . \
            ape \
            asf \