[Pkg-wmaker-commits] [wmifs] 01/01: Imported Debian patch 1.3b1-20

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to annotated tag debian/1.3b1-20
in repository wmifs.

commit 9ac90447fa2190d1680b2aa548ecd0f001d0dfe7
Author: Martin A. Godisch <godisch at debian.org>
Date:   Tue Nov 24 21:49:25 2009 +0100

    Imported Debian patch 1.3b1-20
---
 debian/changelog    |  8 ++++++++
 debian/control      |  2 +-
 debian/copyright    | 27 ++++++++++++++++++---------
 wmifs/wmifs-libc5.c |  4 ++--
 wmifs/wmifs.c       |  6 +++---
 5 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5722474..d02dec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmifs (1.3b1-20) unstable; urgency=low
+
+  * Replaced stats_ptr and ifr__name which are not defined on all archs.
+  * Updated copyright file.
+  * Updated standards version.
+
+ -- Martin A. Godisch <godisch at debian.org>  Tue, 24 Nov 2009 21:49:25 +0100
+
 wmifs (1.3b1-19) unstable; urgency=low
 
   * Fixed build-dependencies, closes: #486995.
diff --git a/debian/control b/debian/control
index 46fa614..da9da78 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Martin A. Godisch <godisch at debian.org>
 Build-Depends: libx11-dev, libxext-dev, libxpm-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 
 Package: wmifs
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index cc62f47..2e2d8f3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,17 +4,26 @@ Jordi Mallach <jordi at debian.org> took over the packaging on
 Sun,  6 May 2001 13:50:04 +0200
 Romain Francoise <rfrancoise at debian.org> then took the package from
 Jordi's hands on Fri, 05 Dec 2003 20:05:51 +0100
-
 The package is now maintained by Martin A. Godisch <godisch at debian.org>.
 
+It was downloaded from http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/net.html.
+
+Copyright (c) 1998-2004
+Martijn Pieterse <pieterse at xs4all.nl> and Antoine Nulle <warp at xs4all.nl>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
 
-It was downloaded from http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/net.html
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU General Public License for more details.
 
-Upstream Authors: Martijn Pieterse <pieterse at xs4all.nl>
-		  Antoine Nulle <warp at xs4all.nl>
-	    
-Copyright:
+  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 St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-WMiFS is released under the GNU General Public License, version 2 or
-greater, found on Debian GNU/Linux systems in the file
-`/usr/share/common-licenses/GPL'
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL.
diff --git a/wmifs/wmifs-libc5.c b/wmifs/wmifs-libc5.c
index aac5d19..8d95981 100644
--- a/wmifs/wmifs-libc5.c
+++ b/wmifs/wmifs-libc5.c
@@ -848,9 +848,9 @@ void get_ppp_stats(struct ppp_stats *cur) {
 
 	memset(&req, 0, sizeof(req));
 
-	req.stats_ptr = (caddr_t) &req.stats;
+	req.b.ifr_ifru.ifru_data = (caddr_t) &req.stats;
 
-	sprintf(req.ifr__name, "ppp%d", PPP_UNIT);
+	sprintf(req.b.ifr_ifrn.ifrn_name, "ppp%d", PPP_UNIT);
 
 	if (ioctl(ppp_h, SIOCGPPPSTATS, &req) < 0) {
 		fprintf(stderr, "heyho!\n");
diff --git a/wmifs/wmifs.c b/wmifs/wmifs.c
index 95d4cf1..69e9f2b 100644
--- a/wmifs/wmifs.c
+++ b/wmifs/wmifs.c
@@ -87,7 +87,7 @@
 		* Patch that cuts long interface names, so they look
 		  good in wmifs. For example, "dummy0" gets displayed
 		  as "dumm0", "vmnet10" as "vmn10", etc.
-	06/16/2001 (Jorge Garc�a, Jorge.Garcia at uv.es)
+	06/16/2001 (Jorge Garc?a, Jorge.Garcia at uv.es)
 		* Added the LockMode, so wmifs doesn't swap to another
 		  interface if the one requested with "-i" isn't up.
 	05/06/2001 (Jordi Mallach, jordi at sindominio.net)
@@ -916,9 +916,9 @@ void get_ppp_stats(struct ppp_stats *cur) {
 
 	memset(&req, 0, sizeof(req));
 
-	req.stats_ptr = (caddr_t) &req.stats;
+	req.b.ifr_ifru.ifru_data = (caddr_t) &req.stats;
 
-	sprintf(req.ifr__name, "ppp%d", PPP_UNIT);
+	sprintf(req.b.ifr_ifrn.ifrn_name, "ppp%d", PPP_UNIT);
 
 	if (ioctl(ppp_h, SIOCGPPPSTATS, &req) < 0) {
 /*		fprintf(stderr, "heyho!\n"); */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmifs.git