Move to 1.1.4.

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

diff --git a/config.nmake b/config.nmake
index 34ab91195e11eb441e78bbd655cbb6cd8ee8339a..2d9c74a73728f797f59627e84d654a6c0420affe 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -16,7 +16,7 @@ WIRESHARK_TARGET_PLATFORM=win32
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=1
 VERSION_MINOR=1
-VERSION_MICRO=3
+VERSION_MICRO=4
 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 b611f679b016e35e40ad781087b3dd7621d59fdc..23c1ff78436e6919eeb3764563f0620a8a81c3d0 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.3)
+AC_INIT(wireshark, 1.1.4)
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 AM_DISABLE_STATIC

diff --git a/debian/changelog b/debian/changelog
index 0148cc5b51052d8a2d9833c7ee9a64d079b7b26b..07c5043d6497b3a678cd85ebfd702eae457da392 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.1.3) unstable; urgency=low
+wireshark (1.1.4) 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 = ".";