1.7.0 → 1.7.1.

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

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

-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"
 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 9ffa509b558112f21084a7a4cbfae6252155177d..77aef63bdc021835432e5ec2f1d286ee214671f1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
 #
 AC_PREREQ(2.60)
 

-AC_INIT(wireshark, 1.7.0)
+AC_INIT(wireshark, 1.7.1)

 
 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 78d419a88ff301c42a0150f0c318b17916bdb7ec..11241b3f290df70ee59b5592759f4cb55bcc6364 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.7.0) unstable; urgency=low
+wireshark (1.7.1) unstable; urgency=low

 
   * Self-made package
 
 
   * Self-made package
 

diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index 01360434ae56c74a9fd7195fdfe6a0e445207b95..3d3808bb6712ed18436d6952767486c8322d6fa5 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.7.0">
+  <!ENTITY WiresharkCurrentVersion "1.7.1">

 
 ]>
 
 
 ]>
 

diff --git a/make-version.pl b/make-version.pl
index 107dad810b92ba658a73578e0ffc7b9d724d357e..38c84c18590fcd418fdb4d41d6fd7ea47a285998 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -78,12 +78,12 @@ my %version_pref = (
        "is_release" => 0,
 
        # Normal development builds
        "is_release" => 0,
 
        # 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 $svn_info_cmd = "";
        );
 my $srcdir = ".";
 my $svn_info_cmd = "";