[poppler] 4 commits - CMakeLists.txt configure.ac msvc/config.h NEWS qt4/demos qt4/src qt4/tests

[Albert Astals Cid]

 CMakeLists.txt        |    2 +-
 NEWS                  |   15 +++++++++++++++
 configure.ac          |    2 +-
 msvc/config.h         |    6 +++---
 qt4/demos/Makefile.am |    3 +++
 qt4/src/Doxyfile      |    2 +-
 qt4/src/Makefile.am   |    5 ++++-
 qt4/tests/Makefile.am |    3 +++
 8 files changed, 31 insertions(+), 7 deletions(-)

New commits:
commit 4254f1237ebed09b8e1c85f935a20bde3d8f36ff
Merge: ed6c0c2... 0569ae7...
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 27 20:44:27 2008 +0100

    Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler

commit ed6c0c260837a0025279765ef7778b83d6ee2209
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 27 20:43:45 2008 +0100

    fix build and distcheck with autools

diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
index 6e22288..805f8a1 100644
--- a/qt4/demos/Makefile.am
+++ b/qt4/demos/Makefile.am
@@ -60,3 +60,6 @@ toc.$(OBJEXT): toc.moc
 viewer.$(OBJEXT): viewer.moc
 
 poppler_qt4viewer_LDADD = $(LDADDS)
+
+clean-generic:
+	rm *.moc
\ No newline at end of file
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index 10310a1..444882f 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -65,4 +65,7 @@ libpoppler_qt4_la_LDFLAGS = -version-info 2:0:0
 .h.moc:
 	moc -i $< -o $@
 
-poppler-optcontent.$(OBJEXT): poppler-optcontent.moc
+poppler-optcontent.lo: poppler-optcontent.moc
+
+clean-generic:
+	rm *.moc
diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
index 3ad4aac..5072fcf 100644
--- a/qt4/tests/Makefile.am
+++ b/qt4/tests/Makefile.am
@@ -55,6 +55,9 @@ stress_poppler_dir_SOURCES =			\
 
 stress_poppler_dir_LDADD = $(LDADDS)
 
+clean-generic:
+	rm *.moc
+
 if BUILD_POPPLER_QT4
 TESTS = \
 	check_attachments	\
commit 344d55539b1b6bcabec609fd828db372a07491b4
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 27 20:43:13 2008 +0100

    fill the NEWS for 0.7.1

diff --git a/NEWS b/NEWS
index 90f6b96..486d039 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Release 0.7.1 (0.8 Beta 2)
+
+	Major Changes:
+	 * Really distribute CMake files as optional build tool
+	 * Initial Optional Content support in core and in the Qt4 frontend
+
+	Minor Changes:
+	 * Allow grouped checkboxes to be selected individually
+	 * Qt4 demo program improvements
+	 * Keep cairo and cairo_shape consistent
+	 * Safety checks on Splash renderer so that it does not draw outside the allocated bitmap
+	 * Do not try to display bitmaps of invalid size
+	 * Fix building with exceptions
+	 * Improvements for building with MSVC and CMake
+
 Release 0.7.0 (0.8 Beta 1)
 
 	* Saving support
commit 1c47633ba782021978fa34d41a4ab0badf3af9d3
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 27 20:42:55 2008 +0100

    Increase version number to 0.7.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b97b595..0aff96d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package(PkgConfig)
 include(MacroEnsureVersion)
 include(MacroBoolTo01)
 
-set(POPPLER_VERSION "0.7.0")
+set(POPPLER_VERSION "0.7.1")
 
 # command line switches
 option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
diff --git a/configure.ac b/configure.ac
index b34cd45..b871c92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(poppler, 0.7.0)
+AC_INIT(poppler, 0.7.1)
 AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(poppler/poppler-config.h)
diff --git a/msvc/config.h b/msvc/config.h
index 2ef6087..7451df6 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -32,13 +32,13 @@
 #define PACKAGE_NAME "poppler"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "poppler 0.7"
+#define PACKAGE_STRING "poppler 0.7.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "poppler"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.7"
+#define PACKAGE_VERSION "0.7.1"
 
 /* Poppler data dir */
 #define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -53,7 +53,7 @@
 /* #undef USE_EXCEPTIONS */
 
 /* Version number of package */
-#define VERSION "0.7"
+#define VERSION "0.7.1"
 
 #define snprintf _snprintf
 #define unlink _unlink
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index d6e00c6..07cb570 100644
--- a/qt4/src/Doxyfile
+++ b/qt4/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = "Poppler Qt4 "
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.7.0
+PROJECT_NUMBER         = 0.7.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put.