diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-02-04 12:35:31 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-02-04 12:35:31 +0000 |
| commit | fd3f0f3196147bce932168c4838a8ed4ff2d60d6 (patch) | |
| tree | 47001ab2445c4bf1b55fcc91d90de32adfe101f5 /packaging | |
| parent | 74fa87ddb225e1d386305ad6c34c24e7c486ba53 (diff) | |
Remove version from Launchpad name and include a default dfilter_macros to remove start-up warning.
svn path=/trunk/; revision=20710
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/u3/win32/manifest.tmpl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index 9ba83642a1..2245680ef1 100644 --- 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 b6a53adc15..f82f3a0d7b 100644 --- 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> |