diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-12-16 20:54:40 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-12-16 20:54:40 +0000 |
| commit | 65a85f0fba137776b504c606a32f1f5a85b96abc (patch) | |
| tree | cfc683b9410806341692e9d03bbe0fbd346d8459 | |
| parent | 8c1b66f33a2bf502ca11a8431339ab26581bf27d (diff) | |
| download | wireshark-65a85f0fba137776b504c606a32f1f5a85b96abc.tar.gz wireshark-65a85f0fba137776b504c606a32f1f5a85b96abc.tar.bz2 wireshark-65a85f0fba137776b504c606a32f1f5a85b96abc.zip | |
Use gtk+-bundle_2.16.6-20091215_win32
svn path=/trunk/; revision=31285
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | tools/win-setup.sh | 5 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index 46c25b8136..3ae2cf6192 100644 --- a/config.nmake +++ b/config.nmake @@ -159,7 +159,7 @@ FONTCONFIG_DLL=libfontconfig-1.dll EXPAT_DLL=libexpat-1.dll INTL_DLL=intl.dll # This macro is used by the setup target. -GTK_PKG=2.16.6-20091013 +GTK_PKG=2.16.6-20091215 # # Mandatory: Version numbers of GTK and pango. diff --git a/tools/win-setup.sh b/tools/win-setup.sh index e2092c854d..772c5fa5e7 100644 --- a/tools/win-setup.sh +++ b/tools/win-setup.sh @@ -18,13 +18,12 @@ if [ -z "$WIRESHARK_TARGET_PLATFORM" ]; then err_exit "WIRESHARK_TARGET_PLATFORM not defined (internal error)" fi +# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag. +#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/trunk/packages/" DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/" TAG_FILE="current_tag.txt" -# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag. -#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/" - err_exit () { echo "" for str in "$@" ; do diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 5e18d43074..5d74d64166 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -4,7 +4,7 @@ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2009-11-19" +export DOWNLOAD_TAG="2009-12-16" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/` |