Imported Debian version 5.0.13v5.0.13

11 files changed, 52 insertions, 44 deletions

diff --git a/COPYING b/COPYING
index d60c31a..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/Makefile b/Makefile
index 8ac844d..5cb22a5 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ endif
 CPPFLAGS += $(DEFS) $(INCLUDES)
 
 ##############################################################################
-all: Makefile.depend whois mkpasswd #pos
+all: Makefile.depend whois mkpasswd pos
 
 ##############################################################################
 %.o: %.c
@@ -88,7 +88,7 @@ servers_charset.h: servers_charset_list make_servers_charset.pl
 	$(PERL) -w make_servers_charset.pl < $< > $@
 
 ##############################################################################
-install: install-whois install-mkpasswd #install-pos
+install: install-whois install-mkpasswd install-pos
 
 install-whois: whois
 	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
diff --git a/config.h b/config.h
index 68270da..3cb4a54 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 /* Program version */
-#define VERSION "5.0.12"
+#define VERSION "5.0.13"
 
 /* Configurable features */
 
diff --git a/debian/changelog b/debian/changelog
index 00d040e..c679fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+whois (5.0.13) unstable; urgency=medium
+
+  * Updated the .hr TLD server. (Closes: #646572)
+  * Improved the package description, thanks to debian-l10n-english@.
+    (Closes: #650111)
+  * Updated the FSF address in licenses.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 27 Nov 2011 21:19:28 +0100
+
 whois (5.0.12) unstable; urgency=low
 
   * Recursion disabled when the query string contains spaces, because
diff --git a/debian/control b/debian/control
index 0109f48..ba9a090 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,11 @@ Build-Depends: debhelper (>= 5), gettext, libidn11-dev
 Package: whois
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: intelligent whois client
- This is a new whois (RFC 3912) client rewritten from scratch.
- It is inspired from and compatible with the usual BSD and RIPE whois(1)
- programs.
- It is intelligent and can automatically select the appropriate whois
- server for most queries.
+Description: intelligent WHOIS client
+ This package provides a commandline client for the WHOIS (RFC 3912)
+ protocol, which queries online servers for information such as contact
+ details for domains and IP address assignments.
+ It can intelligently select the appropriate WHOIS server for most queries.
  .
- The package also contains mkpasswd, a features-rich front end to crypt(3).
+ The package also contains mkpasswd, a features-rich front end to the
+ password encryption function crypt(3).
diff --git a/debian/rules b/debian/rules
index 9111f55..523baf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@ SHELL+= -e
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
-#export DH_VERBOSE=1
-
 D := $(shell pwd)/debian/whois
 
 VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*$$//; s/\+.*$$//; /^Version/s/.* //p')
@@ -13,7 +11,6 @@ VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*$$//; s/\+.*$$//;
 build:
 	dh_testdir
 	$(MAKE) CONFIG_FILE="/etc/whois.conf" HAVE_LIBIDN=1 HAVE_ICONV=1
-	cd po && $(MAKE) whois.pot
 	touch $@
 
 clean:
@@ -30,8 +27,7 @@ binary-arch: checkroot build
 	egrep -q '^#define VERSION "$(VERSION)"$$' config.h
 
 	dh_installdirs usr/bin
-	install whois mkpasswd $D/usr/bin/
-	cd po && $(MAKE) install BASEDIR=$D
+	$(MAKE) install BASEDIR=$D
 	dh_installman whois.1 mkpasswd.1
 	dh_installdocs README
 	dh_installchangelogs 
diff --git a/servers_charset_list b/servers_charset_list
index f89f13c..48bba2a 100644
--- a/servers_charset_list
+++ b/servers_charset_list
@@ -18,6 +18,7 @@ whois.eu		utf-8
 whois.ficora.fi		iso-8859-1
 whois.nic.fr		iso-8859-1
 whois.hkirc.hk		utf-8
+whois.nic.hr		utf-8
 whois.nic.hu		iso-8859-1
 whois.isnic.is		iso-8859-1
 whois.jprs.jp		iso-2022-jp
diff --git a/simple_recode.c b/simple_recode.c
index e7d9bb5..0893df4 100644
--- a/simple_recode.c
+++ b/simple_recode.c
@@ -14,9 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <stdlib.h>
diff --git a/tld_serv_list b/tld_serv_list
index 5c7139e..665fcea 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -158,7 +158,7 @@
 .hk	whois.hkirc.hk
 .hm	whois.registry.hm
 .hn	AFILIAS		# www.nic.hn
-.hr	WEB http://www.dns.hr/pretrazivanje.html
+.hr	whois.dns.hr
 .ht	whois.nic.ht
 .hu	whois.nic.hu
 .id	whois.pandi.or.id
diff --git a/utils.c b/utils.c
index 59b484b..254bf2a 100644
--- a/utils.c
+++ b/utils.c
@@ -15,9 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /* for strdup */
diff --git a/whois.spec b/whois.spec
index 09892e3..a25e0d3 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 5.0.12
+Version: 5.0.13
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>
@@ -39,10 +39,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc %{prefix}/share/man/man1/whois.1.gz
 %doc %{prefix}/share/man/man1/mkpasswd.1.gz
 %lang(cs) %{prefix}/share/locale/cs/LC_MESSAGES/whois.mo
+%lang(da) %{prefix}/share/locale/da/LC_MESSAGES/whois.mo
 %lang(de) %{prefix}/share/locale/de/LC_MESSAGES/whois.mo
 %lang(el) %{prefix}/share/locale/el/LC_MESSAGES/whois.mo
 %lang(es) %{prefix}/share/locale/es/LC_MESSAGES/whois.mo
 %lang(eu) %{prefix}/share/locale/eu/LC_MESSAGES/whois.mo
+%lang(fi) %{prefix}/share/locale/fi/LC_MESSAGES/whois.mo
 %lang(fr) %{prefix}/share/locale/fr/LC_MESSAGES/whois.mo
 %lang(it) %{prefix}/share/locale/it/LC_MESSAGES/whois.mo
 %lang(ja) %{prefix}/share/locale/ja/LC_MESSAGES/whois.mo
@@ -50,6 +52,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %lang(pl) %{prefix}/share/locale/pl/LC_MESSAGES/whois.mo
 %lang(pt_BR) %{prefix}/share/locale/pt_BR/LC_MESSAGES/whois.mo
 %lang(ru) %{prefix}/share/locale/ru/LC_MESSAGES/whois.mo
+%lang(zh_CN) %{prefix}/share/locale/zh_CN/LC_MESSAGES/whois.mo
 
 %changelog
 * Sun Jul 13 2003 Paul Mundt <lethal@linux-sh.org>