1.5.0 → 1.5.1.

svn path=/trunk/; revision=35639

diff --git a/config.nmake b/config.nmake
index 456fb32e0f8d09f139baf07254f3d2c922a451c8..7405cbc24bc4d37787345dbd58bed7440c0589d3 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=5
-VERSION_MICRO=0
+VERSION_MICRO=1
 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 890a9ca89b948611d7d6e5323df0af1dc38345d0..a4c7a97db344d32e37a478b23401fb431dbbd6c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
-AC_INIT(wireshark, 1.5.0)
+AC_INIT(wireshark, 1.5.1)
 
 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 b56090bc20a4c19db1b6beba9dc177858758819a..524d7e6db9c3a8c2f9353c9f9d70c3a2a0a8cd01 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.5.0) unstable; urgency=low
+wireshark (1.5.1) unstable; urgency=low
 
   * Self-made package
 

diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index c14b233addcb61a434a1a569d5869c65566c7a7a..f006551bbdd26ced87f5312bad251c6e394333df 100644 (file)
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -12,7 +12,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
-  <!ENTITY WiresharkCurrentVersion "1.5.0">
+  <!ENTITY WiresharkCurrentVersion "1.5.1">
 
 ]>
 

diff --git a/make-version.pl b/make-version.pl
index 8807dcf3c68765ea7eab53eacf76c5e8f22d0684..f59ba21495118e5431ff3e6865108884e5c6a8f2 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 = ".";