Move the trunk to 1.1.0. Temporarily build a non-SVN-stamped package, so
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 4 Sep 2008 19:37:16 +0000 (19:37 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 4 Sep 2008 19:37:16 +0000 (19:37 +0000)
that we can build 1.1.0 packages.

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

config.nmake
configure.in
make-version.pl

index ba6fe03f52ebfe58dd5465a8c1652bcc2d5523ce..151ec2fb3342cef67abbc03b731eaf3ed4f1ea26 100644 (file)
@@ -15,8 +15,8 @@ PLATFORM=win32
 # The current Wireshark version
 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
 VERSION_MAJOR=1
-VERSION_MINOR=0
-VERSION_MICRO=99
+VERSION_MINOR=1
+VERSION_MICRO=0
 VERSION_BUILD=0
 # It's recommended to change VERSION_EXTRA for your own custom builds
 # e.g. "-SVN-12345"
index 055e8fa6197a8f92c5ff051f64b89c0700ad345c..e8bb2cf00b5dc3eea1b39b60fd7d826f92b1e16f 100644 (file)
@@ -12,7 +12,7 @@ dnl AC_CANONICAL_HOST
 dnl AC_CANONICAL_BUILD
 dnl AC_CANONICAL_TARGET
 
-AC_INIT(wireshark, 1.0.99)
+AC_INIT(wireshark, 1.1.0)
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 AM_DISABLE_STATIC
index 5956e9d926f91c46d92b4658d287c6234b773433..8f79c3b7d4f0ab05da146e44e252deabed1220ba 100755 (executable)
@@ -70,8 +70,10 @@ my %version_pref = (
        "enable"     => 1,
        "svn_client" => 0,
        "format"     => "SVN %Y%m%d%H%M%S",
-       "pkg_enable" => 1,
-       "pkg_format" => "-SVN-%#",
+       #"pkg_enable" => 1,
+       #"pkg_format" => "-SVN-%#",
+       "pkg_enable" => 0,
+       "pkg_format" => "",
        );
 my $srcdir = ".";