X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=blobdiff_plain;f=configure.ac;h=408f947d3d36d5f962b337b25b1c6cf4841375b4;hp=7ff3b53a22eb6249281d130d6018b8becf69cb7d;hb=2368cbc02a1b1d21da2cbeac2f67b9de8fe03fd8;hpb=c0ecafb15ceee5318895d04c0524994bd0f92d8c

diff --git a/configure.ac b/configure.ac
index 7ff3b53a..408f947d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,8 +25,8 @@ min_automake_version="1.9.3"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 # Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.9.15-beta])
-m4_define([my_issvn], [no])
+m4_define([my_version], [2.0.0])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
           ||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -43,8 +43,8 @@ MANUALVERSION_NOVICES="1.0.0"
 MANUALDATE_NOVICES="Nov. 30, 2006"
 MANUALVERSION_ADVANCED="0.0.0"
 MANUALDATE_ADVANCED="Nov. 30, 2006"
-COMPENDIUM_VERSION_DE="3.0.0-beta1-svn1118"
-COMPENDIUM_DATE_DE="2. März 2009"
+COMPENDIUM_VERSION_DE="3.0.0-beta2"
+COMPENDIUM_DATE_DE="19. Juni 2009"
 
 
 MANUALINPROGRESS_DE=m4_if(my_issvn,[yes],["~und evtl. seitdem weiter bearbeitet"])
@@ -187,7 +187,6 @@ GPG4WIN_BPKG_GNU([gettext], [libiconv])
 GPG4WIN_BPKG_GNUWIN32([zlib])
 GPG4WIN_BPKG_GNUWIN32_LIB([crypt])
 GPG4WIN_BPKG_GNUWIN32([regex])
-GPG4WIN_BPKG_GNUWIN32([libpng], [pkgconfig])
 GPG4WIN_BPKG_GNUWIN32([jpeg])
 GPG4WIN_BPKG_GNUWIN32([bsfilter])
 
@@ -199,6 +198,7 @@ GPG4WIN_BPKG_GTK_DEV([atk], [glib pkgconfig])
 GPG4WIN_BPKG_GTK_DEV([pango], [glib pkgconfig])
 GPG4WIN_BPKG_GTK_DEV([cairo], [glib pkgconfig])
 GPG4WIN_BPKG_GTK_DEV([gtk+], [libiconv gettext pkgconfig atk pango glib cairo])
+GPG4WIN_BPKG_GTK_DEV([libpng], [pkgconfig])
 
 GPG4WIN_SPKG([bzip2])
 GPG4WIN_SPKG([adns])