diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2014-06-05 17:30:41 +0700 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2014-06-08 15:32:10 +0000 |
| commit | 97e1491aa8f418a7f5bd7fdd92561d2403c187f6 (patch) | |
| tree | eadecb1b66ac3900a7e5db76eb2b993693ba0b9f /debian/patches/09_idl2wrs.patch | |
| parent | 9b4991098f42bfe10da9ce34c4c7711fbcf87ca7 (diff) | |
Sync .deb packaging from Debian
The sync makes CMake the build system for the .deb package
and starts providing wireshark-qt in the wireshark-qt package.
The package structure, i.e. the libraries are shipped in separate
packages is also sync-ed.
Wireshark-qt uses the Qt 4 libraries, but it is easy to switch
it to Qt 5.
Change-Id: I849d18bdb8ca6ebf4072cf1d73d749080ac5dac2
Reviewed-on: https://code.wireshark.org/review/1986
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'debian/patches/09_idl2wrs.patch')
| -rwxr-xr-x | debian/patches/09_idl2wrs.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/debian/patches/09_idl2wrs.patch b/debian/patches/09_idl2wrs.patch new file mode 100755 index 0000000000..f479ba650d --- /dev/null +++ b/debian/patches/09_idl2wrs.patch @@ -0,0 +1,48 @@ +Description: Do not try to locate wireshark_be.py and wireshark_gen.py in + non-standard places. +Author: Frederic Peters <fpeters@debian.org> + +--- a/tools/idl2wrs ++++ b/tools/idl2wrs +@@ -65,41 +65,8 @@ + exit 1; + fi + +-# +-# Run wireshark backend, looking for wireshark_be.py and wireshark_gen.py +-# in pythons's "site-packages" directory. If cannot find that, then +-# try looking in current directory. If still cannot, then exit with +-# error. +- +-if [ -f $PYTHONPATH/site-packages/wireshark_be.py ] && [ -f $PYTHONPATH/site-packages/wireshark_gen.py ]; then +- exec omniidl -p $PYTHONPATH/site-packages -b wireshark_be $@ +- /* not reached */ +-fi +- +-# Try current directory. +- +-if [ -f ./wireshark_be.py ] && [ -f ./wireshark_gen.py ]; then +- exec omniidl -p ./ -b wireshark_be $@ +- /* not reached */ +-fi +- +-# Could not find both wireshark_be.py AND wireshark_gen.py +-# So let's just try to run it without -p, hoping that the installation +-# set up a valid path. +- + exec omniidl -b wireshark_be $@ + +-old code: not reached +- +-echo "idl2wrs Error: Could not find both wireshark_be.py AND wireshark_gen.py." +-echo "Please ensure you have the PYTHONPATH variable set, or that wireshark_be.py " +-echo "and wireshark_gen.py exist in the current directory. " +-echo +-echo "On this system, PYTHONPATH is : $PYTHONPATH" +-echo +- +-exit 2 +- + + # + # Editor modelines - http://www.wireshark.org/tools/modelines.html |