From e0055861396d5e1e70416443fee4069c826c8f40 Mon Sep 17 00:00:00 2001
From: gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Tue, 7 Oct 2008 21:29:25 +0000
Subject: [PATCH] Try for another 1.1.1 development release.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26374 f5534014-38df-0310-8fa8-9805f1628bb7
---
 config.nmake    | 2 +-
 configure.in    | 2 +-
 make-version.pl | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config.nmake b/config.nmake
index 0515256bd0..a75dde4d8e 100644
--- a/config.nmake
+++ b/config.nmake
@@ -16,7 +16,7 @@ PLATFORM=win32
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=1
 VERSION_MINOR=1
-VERSION_MICRO=2
+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 ff1e0f2301..4995c88ef7 100644
--- 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.2)
+AC_INIT(wireshark, 1.1.1)
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 AM_DISABLE_STATIC
diff --git a/make-version.pl b/make-version.pl
index 5956e9d926..eed14fd628 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -70,8 +70,12 @@ my %version_pref = (
 	"enable"     => 1,
 	"svn_client" => 0,
 	"format"     => "SVN %Y%m%d%H%M%S",
-	"pkg_enable" => 1,
-	"pkg_format" => "-SVN-%#",
+	# Normal development builds
+	#"pkg_enable" => 1,
+	#"pkg_format" => "-SVN-%#",
+	# Development releases
+	"pkg_enable" => 0,
+	"pkg_format" => "",
 	);
 my $srcdir = ".";
 
-- 
2.34.1