Remove html/domains.tab from the source as it is autogenerated during build

diff --git a/debian/changelog b/debian/changelog
index a48ecc3..5449024 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userdir-ldap-cgi (0.3.41) UNRELEASED; urgency=medium
+
+  * Remove html/domains.tab from the source, it's autogenerated at
+    build time.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun, 04 Nov 2018 13:13:10 +0100
+
 userdir-ldap-cgi (0.3.40) unstable; urgency=medium
 
   [ Peter Palfrader ]

diff --git a/debian/rules b/debian/rules
index f957549..38efe4e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,6 @@ binary-indep: build
        dh_clean -k
        dh_installdirs $(instdirs)
        dh_installdocs
-       isoquery -i 3166 -c | cut -f 1,4 > html/domains.tab
 
        install -m 755 *.cgi $(i)/var/www/userdir-ldap/
        install -m 644 Util.pm $(i)/var/www/userdir-ldap/

diff --git a/html/.gitignore b/html/.gitignore
index 70b7c72..e033b6c 100644 (file)
--- a/html/.gitignore
+++ b/html/.gitignore
@@ -11,3 +11,4 @@ searchform.html
 searchhelp.html
 searchresults.html
 update.html
+domains.tab

diff --git a/html/Makefile b/html/Makefile
index b90ace8..8a8949d 100644 (file)
--- a/html/Makefile
+++ b/html/Makefile
@@ -31,4 +31,8 @@ clean:
 
 update.html :: domains.tab
 
+domains.tab: FORCE
+       isoquery -i 3166 -c | cut -f 1,4 > "$@"
+
 .SUFFIXES:
+.PHONY: FORCE

