summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalint Reczey <balint@balintreczey.hu>2015-11-21 11:58:38 +0100
committerBalint Reczey <balint@balintreczey.hu>2015-11-21 11:35:11 +0000
commita0eabfafa39f9fb902da1c49914e1665c25b5bde (patch)
tree2668da16a22879e982f0ffad220bdbe80817f39c
parente3ca036ee80eaf747516f17b8581161c1e9c2c55 (diff)
downloadwireshark-a0eabfafa39f9fb902da1c49914e1665c25b5bde.tar.gz
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 <balint@balintreczey.hu>
-rw-r--r--Makefile.am14
-rw-r--r--debian/control4
-rw-r--r--ui/qt/wireshark_de.qmbin334587 -> 334496 bytes
-rw-r--r--ui/qt/wireshark_it.qmbin338735 -> 338622 bytes
-rw-r--r--ui/qt/wireshark_ja_JP.qmbin262091 -> 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
--- a/ui/qt/wireshark_de.qm
+++ b/ui/qt/wireshark_de.qm
Binary files differ
diff --git a/ui/qt/wireshark_it.qm b/ui/qt/wireshark_it.qm
index c2f691b0bb..b983e7b37e 100644
--- a/ui/qt/wireshark_it.qm
+++ b/ui/qt/wireshark_it.qm
Binary files differ
diff --git a/ui/qt/wireshark_ja_JP.qm b/ui/qt/wireshark_ja_JP.qm
index 6d589979d1..e8771283ab 100644
--- a/ui/qt/wireshark_ja_JP.qm
+++ b/ui/qt/wireshark_ja_JP.qm
Binary files differ