fix: use os-provided public suffix

Change-Id: I9b4fc3d9d0a6cbb54c3d8165bf225241041b9cf7

diff --git a/build.xml b/build.xml
index abf1e3b1f9f2c434ab1fe755acc7ec940b0a278c..f03eca76c781f71abd573cbf1601af4f393197b1 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -355,10 +355,6 @@
        </target>
        <target name="update-effective-tlds">
                <mkdir dir="bin/club/wpia/gigi/util"/>
-               <exec executable="wget" dir="bin/club/wpia/gigi/util">
-                       <arg value="-N"/>
-                       <arg value="-q"/>
-                       <arg value="https://publicsuffix.org/list/effective_tld_names.dat"/>
-               </exec>
+               <copy file="/usr/share/publicsuffix/effective_tld_names.dat" tofile="bin/club/wpia/gigi/util/effective_tld_names.dat"/>
        </target>
 </project>

diff --git a/debian/control b/debian/control
index fc5499d13aa64d801034b128a92d856ef1a43828..dae85c04837b00b587feeebd23d6557adb053ec4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: wpia-gigi
 Section: java
 Priority: optional
 Maintainer: unknown <software@wpia.club>
-Build-Depends: debhelper (>= 8.0.0), dh-systemd, java7-sdk-headless, ant, wget
+Build-Depends: debhelper (>= 8.0.0), dh-systemd, java7-sdk-headless, ant, wget, publicsuffix
 Standards-Version: 3.9.4
 Homepage: https://wpia.club
 #Vcs-Git: git://git.debian.org/collab-maint/gigi.git