1.2.18 → 1.2.19.master-1.2

svn path=/trunk-1.2/; revision=37823

5 files changed, 11 insertions, 65 deletions

diff --git a/config.nmake b/config.nmake
index c9709b47d3..205a96b7c5 100644
--- 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=2
-VERSION_MICRO=18
+VERSION_MICRO=19
 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 4db326b7f2..5f8a124e49 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.2.18)
+AC_INIT(wireshark, 1.2.19)
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 AM_DISABLE_STATIC
diff --git a/debian/changelog b/debian/changelog
index de1596fe33..7886e20b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.2.18) unstable; urgency=low
+wireshark (1.2.19) unstable; urgency=low
 
   * Self-made package
 
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index 0b9747d867..1e0fd3ee8f 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -12,7 +12,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
-  <!ENTITY WiresharkCurrentVersion "1.2.18">
+  <!ENTITY WiresharkCurrentVersion "1.2.19">
 
 ]>
 
@@ -36,6 +36,7 @@ Wireshark Info
 
       <itemizedlist>
 
+<!--
         <listitem>
           <para>
             The Lucent/Ascend file parser was susceptible to an infinite loop.
@@ -47,7 +48,6 @@ Wireshark Info
             ????</ulink>)
           </para>
           <para>Versions affected: 1.2.0 to 1.2.17 and 1.4.0 to 1.4.7.</para>
-<!--
           <para>
             <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink>
           </para>
@@ -73,60 +73,6 @@ Wireshark Info
         </para></listitem>
 -->
 
-        <listitem><para>
-          Missing LUA function.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5006">Bug
-          5006</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Lua API description about creating a new Tvb from a bytearray is not correct in User's Guide.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5199">Bug
-          5199</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          White space in protocol field abbreviation causes runtime failure while registering Lua dissector.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5569">Bug
-          5569</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Wireshark will not run on Windows 2000.
-          (<ulink url="http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5874">Bug
-          5874</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Wireshark crashes when calling TreeItem:set_len() on TreeItem without tvb.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5941">Bug
-          5941</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          TvbRange_string(lua_State* L) call a wrong function.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5960">Bug
-          5960</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Wireshark crashes if Lua contains "Pref.range()" with missing arguments.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5985">Bug
-          5985</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          The "range" field in Lua's "Pref.range()" serves as default while the "default" field does nothing.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5896">Bug
-          5896</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          TShark crashes when loading Lua script that contains GUI function.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6018">Bug
-          6018</ulink>)
-        </para></listitem>
-
       </itemizedlist>
 
     </para>
diff --git a/version.conf b/version.conf
index 4e358d2d42..37bef0baf7 100644
--- a/version.conf
+++ b/version.conf
@@ -1,9 +1,9 @@
 # Interim releases: Enable packaging, add a "pre" to the version.
-#enable: 1
-#pkg_format: pre1-%#
-#pkg_enable: 1
+enable: 1
+pkg_format: pre1-%#
+pkg_enable: 1
 
 # Final release: Disable package version stamps.
-enable: 1
-pkg_format:
-pkg_enable: 0
+#enable: 1
+#pkg_format:
+#pkg_enable: 0