Change the version to 1.1.3. SVN-stamp the version again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27252 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/config.nmake b/config.nmake
index 536b98a952e58487ebea6d22685179d04f23e42f..0f7c28e1a83ae27ac33b270d4a60435536f9c066 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -16,7 +16,7 @@ PLATFORM=win32
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=1
 VERSION_MINOR=1
-VERSION_MICRO=2
+VERSION_MICRO=3
 VERSION_BUILD=0
 # It's recommended to change VERSION_EXTRA for your own custom builds
 # e.g. "-SVN-12345"

diff --git a/configure.in b/configure.in
index bbaf53b4905cc2b2725f44acef7a9b3288bf976c..b48f79cfb682763df4884ce2768257377dd1faa7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ dnl AC_CANONICAL_HOST
 dnl AC_CANONICAL_BUILD
 dnl AC_CANONICAL_TARGET
 
-AC_INIT(wireshark, 1.1.2)
+AC_INIT(wireshark, 1.1.3)
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 AM_DISABLE_STATIC

diff --git a/debian/changelog b/debian/changelog
index 8152cad9e942eb642d9b6c86087ca84ce3b0399d..0148cc5b51052d8a2d9833c7ee9a64d079b7b26b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.1.2) unstable; urgency=low
+wireshark (1.1.3) unstable; urgency=low
 
   * Self-made package
 

diff --git a/make-version.pl b/make-version.pl
index 3b17cbf9777d86252355a229d2fbc7ea0b4901b3..03f5ebfa7df57418713129cbe2bf83ce31140aff 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -71,12 +71,12 @@ my %version_pref = (
        "format"     => "SVN %Y%m%d%H%M%S",
 
        # Normal development builds
-       #"pkg_enable" => 1,
-       #"pkg_format" => "-SVN-%#",
+       "pkg_enable" => 1,
+       "pkg_format" => "-SVN-%#",
 
        # Development releases
-       "pkg_enable" => 0,
-       "pkg_format" => "",
+       #"pkg_enable" => 0,
+       #"pkg_format" => "",
        );
 my $srcdir = ".";