[Pkg-octave-commit] r2532 - in octave-forge-pkgs/octave-sockets/trunk/debian: . patches

[Thomas Weber]

Author: thomas-guest
Date: 2008-12-12 14:09:14 +0000 (Fri, 12 Dec 2008)
New Revision: 2532

Removed:
   octave-forge-pkgs/octave-sockets/trunk/debian/patches/gethostname_with_empty_arg
Modified:
   octave-forge-pkgs/octave-sockets/trunk/debian/changelog
   octave-forge-pkgs/octave-sockets/trunk/debian/control
   octave-forge-pkgs/octave-sockets/trunk/debian/patches/series
Log:
Debian release octave-sockets_1.0.5-1

Modified: octave-forge-pkgs/octave-sockets/trunk/debian/changelog
===================================================================
--- octave-forge-pkgs/octave-sockets/trunk/debian/changelog	2008-12-12 14:09:06 UTC (rev 2531)
+++ octave-forge-pkgs/octave-sockets/trunk/debian/changelog	2008-12-12 14:09:14 UTC (rev 2532)
@@ -1,10 +1,17 @@
-octave-sockets (1.0.4-4) UNRELEASED; urgency=low
+octave-sockets (1.0.5-1) experimental; urgency=low
 
+  [ Ólafur Jens Sigurðsson ]
   * debian/control: Bumped Standards-Version to 3.8.0 (no changes
     needed)
 
- -- Ólafur Jens Sigurðsson <ojsbug at gmail.com>  Wed, 30 Jul 2008 01:13:11 +0200
+  [ Thomas Weber ]
+  * New upstream release
+  * Bump dependency on octave-pkg-dev to 0.6.1, to get the experimental
+    version
+  * debian/patches/gethostname_with_empty_arg: removed, applied upstream
 
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Thu, 11 Dec 2008 16:35:07 +0000
+
 octave-sockets (1.0.4-3) unstable; urgency=low
 
   * debian/patches/autoload-yes.diff: Enable autoloading of sockets

Modified: octave-forge-pkgs/octave-sockets/trunk/debian/control
===================================================================
--- octave-forge-pkgs/octave-sockets/trunk/debian/control	2008-12-12 14:09:06 UTC (rev 2531)
+++ octave-forge-pkgs/octave-sockets/trunk/debian/control	2008-12-12 14:09:14 UTC (rev 2532)
@@ -6,7 +6,7 @@
  Thomas Weber <thomas.weber.mail at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.5.5), quilt
+Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.6.1), quilt
 Standards-Version: 3.8.0
 Homepage: http://octave.sourceforge.net/sockets
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave-forge-pkgs/octave-sockets/trunk

Deleted: octave-forge-pkgs/octave-sockets/trunk/debian/patches/gethostname_with_empty_arg
===================================================================
--- octave-forge-pkgs/octave-sockets/trunk/debian/patches/gethostname_with_empty_arg	2008-12-12 14:09:06 UTC (rev 2531)
+++ octave-forge-pkgs/octave-sockets/trunk/debian/patches/gethostname_with_empty_arg	2008-12-12 14:09:14 UTC (rev 2532)
@@ -1,60 +0,0 @@
-Don't let gethostbyname crash when called without argument
-http://sourceforge.net/mailarchive/forum.php?thread_name=482C2A85.50707%40motorola.com&forum_name=octave-dev
---- a/src/sockets.cc
-+++ b/src/sockets.cc
-@@ -456,25 +456,31 @@
- DEFUN_DLD(gethostbyname,args,nargout, \
- 	  "gethostbyname(string)\nSee the gethostbyname() man pages")
- {
-+  int nargin = args.length ();
-   struct hostent*    hostInfo = NULL;
--  string_vector host_list;
-+  octave_value retval;
- 
--
--  if ( args(0).is_string() )
--  {
--    string addr = args(0).string_value();
--    hostInfo = gethostbyname( addr.c_str() );
--    if ( hostInfo )
-+  if (nargin != 1)
-+    print_usage ();
-+  else if ( args(0).is_string() )
-     {
--      for ( int i = 0 ; i < hostInfo->h_length/4 ; i++ )
--      {
--	string temp_addr = string(  inet_ntoa( *(struct in_addr*)hostInfo->h_addr_list[i] ));
--	host_list.append( temp_addr );
--      }
-+      string_vector host_list;
-+      string addr = args(0).string_value();
-+      hostInfo = gethostbyname( addr.c_str() );
-+      if ( hostInfo )
-+	{
-+	  for ( int i = 0 ; i < hostInfo->h_length/4 ; i++ )
-+	    {
-+	      string temp_addr = string(  inet_ntoa( *(struct in_addr*)hostInfo->h_addr_list[i] ));
-+	      host_list.append( temp_addr );
-+	    }
-+	}
-+      retval = octave_value (host_list);
-     }
--  }
-+  else
-+    print_usage ();
- 
--  return octave_value(host_list);
-+  return retval;
- }
- 
- // PKG_ADD: autoload ("send", "sockets.oct");
-@@ -675,7 +681,8 @@
-   int backlog = args(1).int_value();
- //  octave_stdout << "BACKLOG: " << backlog << endl;
- 
--  retval = ::listen( s->get_sock_fd(), backlog );
-+  if (! error_state)
-+    retval = ::listen( s->get_sock_fd(), backlog );
- 
-   return octave_value(retval);
- }

Modified: octave-forge-pkgs/octave-sockets/trunk/debian/patches/series
===================================================================
--- octave-forge-pkgs/octave-sockets/trunk/debian/patches/series	2008-12-12 14:09:06 UTC (rev 2531)
+++ octave-forge-pkgs/octave-sockets/trunk/debian/patches/series	2008-12-12 14:09:14 UTC (rev 2532)
@@ -1,2 +1 @@
-gethostname_with_empty_arg
 autoload-yes.diff