diff options
| author | Balint Reczey <balint.reczey@canonical.com> | 2017-08-05 17:11:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-07 07:13:16 +0000 |
| commit | d81f907aea269b12dc383911bfb469addfaffade (patch) | |
| tree | 710be7013ea72fd0099d54cd2f019b522afcabfe /debian/patches | |
| parent | ff7a6305a7eaa3c3815e813acc78a1660ae82293 (diff) | |
debian: Refresh patches
Change-Id: Ib31e658cfa87f31fad9750f1ba2cf326d0944689
Signed-off-by: Balint Reczey <balint.reczey@canonical.com>
Reviewed-on: https://code.wireshark.org/review/22970
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/05_note-README-when-running-as-root.patch | 2 | ||||
| -rw-r--r-- | debian/patches/06_release-version.patch | 6 | ||||
| -rw-r--r-- | debian/patches/16_licence_about_location.patch | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/05_note-README-when-running-as-root.patch b/debian/patches/05_note-README-when-running-as-root.patch index 2abed19e97..c6baf4af4c 100644 --- a/debian/patches/05_note-README-when-running-as-root.patch +++ b/debian/patches/05_note-README-when-running-as-root.patch @@ -4,7 +4,7 @@ Author: Balint Reczey <balint@balintreczey.hu> --- a/ui/gtk/main.c +++ b/ui/gtk/main.c -@@ -2102,7 +2102,7 @@ +@@ -1949,7 +1949,7 @@ "This could be dangerous.\n\n" "If you're running Wireshark this way in order to perform live capture, " "you may want to be aware that there is a better way documented at\n" diff --git a/debian/patches/06_release-version.patch b/debian/patches/06_release-version.patch index 6a0d2fd4d4..bc806ce222 100644 --- a/debian/patches/06_release-version.patch +++ b/debian/patches/06_release-version.patch @@ -4,9 +4,9 @@ Author: Balint Reczey <balint@balintreczey.hu> --- a/Makefile.am +++ b/Makefile.am -@@ -676,7 +676,7 @@ - am__v_PERL_0 = @echo " PERL " $@; - am__v_PERL_1 = +@@ -776,7 +776,7 @@ + # FORCE is the portable version of .PHONY + FORCE: -version.h: FORCE +version.h: diff --git a/debian/patches/16_licence_about_location.patch b/debian/patches/16_licence_about_location.patch index 0806d53a52..fb44ba890a 100644 --- a/debian/patches/16_licence_about_location.patch +++ b/debian/patches/16_licence_about_location.patch @@ -4,7 +4,7 @@ Author: Frederic Peters <fpeters@debian.org> --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c -@@ -502,7 +502,7 @@ +@@ -522,7 +522,7 @@ #if defined(_WIN32) absolute_path = get_datafile_path("COPYING.txt"); #else @@ -15,7 +15,7 @@ Author: Frederic Peters <fpeters@debian.org> --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp -@@ -312,7 +312,7 @@ AboutDialog::AboutDialog(QWidget *parent) : +@@ -335,7 +335,7 @@ #if defined(_WIN32) f_license.setFileName(get_datafile_path("COPYING.txt")); #else |