meh

git-svn-id: http://svn.voria.com/code@29 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/config/build.cfg b/synfig-core/trunk/config/build.cfg
index a6a7f5c..34df848 100644 (file)
--- a/synfig-core/trunk/config/build.cfg
+++ b/synfig-core/trunk/config/build.cfg
@@ -5,7 +5,7 @@ PACKAGE_TARNAME=synfig
 VERSION_MAJ="0"
 VERSION_MIN="61"
 VERSION_REV="00"
-VERSION_REL=`svn info | grep Revision | sed "s/.* \([0123456789]*\)/\1/"`
+[ -d ".svn" ] && VERSION_REL=`svn info | grep Revision | sed "s/.* \([0123456789]*\)/\1/"`
 
 [ -d CVS ] && VERSION_REL="CVS"
 

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh
index a70917f..5977f97 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh
+++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh
@@ -4,7 +4,7 @@ Section "lyr_freetype" Sec_lyr_freetype
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=lyr_freetype.dll "src\modules\lyr_freetype\.libs\liblyr_freetype-0.dll"

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/unlyr_freetype.nsh b/synfig-core/trunk/src/modules/lyr_freetype/unlyr_freetype.nsh
index 63190df..cb9431b 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_freetype/unlyr_freetype.nsh
+++ b/synfig-core/trunk/src/modules/lyr_freetype/unlyr_freetype.nsh
@@ -1,5 +1,5 @@
 Section "un.lyr_freetype"
-       Delete "$INSTDIR\lib\sinfg\modules\lyr_freetype.dll"
+       Delete "$INSTDIR\lib\synfig\modules\lyr_freetype.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/lyr_std/unlyr_std.nsh b/synfig-core/trunk/src/modules/lyr_std/unlyr_std.nsh
index bbf1017..94e4c7f 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/unlyr_std.nsh
+++ b/synfig-core/trunk/src/modules/lyr_std/unlyr_std.nsh
@@ -1,5 +1,5 @@
 Section "un.lyr_std"
