Merge from stable:

[~andy/gtk] / gtk-zip.sh.in

diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
index 8c315ede16df3fbf20e006fa0b39237b826dc07c..40f96cfc7f24d38b5d6aacef3fb8066c9ed894e3 100755 (executable)
--- a/gtk-zip.sh.in
+++ b/gtk-zip.sh.in
@@ -10,12 +10,12 @@ rm $ZIP
 zip -r $ZIP -@ <<EOF
 COPYING.LIB-2
 etc/gtk-2.0
-lib/libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
-zip $ZIP lib/gtk-2.0/@GTK_VERSION@/loaders/*.dll lib/gtk-2.0/immodules/@GTK_VERSION@/*.dll
+zip $ZIP lib/gtk-2.0/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/immodules/*.dll
 
 zip $ZIP share/themes/*/gtk-2.0/gtkrc share/themes/*/gtk-2.0-key/gtkrc
 
@@ -24,12 +24,17 @@ zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 include/gtk-2.0
-lib/libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a
-lib/gdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib
-lib/libgdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a
-lib/gdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib
-lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a
-lib/gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib
+bin/gdk-pixbuf-csource.exe
+bin/gdk-pixbuf-query-loaders.exe
+bin/gtk-query-immodules-2.0.exe
+bin/gtk-demo.exe
+man/man1/gdk-pixbuf-csource.1
+lib/libgdk_pixbuf-@GTK_API_VERSION@.dll.a
+lib/gdk_pixbuf-@GTK_API_VERSION@.lib
+lib/libgdk-win32-@GTK_API_VERSION@.dll.a
+lib/gdk-win32-@GTK_API_VERSION@.lib
+lib/libgtk-win32-@GTK_API_VERSION@.dll.a
+lib/gtk-win32-@GTK_API_VERSION@.lib
 lib/gtk-2.0/include
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-2.0.pc
@@ -37,5 +42,6 @@ lib/pkgconfig/gdk-win32-2.0.pc
 lib/pkgconfig/gtk+-2.0.pc
 lib/pkgconfig/gtk+-win32-2.0.pc
 share/aclocal/gtk-2.0.m4
+share/gtk-2.0
 EOF