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/04_asn2wrs_ply.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/04_asn2wrs_ply.patch')
| -rw-r--r-- | debian/patches/04_asn2wrs_ply.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/debian/patches/04_asn2wrs_ply.patch b/debian/patches/04_asn2wrs_ply.patch new file mode 100644 index 0000000000..2cf2bae9c9 --- /dev/null +++ b/debian/patches/04_asn2wrs_ply.patch @@ -0,0 +1,17 @@ +Description: Use lex/yacc from ply +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/554613 +Author: Jakub Wilk <ubanus@users.sf.net> + +--- a/tools/asn2wrs.py ++++ b/tools/asn2wrs.py +@@ -70,8 +70,8 @@ + import getopt + import traceback + +-import lex +-import yacc ++from ply import lex ++from ply import yacc + + from functools import partial |