-       Delete "$INSTDIR\lib\sinfg\modules\lyr_std.dll"
+       Delete "$INSTDIR\lib\synfig\modules\lyr_std.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh b/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh
index 8fe1207..0556ef0 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh
+++ b/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh
@@ -4,7 +4,7 @@ Section "mod_bmp" Sec_mod_bmp
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_bmp.dll "src\modules\mod_bmp\.libs\libmod_bmp-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_bmp/unmod_bmp.nsh b/synfig-core/trunk/src/modules/mod_bmp/unmod_bmp.nsh
index af1a8b3..c3f10ac 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_bmp/unmod_bmp.nsh
+++ b/synfig-core/trunk/src/modules/mod_bmp/unmod_bmp.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_bmp"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_bmp.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_bmp.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh b/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh
index d0a7ea1..66e7efb 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh
+++ b/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh
@@ -4,7 +4,7 @@ Section "mod_dv" Sec_mod_dv
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_dv.dll "src\modules\mod_dv\.libs\libmod_dv-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh b/synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh
index 04ed4af..eda482e 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh
+++ b/synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_dv"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_dv.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_dv.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh b/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh
index 8a941ef..68412d8 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh
@@ -4,7 +4,7 @@ Section "mod_ffmpeg" Sec_mod_ffmpeg
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_ffmpeg.dll "src\modules\mod_ffmpeg\.libs\libmod_ffmpeg-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh b/synfig-core/trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh
index 688d3dc..3badf6c 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_ffmpeg"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_ffmpeg.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_ffmpeg.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh b/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh
index 3f2d7ab..617f20b 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh
+++ b/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh
@@ -4,7 +4,7 @@ Section "mod_filter" Sec_mod_filter
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_filter.dll "src\modules\mod_filter\.libs\libmod_filter-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_filter/unmod_filter.nsh b/synfig-core/trunk/src/modules/mod_filter/unmod_filter.nsh
index 26dcfd3..e339cbf 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_filter/unmod_filter.nsh
+++ b/synfig-core/trunk/src/modules/mod_filter/unmod_filter.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_filter"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_filter.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_filter.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh b/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh
index 8ba8781..316fdf9 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh
+++ b/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh
@@ -4,7 +4,7 @@ Section "mod_geometry" Sec_mod_geometry
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_geometry.dll "src\modules\mod_geometry\.libs\libmod_geometry-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_geometry/unmod_geometry.nsh b/synfig-core/trunk/src/modules/mod_geometry/unmod_geometry.nsh
index aca9f6a..f5f2317 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_geometry/unmod_geometry.nsh
+++ b/synfig-core/trunk/src/modules/mod_geometry/unmod_geometry.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_geometry"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_geometry.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_geometry.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh b/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh
index 14ce62e..a11d38b 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh
+++ b/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh
@@ -4,7 +4,7 @@ Section "mod_gif" Sec_mod_gif
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_gif.dll "src\modules\mod_gif\.libs\libmod_gif-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_gif/unmod_gif.nsh b/synfig-core/trunk/src/modules/mod_gif/unmod_gif.nsh
index a1ccb2b..2dff31a 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gif/unmod_gif.nsh
+++ b/synfig-core/trunk/src/modules/mod_gif/unmod_gif.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_gif"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_gif.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_gif.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh b/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh
index a27f512..c5eadc8 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh
+++ b/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh
@@ -4,7 +4,7 @@ Section "mod_gradient" Sec_mod_gradient
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_gradient.dll "src\modules\mod_gradient\.libs\libmod_gradient-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_gradient/unmod_gradient.nsh b/synfig-core/trunk/src/modules/mod_gradient/unmod_gradient.nsh
index 428ccf5..bbf302c 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gradient/unmod_gradient.nsh
+++ b/synfig-core/trunk/src/modules/mod_gradient/unmod_gradient.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_gradient"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_gradient.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_gradient.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh b/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh
index ebabff6..4db24bc 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh
@@ -4,7 +4,7 @@ Section "mod_imagemagick" Sec_mod_imagemagick
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_imagemagick.dll "src\modules\mod_imagemagick\.libs\libmod_imagemagick-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/unmod_imagemagick.nsh b/synfig-core/trunk/src/modules/mod_imagemagick/unmod_imagemagick.nsh
index c09cd45..d6ce0de 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_imagemagick/unmod_imagemagick.nsh
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/unmod_imagemagick.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_imagemagick"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_imagemagick.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_imagemagick.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh b/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh
index 08f07ca..66e19c7 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh
+++ b/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh
@@ -4,7 +4,7 @@ Section "mod_jpeg" Sec_mod_jpeg
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_jpeg.dll "src\modules\mod_jpeg\.libs\libmod_jpeg-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_jpeg/unmod_jpeg.nsh b/synfig-core/trunk/src/modules/mod_jpeg/unmod_jpeg.nsh
index 0121537..80b5769 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_jpeg/unmod_jpeg.nsh
+++ b/synfig-core/trunk/src/modules/mod_jpeg/unmod_jpeg.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_jpeg"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_jpeg.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_jpeg.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh b/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh
index abc1485..2ced97c 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh
+++ b/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh
@@ -4,7 +4,7 @@ Section "mod_libavcodec" Sec_mod_libavcodec
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_libavcodec.dll "src\modules\mod_libavcodec\.libs\libmod_libavcodec-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/unmod_libavcodec.nsh b/synfig-core/trunk/src/modules/mod_libavcodec/unmod_libavcodec.nsh
index a873db8..027dc86 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_libavcodec/unmod_libavcodec.nsh
+++ b/synfig-core/trunk/src/modules/mod_libavcodec/unmod_libavcodec.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_libavcodec"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_libavcodec.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_libavcodec.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh b/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh
index ca6da3d..01efeda 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh
+++ b/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh
@@ -4,7 +4,7 @@ Section "mod_noise" Sec_mod_noise
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_noise.dll "src\modules\mod_noise\.libs\libmod_noise-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_noise/unmod_noise.nsh b/synfig-core/trunk/src/modules/mod_noise/unmod_noise.nsh
index ae85c93..69b6c1e 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_noise/unmod_noise.nsh
+++ b/synfig-core/trunk/src/modules/mod_noise/unmod_noise.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_noise"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_noise.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_noise.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh
index 819e71f..59eca60 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh
+++ b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh
@@ -4,7 +4,7 @@ Section "mod_openexr" Sec_mod_openexr
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_openexr.dll "src\modules\mod_openexr\.libs\libmod_openexr-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh b/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh
index 5592257..0910092 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh
+++ b/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_openexr"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_openexr.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_openexr.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh b/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh
index d7d1b8a..908cdde 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh
+++ b/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh
@@ -4,7 +4,7 @@ Section "mod_particle" Sec_mod_particle
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_particle.dll "src\modules\mod_particle\.libs\libmod_particle-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_particle/unmod_particle.nsh b/synfig-core/trunk/src/modules/mod_particle/unmod_particle.nsh
index b9a9cc1..38c975f 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_particle/unmod_particle.nsh
+++ b/synfig-core/trunk/src/modules/mod_particle/unmod_particle.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_particle"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_particle.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_particle.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_png/mod_png.nsh b/synfig-core/trunk/src/modules/mod_png/mod_png.nsh
index 7c5c5de..84df93f 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_png/mod_png.nsh
+++ b/synfig-core/trunk/src/modules/mod_png/mod_png.nsh
@@ -4,7 +4,7 @@ Section "mod_png" Sec_mod_png
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_png.dll "src\modules\mod_png\.libs\libmod_png-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_png/unmod_png.nsh b/synfig-core/trunk/src/modules/mod_png/unmod_png.nsh
index f034c79..fc76454 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_png/unmod_png.nsh
+++ b/synfig-core/trunk/src/modules/mod_png/unmod_png.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_png"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_png.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_png.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh b/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh
index 5447afc..92cce6f 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh
+++ b/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh
@@ -4,7 +4,7 @@ Section "mod_ppm" Sec_mod_ppm
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_ppm.dll "src\modules\mod_ppm\.libs\libmod_ppm-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_ppm/unmod_ppm.nsh b/synfig-core/trunk/src/modules/mod_ppm/unmod_ppm.nsh
index 30bab80..6eea9ba 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ppm/unmod_ppm.nsh
+++ b/synfig-core/trunk/src/modules/mod_ppm/unmod_ppm.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_ppm"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_ppm.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_ppm.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh b/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh
index 8b2cf35..5376a6e 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh
+++ b/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh
@@ -4,7 +4,7 @@ Section "mod_yuv420p" Sec_mod_yuv420p
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=mod_yuv420p.dll "src\modules\mod_yuv420p\.libs\libmod_yuv420p-0.dll"

diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/unmod_yuv420p.nsh b/synfig-core/trunk/src/modules/mod_yuv420p/unmod_yuv420p.nsh
index 835364b..02f2447 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_yuv420p/unmod_yuv420p.nsh
+++ b/synfig-core/trunk/src/modules/mod_yuv420p/unmod_yuv420p.nsh
@@ -1,5 +1,5 @@
 Section "un.mod_yuv420p"
-       Delete "$INSTDIR\lib\sinfg\modules\mod_yuv420p.dll"
+       Delete "$INSTDIR\lib\synfig\modules\mod_yuv420p.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/src/modules/template.nsh b/synfig-core/trunk/src/modules/template.nsh
index 53b5919..bc6ede8 100644 (file)
--- a/synfig-core/trunk/src/modules/template.nsh
+++ b/synfig-core/trunk/src/modules/template.nsh
@@ -4,7 +4,7 @@ Section "@MODNAME@" Sec_@MODNAME@
 ;  SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath "$INSTDIR\lib\sinfg\modules"
+  SetOutPath "$INSTDIR\lib\synfig\modules"
   
   ; Put file there
   File /oname=@MODNAME@.dll "src\modules\@MODNAME@\.libs\lib@MODNAME@-0.dll"

diff --git a/synfig-core/trunk/src/modules/untemplate.nsh b/synfig-core/trunk/src/modules/untemplate.nsh
index 4641bed..005a92a 100644 (file)
--- a/synfig-core/trunk/src/modules/untemplate.nsh
+++ b/synfig-core/trunk/src/modules/untemplate.nsh
@@ -1,5 +1,5 @@
 Section "un.@MODNAME@"
-       Delete "$INSTDIR\lib\sinfg\modules\@MODNAME@.dll"
+       Delete "$INSTDIR\lib\synfig\modules\@MODNAME@.dll"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/synfig.pc.in b/synfig-core/trunk/synfig.pc.in
index 4da1149..84aea31 100644 (file)
--- a/synfig-core/trunk/synfig.pc.in
+++ b/synfig-core/trunk/synfig.pc.in
@@ -6,6 +6,6 @@ includedir=@synfigincludedir@
 Name: synfig
 Description: Synfig Core
 Requires: @CONFIG_DEPS@
-Version: 0.61.00-27
+Version: 0.61.00-28
 Libs: -L${libdir} @CONFIG_LIBS@
 Cflags: @CONFIG_CFLAGS@ -I@synfigincludedir@

diff --git a/synfig-core/trunk/win32build.sh b/synfig-core/trunk/win32build.sh
index a6d6a85..a9817b5 100755 (executable)
--- a/synfig-core/trunk/win32build.sh
+++ b/synfig-core/trunk/win32build.sh
@@ -3,7 +3,7 @@
 #OPTIONS="--disable-optimization --enable-debug"
 
 OPTIONS="--enable-optimization=1 --disable-debug"
-OPTIONS="$OPTIONS --enable-timelimit=120"
+#OPTIONS="$OPTIONS --enable-timelimit=120"
 
 [ -e configure ] || ./bootstrap || exit 0
 

diff --git a/synfig-core/trunk/win32inst.nsi.in b/synfig-core/trunk/win32inst.nsi.in
index 0a2b56d..7271102 100644 (file)
--- a/synfig-core/trunk/win32inst.nsi.in
+++ b/synfig-core/trunk/win32inst.nsi.in
@@ -72,6 +72,7 @@ Section ""
 
   File "C:\mingw\bin\mingwm10.dll"
   File "C:\GTK\bin\libfreetype-6.dll"
+  File "C:\GTK\bin\libxml2.dll"
   
   ; Put file there
 ;  File "synfig_modules.conf"