Remove version from Launchpad name and include a default dfilter_macros to remove...

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

diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index 9ba83642a1b4ff37cfab3baef73e726bc8728bca..2245680ef16e1d20c99916cbf3ea79f79bd82ca1 100644 (file)
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -212,6 +212,7 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs  manifest.u3i u3util
        $(COPY) $(TOPDIR)\epan\wslua\dtd_gen.lua $(DEVICE) $(COPY_FLAGS)
 !ENDIF
        $(COPY) $(TOPDIR)\packaging\nsis\WinPcap_4_0.exe $(DEVICE) $(COPY_FLAGS)
+       $(COPY) $(TOPDIR)\dfilter_macros $(DEVICE) $(COPY_FLAGS)
 # host
 #
 # these files are copied onto the U3 host and are required to make Wireshark stable

diff --git a/packaging/u3/win32/manifest.tmpl b/packaging/u3/win32/manifest.tmpl
index b6a53adc159ee079577a3eb81bc2addd0bb49e53..f82f3a0d7b936fd23de6b341eb8a9066790fd6a8 100644 (file)
--- a/packaging/u3/win32/manifest.tmpl
+++ b/packaging/u3/win32/manifest.tmpl
@@ -2,9 +2,9 @@
 <u3manifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
        <application uuid="bded1f20-ac95-11db-a05b-0002a5d5c51b" version="$(VERSION)">
                <icon>wireshark.ico</icon>
-               <name>Wireshark $(VERSION)</name>
+               <name>Wireshark</name>
                <vendor url="http://www.wireshark.org/">The Wireshark Developer Community</vendor>
-               <description>Wireshark is one of the world's foremost network protocol analyzers, and is the standard in many parts of the industry.</description>
+               <description>Wireshark $(VERSION) is one of the world's foremost network protocol analyzers, and is the standard in many parts of the industry.</description>
                <options>
                        <minFreeSpace>60</minFreeSpace>
                </options>