diff --git a/html/domains.tab b/html/domains.tab
deleted file mode 100644 (file)
index af5540f..0000000
--- a/html/domains.tab
+++ /dev/null
@@ -1,249 +0,0 @@
-AF     Afghanistan
-AX     Åland Islands
-AL     Albania
-DZ     Algeria
-AS     American Samoa
-AD     Andorra
-AO     Angola
-AI     Anguilla
-AQ     Antarctica
-AG     Antigua and Barbuda
-AR     Argentina
-AM     Armenia
-AW     Aruba
-AU     Australia
-AT     Austria
-AZ     Azerbaijan
-BS     Bahamas
-BH     Bahrain
-BD     Bangladesh
-BB     Barbados
-BY     Belarus
-BE     Belgium
-BZ     Belize
-BJ     Benin
-BM     Bermuda
-BT     Bhutan
-BO     Bolivia
-BQ     Bonaire, Sint Eustatius and Saba
-BA     Bosnia and Herzegovina
-BW     Botswana
-BV     Bouvet Island
-BR     Brazil
-IO     British Indian Ocean Territory
-BN     Brunei Darussalam
-BG     Bulgaria
-BF     Burkina Faso
-BI     Burundi
-KH     Cambodia
-CM     Cameroon
-CA     Canada
-CV     Cape Verde
-KY     Cayman Islands
-CF     Central African Republic
-TD     Chad
-CL     Chile
-CN     China
-CX     Christmas Island
-CC     Cocos (Keeling) Islands
-CO     Colombia
-KM     Comoros
-CG     Congo
-CD     Congo, The Democratic Republic of the
-CK     Cook Islands
-CR     Costa Rica
-CI     Côte d'Ivoire
-HR     Croatia
-CU     Cuba
-CW     Curaçao
-CY     Cyprus
-CZ     Czech Republic
-DK     Denmark
-DJ     Djibouti
-DM     Dominica
-DO     Dominican Republic
-EC     Ecuador
-EG     Egypt
-SV     El Salvador
-GQ     Equatorial Guinea
-ER     Eritrea
-EE     Estonia
-ET     Ethiopia
-FK     Falkland Islands (Malvinas)
-FO     Faroe Islands
-FJ     Fiji
-FI     Finland
-FR     France
-GF     French Guiana
-PF     French Polynesia
-TF     French Southern Territories
-GA     Gabon
-GM     Gambia
-GE     Georgia
-DE     Germany
-GH     Ghana
-GI     Gibraltar
-GR     Greece
-GL     Greenland
-GD     Grenada
-GP     Guadeloupe
-GU     Guam
-GT     Guatemala
-GG     Guernsey
-GN     Guinea
-GW     Guinea-Bissau
-GY     Guyana
-HT     Haiti
-HM     Heard Island and McDonald Islands
-VA     Holy See (Vatican City State)
-HN     Honduras
-HK     Hong Kong
-HU     Hungary
-IS     Iceland
-IN     India
-ID     Indonesia
-IR     Iran, Islamic Republic of
-IQ     Iraq
-IE     Ireland
-IM     Isle of Man
-IL     Israel
-IT     Italy
-JM     Jamaica
-JP     Japan
-JE     Jersey
-JO     Jordan
-KZ     Kazakhstan
-KE     Kenya
-KI     Kiribati
-KP     Korea, Democratic People's Republic of
-KR     Korea, Republic of
-KW     Kuwait
-KG     Kyrgyzstan
-LA     Lao People's Democratic Republic
-LV     Latvia
-LB     Lebanon
-LS     Lesotho
-LR     Liberia
-LY     Libya
-LI     Liechtenstein
-LT     Lithuania
-LU     Luxembourg
-MO     Macao
-MK     Macedonia, Republic of
-MG     Madagascar
-MW     Malawi
-MY     Malaysia
-MV     Maldives
-ML     Mali
-MT     Malta
-MH     Marshall Islands
-MQ     Martinique
-MR     Mauritania
-MU     Mauritius
-YT     Mayotte
-MX     Mexico
-FM     Micronesia, Federated States of
-MD     Moldova
-MC     Monaco
-MN     Mongolia
-ME     Montenegro
-MS     Montserrat
-MA     Morocco
-MZ     Mozambique
-MM     Myanmar
-NA     Namibia
-NR     Nauru
-NP     Nepal
-NL     Netherlands
-NC     New Caledonia
-NZ     New Zealand
-NI     Nicaragua
-NE     Niger
-NG     Nigeria
-NU     Niue
-NF     Norfolk Island
-MP     Northern Mariana Islands
-NO     Norway
-OM     Oman
-PK     Pakistan
-PW     Palau
-PS     Palestine, State of
-PA     Panama
-PG     Papua New Guinea
-PY     Paraguay
-PE     Peru
-PH     Philippines
-PN     Pitcairn
-PL     Poland
-PT     Portugal
-PR     Puerto Rico
-QA     Qatar
-RE     Réunion
-RO     Romania
-RU     Russian Federation
-RW     Rwanda
-BL     Saint Barthélemy
-SH     Saint Helena, Ascension and Tristan da Cunha
-KN     Saint Kitts and Nevis
-LC     Saint Lucia
-MF     Saint Martin (French part)
-PM     Saint Pierre and Miquelon
-VC     Saint Vincent and the Grenadines
-WS     Samoa
-SM     San Marino
-ST     Sao Tome and Principe
-SA     Saudi Arabia
-SN     Senegal
-RS     Serbia
-SC     Seychelles
-SL     Sierra Leone
-SG     Singapore
-SX     Sint Maarten (Dutch part)
-SK     Slovakia
-SI     Slovenia
-SB     Solomon Islands
-SO     Somalia
-ZA     South Africa
-GS     South Georgia and the South Sandwich Islands
-ES     Spain
-LK     Sri Lanka
-SD     Sudan
-SR     Suriname
-SS     South Sudan
-SJ     Svalbard and Jan Mayen
-SZ     Swaziland
-SE     Sweden
-CH     Switzerland
-SY     Syrian Arab Republic
-TW     Taiwan
-TJ     Tajikistan
-TZ     Tanzania, United Republic of
-TH     Thailand
-TL     Timor-Leste
-TG     Togo
-TK     Tokelau
-TO     Tonga
-TT     Trinidad and Tobago
-TN     Tunisia
-TR     Turkey
-TM     Turkmenistan
-TC     Turks and Caicos Islands
-TV     Tuvalu
-UG     Uganda
-UA     Ukraine
-AE     United Arab Emirates
-GB     United Kingdom
-US     United States
-UM     United States Minor Outlying Islands
-UY     Uruguay
-UZ     Uzbekistan
-VU     Vanuatu
-VE     Venezuela
-VN     Viet Nam
-VG     Virgin Islands, British
-VI     Virgin Islands, U.S.
-WF     Wallis and Futuna
-EH     Western Sahara
-YE     Yemen
-ZM     Zambia
-ZW     Zimbabwe