diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2015-08-15 21:12:17 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2015-08-19 19:13:26 +0000 |
| commit | 2c260fa0fee85a2deefd2736a05e473c608a5976 (patch) | |
| tree | da63708b3b4141c5910fe24e68520b3dcbc57fbe /debian | |
| parent | bb96725754e5d0cfe68994b52141e70a3406286f (diff) | |
Use system's GeoIP database by default on Debian
Change-Id: I58c1cbb242c20737dd16a0477858b0225c0b5d14
Reviewed-on: https://code.wireshark.org/review/10051
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/geoip_db_paths | 1 | ||||
| -rw-r--r-- | debian/libwireshark-data.install | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/debian/control b/debian/control index c759cf7276..b5bf40efab 100644 --- a/debian/control +++ b/debian/control @@ -177,6 +177,7 @@ Section: libs Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, libjs-openlayers +Recommends: geoip-database, geoip-database-extra Conflicts: wireshark-common (<< 1.4.0~rc2-1) Replaces: wireshark-common (<< 1.4.0~rc2-1) Suggests: snmp-mibs-downloader diff --git a/debian/geoip_db_paths b/debian/geoip_db_paths new file mode 100644 index 0000000000..0ca498c9b8 --- /dev/null +++ b/debian/geoip_db_paths @@ -0,0 +1 @@ +"/usr/share/GeoIP" diff --git a/debian/libwireshark-data.install b/debian/libwireshark-data.install index 73a8a97be6..568526fc2e 100644 --- a/debian/libwireshark-data.install +++ b/debian/libwireshark-data.install @@ -1,2 +1,3 @@ usr/share/wireshark/* etc/wireshark/init.lua +debian/geoip_db_paths /usr/share/wireshark |