Try for another 1.1.1 development release.

svn path=/trunk/; revision=26374

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"

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

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 = ".";