Switch back to normal versioning. Bump the version to 1.3.3.

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

diff --git a/config.nmake b/config.nmake
index a7321664fbc8183d03fd89660ea3530324dd9dec..c08a80ab1e49a49cf4eb093806721db45f5d440c 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
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=1
 VERSION_MINOR=3

-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"
 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 b9c8eafb14d409efb3eef1c2a8e851a5886d413e..75ecd081c1760139420d509f0ca74e06e25f9893 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
 #
 AC_PREREQ(2.60)
 

-AC_INIT(wireshark, 1.3.2)
+AC_INIT(wireshark, 1.3.3)

 
 dnl Check for CPU / vendor / OS
 dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
 
 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 4c1c36f6d34c1d358bf05d3ae69101ecf2a6c858..788b82973668694059ec41326503987e9ef784e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.3.2) unstable; urgency=low
+wireshark (1.3.3) unstable; urgency=low

 
   * Self-made package
 
 
   * Self-made package
 

diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index 743fa7152b9f928381dc4f97b478e088ed0554cd..2db33350dc60a121f95b69d4a7f3f1008e88f657 100644 (file)
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -12,7 +12,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
 <!--
 Wireshark Info
 -->

-  <!ENTITY WiresharkCurrentVersion "1.3.2">
+  <!ENTITY WiresharkCurrentVersion "1.3.3">

 
 ]>
 
 
 ]>
 

diff --git a/make-version.pl b/make-version.pl
index d5589dc6b496ded2f78e7d19275ef90bcbf96698..827115e4b7dced16e0fd9b5575b101babba07175 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
        "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
 
        # Development releases

-       "pkg_enable" => 0,
-       "pkg_format" => "",
+       #"pkg_enable" => 0,
+       #"pkg_format" => "",

        );
 my $srcdir = ".";
 
        );
 my $srcdir = ".";