Merging in the changes from the 0.47 release branch. Also updating version numbers for 0.47 development.

(bzr r8848)

11 files changed, 31 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b8053a02..c92c1e25d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 PROJECT(inkscape)
 
-SET(INKSCAPE_VERSION 0.46+devel)
+SET(INKSCAPE_VERSION 0.47+devel)
 SET(PROJECT_NAME inkscape)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
diff --git a/Makefile.am b/Makefile.am
index 2d3b8f004..930bfa48b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,7 +185,6 @@ EXTRA_DIST = \
 	packaging/win32/welcomefinish.bmp	\
 	packaging/win32/welcomefinish.svg	\
 	packaging/win32/portable/help.html \
-	packaging/win32/portable/portable.7z \
 	packaging/win32/portable/readme.packaging.txt \
 	packaging/win32/portable/App/readme.txt \
 	packaging/win32/portable/App/AppInfo/appicon.ico \
diff --git a/NEWS b/NEWS
index e919c7486..043d2c10f 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1 @@
-Inkscape 0.47 pre-release.  More here later.
+Inkscape 0.48 pre-release.  More here later.
diff --git a/build-lx.xml b/build-lx.xml
index 5f33638eb..8841fe3a9 100644
--- a/build-lx.xml
+++ b/build-lx.xml
@@ -39,7 +39,7 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.46+devel"/>
+  <property name="version"       value="0.47+devel"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>
diff --git a/build.xml b/build.xml
index 16443dfc2..c32e22b17 100644
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.46+devel"/>
+  <property name="version"       value="0.47+devel"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>
diff --git a/configure.ac b/configure.ac
index fbfa2e5df..e34da61c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
 # `dpkg --compare-versions'.  (ii) We don't always know what the next
 # version is going to be called until about the time we release it
 # (whereas we always know what the previous version was called).
-AC_INIT(inkscape, 0.46+devel)
+AC_INIT(inkscape, 0.47+devel)
 
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/main.cpp])
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi
index 9b840f550..651ba3cb2 100644
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -7,8 +7,9 @@
 ; DEFINES
 ; #######################################
 !define PRODUCT_NAME "Inkscape"
-!define PRODUCT_VERSION "0.46+devel"
-!define PRODUCT_REVISION 1
+!define PRODUCT_VERSION "0.47+devel"
+!define PRODUCT_REVISION 3
+!define PRODUCT_VERSION_4 "0.47.0.3"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\inkscape.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 ;!define DUMMYINSTALL ; Define this to make it build quickly, not including any of the files or code in the sections, for quick testing of features of the installer and development thereof.
@@ -128,6 +129,16 @@ OutFile           "Inkscape-${PRODUCT_VERSION}-${PRODUCT_REVISION}.exe"
 InstallDir        "$PROGRAMFILES\Inkscape"
 InstallDirRegKey  HKLM "${PRODUCT_DIR_REGKEY}" ""
 
+VIProductVersion "${PRODUCT_VERSION_4}"
+VIAddVersionKey ProductName "${PRODUCT_NAME}"
+VIAddVersionKey Comments "Licensed under the GNU GPL"
+VIAddVersionKey CompanyName "inkscape.org"
+VIAddVersionKey LegalCopyright "© 2009 Inkscape"
+VIAddVersionKey FileDescription "${PRODUCT_NAME}"
+VIAddVersionKey FileVersion "${PRODUCT_VERSION_4}"
+VIAddVersionKey ProductVersion "${PRODUCT_VERSION_4}"
+VIAddVersionKey InternalName "${PRODUCT_NAME}"
+
 Var askMultiUser
 Var filename
 Var MultiUser
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1aaf436dc..172578154 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -20,10 +20,12 @@ src/live_effects/lpe-path_length.cpp
 src/live_effects/lpe-perp_bisector.cpp
 src/live_effects/lpe-perspective_path.cpp
 src/live_effects/lpe-recursiveskeleton.cpp
+src/live_effects/lpe-skeleton.cpp
 src/live_effects/lpe-tangent_to_curve.cpp
 src/live_effects/lpe-test-doEffect-stack.cpp
 src/live_effects/lpe-text_label.cpp
 src/lpe-tool-context.cpp
+src/ui/dialog/session-player.cpp
 src/ui/dialog/whiteboard-connect.cpp
 src/ui/dialog/whiteboard-sharewithchat.cpp
 src/ui/dialog/whiteboard-sharewithuser.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 63b27398a..30d1e5f42 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -266,7 +266,7 @@ check_PROGRAMS = cxxtests
 
 # List of all tests to be run.
 TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
-# XFAIL_TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
+XFAIL_TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
 
 # including the the testsuites here ensures that they get distributed
 cxxtests_SOURCES = cxxtests.cpp libnr/nr-compose-reference.cpp $(CXXTEST_TESTSUITES)
diff --git a/src/inkscape.rc b/src/inkscape.rc
index d48b68c43..3b946a067 100644
--- a/src/inkscape.rc
+++ b/src/inkscape.rc
@@ -3,8 +3,8 @@ APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
 1                   24            DISCARDABLE     "./inkscape-manifest.xml"
 
 1 VERSIONINFO
-    FILEVERSION     0,46,0,0
-    PRODUCTVERSION  0,46,0,0
+    FILEVERSION     0,47,0,0
+    PRODUCTVERSION  0,47,0,0
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -13,11 +13,11 @@ BEGIN
             VALUE "Comments", "Published under the GNU GPL"
             VALUE "CompanyName", "inkscape.org"
             VALUE "FileDescription", "Inkscape"
-            VALUE "FileVersion", "0.46.0"
+            VALUE "FileVersion", "0.47"
             VALUE "InternalName", "Inkscape"
-            VALUE "LegalCopyright", "© 2007 Inkscape"
+            VALUE "LegalCopyright", "© 2009 Inkscape"
             VALUE "ProductName", "Inkscape"
-            VALUE "ProductVersion", "0.46.0"
+            VALUE "ProductVersion", "0.47"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/inkview.rc b/src/inkview.rc
index 9f643eb4c..7a02bf11a 100644
--- a/src/inkview.rc
+++ b/src/inkview.rc
@@ -3,8 +3,8 @@ APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
 1                   24            DISCARDABLE     "./inkview-manifest.xml"

 

 1 VERSIONINFO

-    FILEVERSION     0,46,0,0

-    PRODUCTVERSION  0,46,0,0

+    FILEVERSION     0,47,0,0

+    PRODUCTVERSION  0,47,0,0

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

@@ -13,11 +13,11 @@ BEGIN
             VALUE "Comments", "Published under the GNU GPL"

             VALUE "CompanyName", "inkscape.org"

             VALUE "FileDescription", "Inkview"

-            VALUE "FileVersion", "0.46.0"

+            VALUE "FileVersion", "0.47"

             VALUE "InternalName", "Inkview"

-            VALUE "LegalCopyright", "© 2007 Inkscape"

+            VALUE "LegalCopyright", "© 2009 Inkscape"

             VALUE "ProductName", "Inkview"

-            VALUE "ProductVersion", "0.46.0"

+            VALUE "ProductVersion", "0.47"

         END

     END

     BLOCK "VarFileInfo"