From a0eabfafa39f9fb902da1c49914e1665c25b5bde Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Sat, 21 Nov 2015 11:58:38 +0100 Subject: debian: Fix bumping SO versions Make dist failed due to library package renames and a few changes were also missing in d/control Change-Id: Iea8c054a3a32e10df73286e1535f33137e543e96 Reviewed-on: https://code.wireshark.org/review/12006 Reviewed-by: Balint Reczey --- Makefile.am | 14 +++++++------- debian/control | 4 ++-- ui/qt/wireshark_de.qm | Bin 334587 -> 334496 bytes ui/qt/wireshark_it.qm | Bin 338735 -> 338622 bytes ui/qt/wireshark_ja_JP.qm | Bin 262091 -> 262016 bytes 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 99bbfca468..e647492c32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -772,15 +772,15 @@ EXTRA_DIST = \ debian/headers-check.c \ debian/libwireshark-data.install \ debian/libwireshark-dev.install \ - debian/libwireshark0.install \ - debian/libwireshark0.symbols \ + debian/libwireshark6.install \ + debian/libwireshark6.symbols \ debian/libwiretap-dev.install \ - debian/libwiretap0.docs \ - debian/libwiretap0.install \ - debian/libwiretap0.symbols \ + debian/libwiretap5.docs \ + debian/libwiretap5.install \ + debian/libwiretap5.symbols \ debian/libwsutil-dev.install \ - debian/libwsutil0.install \ - debian/libwsutil0.symbols \ + debian/libwsutil6.install \ + debian/libwsutil6.symbols \ debian/license-text-about-dialog \ debian/patches/04_asn2wrs_ply.patch \ debian/patches/05_note-README-when-running-as-root.patch \ diff --git a/debian/control b/debian/control index 614578c4d4..f1c455c144 100644 --- a/debian/control +++ b/debian/control @@ -28,8 +28,8 @@ Homepage: http://www.wireshark.org/ Package: wireshark-common Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark0 (>= ${binary:Version}), - libwiretap0 (>= ${binary:Version}), debconf, libcap2-bin [linux-any] +Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark6 (>= ${binary:Version}), + libwiretap5 (>= ${binary:Version}), debconf, libcap2-bin [linux-any] Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version}) Replaces: ethereal-common (<< 1.0.0-3) Conflicts: ethereal-common (<< 1.0.0-3) diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm index ad72d702c3..a195ad910b 100644 Binary files a/ui/qt/wireshark_de.qm and b/ui/qt/wireshark_de.qm differ diff --git a/ui/qt/wireshark_it.qm b/ui/qt/wireshark_it.qm index c2f691b0bb..b983e7b37e 100644 Binary files a/ui/qt/wireshark_it.qm and b/ui/qt/wireshark_it.qm differ diff --git a/ui/qt/wireshark_ja_JP.qm b/ui/qt/wireshark_ja_JP.qm index 6d589979d1..e8771283ab 100644 Binary files a/ui/qt/wireshark_ja_JP.qm and b/ui/qt/wireshark_ja_JP.qm differ -- cgit v1.2.1