1.3.5 -> 1.3.6.

svn path=/trunk/; revision=32667

diff --git a/config.nmake b/config.nmake
index f285eb19218c0215e76c3af12f6786242ae475c4..5bba362a6d6e1a80d8b7f9b6a2bd9efc631a64a3 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=3
-VERSION_MICRO=5
+VERSION_MICRO=6
 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 bde23227d8165a62d499be486d3bed0b5175d63f..7198cc123fca2f56a46f8f397e85147579c4475e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
-AC_INIT(wireshark, 1.3.5)
+AC_INIT(wireshark, 1.3.6)
 
 dnl Check for CPU / vendor / OS
 dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or

diff --git a/debian/changelog b/debian/changelog
index a9db8ce7ff9c48b7b98d2ad7a0f9583eeec70d29..04123856502e2f9380615d4b04483f6c2978068b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.3.5) unstable; urgency=low
+wireshark (1.3.6) unstable; urgency=low
 
   * Self-made package
 

diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index 6241a201a24bcdddec94d307855f8abb9442a335..2c915fdf6362cfb52a70b5458c711445977ddb82 100644 (file)
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -12,7 +12,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
-  <!ENTITY WiresharkCurrentVersion "1.3.5">
+  <!ENTITY WiresharkCurrentVersion "1.3.6">
 
 ]>
 

diff --git a/make-version.pl b/make-version.pl
index 6de7cdc7af93be24bc03da66b12e41c47d6f8765..48eca2debc43446282579fa62ce1edd509b3cbdc 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -72,12 +72,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 = ".";