From 4da887c290341dd757726c6ab52952d0b63742ab Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Sat, 21 Feb 2009 15:05:53 +0000
Subject: * NEWS: upd * configure.in: 0.60 * Makefile.am: Fix running make
 distcheck

---
 ChangeLog    |  8 ++++++++
 Makefile.am  |  8 ++++----
 NEWS         | 36 ++++++++++++++++++++++++++++++++++++
 configure.in |  2 +-
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e1be364..86f6498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+=== shared-mime-info 0.60 ===
+
+2009-02-21  Bastien Nocera  <hadess@hadess.net>
+
+	* NEWS: upd
+	* configure.in: 0.60
+	* Makefile.am: Fix running make distcheck
+
 2009-02-21  Bastien Nocera  <hadess@hadess.net>
 
 	* HACKING: Add some more details about the test suite
diff --git a/Makefile.am b/Makefile.am
index a49b0d0..dd6a5b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=po
+SUBDIRS=. po
 
 INCLUDES = $(ALL_CFLAGS)
 
@@ -70,9 +70,9 @@ uninstall-hook:
 all: check
 	make -C po shared-mime-info.pot
 
-check:
-	@if test -n $(XMLLINT) ; then \
-		xmllint --noout --valid $(top_builddir)/freedesktop.org.xml;	\
+check: freedesktop.org.xml
+	if test -n $(XMLLINT) ; then \
+		xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml;	\
 	fi
 	if test -d CVS/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \
 		mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \
diff --git a/NEWS b/NEWS
index 9aa47f1..7ebe22a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,39 @@
+shared-mime-info 0.60 (2009-02-21)
+* Mime-type Changes:
+- Add alias for SMIL
+- Fix SMIL detection
+- Add Annodex mime-type
+- Only use .ogg for audio Ogg files
+- Fix RDF mime-type
+- Oasis mime-type fixes
+- Make PICTURES match a picture CD but not "pictures"
+- Add alias for application/zip
+- Add Microsoft Document Imaging format
+- Add magic for 7z archives
+- Add cb7 comic book archives
+- Add magic for XCF files
+- Remove application/x-msi magic
+- Add audio/x-gsm mime-type
+- Add MS cab mime-type
+- Add FictionBook mime-type
+- Fix PKCS#12 bundles definition (not text files)
+- Add PKCS#7 and PkiPath mime-types
+- Add application/vnd.ms-wpl mime-type
+- Add more aliases for media types
+- Add alias for text/x-csv
+- Fix comment for Gnucash files
+- Make Javascript a sub-class of C
+- Add *.vapi as a glob for Vala files
+- Fix image/fits to match IANA
+- Add Office 2007/OpenXML documents mime-types
+- Add Pocket Word and AportisDoc document types
+- Fix MS ICO, and Photoshop image to match IANA
+
+* Other changes:
+- Regenerate the pot file when needed
+- Some clarifications in the spec
+- Build fix when srcdir != builddir
+
 shared-mime-info 0.51 (2008-07-23)
 * Mime-type Changes:
 - Strings review
diff --git a/configure.in b/configure.in
index 975019b..b749d94 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([shared-mime-info],[0.51],[https://bugs.freedesktop.org/enter_bug.cgi?product=shared-mime-info])
+AC_INIT([shared-mime-info],[0.60],[https://bugs.freedesktop.org/enter_bug.cgi?product=shared-mime-info])
 
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 check-news])
 
-- 
cgit v1.2.3