[Pkg-wmaker-commits] [wmifinfo] 04/49: Imported Debian patch 0.09-6
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 18 02:07:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmifinfo.
commit ff0719bcbd84fd69a3f38a1f699093762b1cf279
Author: Emanuele Rocca <ema at debian.org>
Date: Sun Jan 19 19:28:17 2014 +0100
Imported Debian patch 0.09-6
---
debian/README.source | 4 ++
debian/changelog | 103 ++++++++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 16 +++++
debian/copyright | 26 ++++++++
debian/dirs | 1 +
debian/menu | 3 +
debian/patches/makefile_add_ldflags.patch | 13 ++++
debian/patches/makefile_patch.patch | 45 +++++++++++++
debian/patches/series | 3 +
debian/patches/wmifinfo-timeval_fix.patch | 23 +++++++
debian/rules | 67 +++++++++++++++++++
debian/watch | 2 +
debian/wmifinfo.1 | 63 ++++++++++++++++++
14 files changed, 370 insertions(+)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..c45bb81
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+This package uses quilt to manage patches against the upstream source.
+
+If you are not familiar with using quilt with Debian packages please take a
+look at /usr/share/doc/quilt
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..fd03e7d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,103 @@
+wmifinfo (0.09-6) unstable; urgency=low
+
+ * QA upload.
+ * debian/control:
+ - Maintainer field set to QA Group.
+ - Bump Standards-Version to 3.9.5.
+ * debian/rules:
+ - Add missing targets: build-{arch,indep}.
+ - Replace dh_clean -k with dh_prep.
+ - Export dpkg buildflags.
+ * Use LDFLAGS in Makefile.
+ * Debhelper compatibility level set to 9.
+
+ -- Emanuele Rocca <ema at debian.org> Sun, 19 Jan 2014 19:28:17 +0100
+
+wmifinfo (0.09-5) unstable; urgency=low
+
+ * Add quilt include to debian/rules
+ - Add patches/wmifinfo-timeval_fix.patch (Closes: #503416)
+ This add set a valid timeval to wmifinfo.c
+ - Add patches/makefile_patch.patch
+ Split patches made it directly to upstream source
+ * Remove unneeded x-dev from the Build-Depends.
+ * Remove unneeded CFLAGS from the debian/rules.
+ * Set standard version to 3.8.0
+ - Add README.source
+
+ -- Enrique Monge <emonge at debian.org.sv> Tue, 28 Oct 2008 09:38:42 -0600
+
+wmifinfo (0.09-4) unstable; urgency=low
+
+ * Bumped to 3.7.3 standard version (no changes needed)
+ debian/compat updated
+ changed Depends from debhelper 5 to debhelper >=6
+ minor changes to debian/rules
+ * debian/watch fixed (Closes: #453568)
+ * Homepage field added to debian/control
+ * New debian/copyright format added
+ * Using new menu format
+
+ -- Enrique Monge <emonge at debian.org.sv> Tue, 22 Jan 2008 11:19:25 -0600
+
+wmifinfo (0.09-3) unstable; urgency=low
+
+ * New mainttainer (Closes: #427135)
+ * Bumped to 3.7.2 standard version
+ debian/compat added
+ changed Depends from debhelper 4 to debhelper >=5
+ minor changes to debian/rules
+ * debian/watch added
+ * changelog modified to comply with utf-8
+
+ -- Enrique Monge <emonge at debian.org.sv> Sat, 14 Jul 2007 18:32:59 -0600
+
+wmifinfo (0.09-2) unstable; urgency=low
+
+ * Orphan package, set maintainer to Debian QA Group
+
+ -- Gordon Fraser <gordon at debian.org> Sat, 02 Jun 2007 06:17:21 +0200
+
+wmifinfo (0.09-1) unstable; urgency=low
+
+ * New upstream version (Closes: #316266)
+ * Fix build dependencies (Closes: #346904)
+
+ -- Gordon Fraser <gordon at debian.org> Sun, 15 Jan 2006 14:04:49 +0100
+
+wmifinfo (0.08-1) unstable; urgency=low
+
+ * New upstream version (Closes: #253174)
+
+ -- Gordon Fraser <gordon at debian.org> Thu, 29 Jul 2004 08:50:31 +0200
+
+wmifinfo (0.06-2) unstable; urgency=low
+
+ * New maintainer (Closes: #210793)
+ * Bump standards-version to 3.6.1.0
+ * Update DEB_BUILD_OPTIONS handling
+ * Minor update to description
+ * Remove dh_make boilerplate from debian/copyright
+ * Add menu entry
+
+ -- Gordon Fraser <gordon at debian.org> Sun, 21 Sep 2003 12:57:38 +0200
+
+wmifinfo (0.06-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Søren Boll Overgaard <boll at debian.org> Wed, 19 Jun 2002 12:27:30 +0200
+
+wmifinfo (0.05-2) unstable; urgency=low
+
+ * Uppercase description (closes: Bug#150377).
+
+ -- Søren Boll Overgaard <boll at debian.org> Wed, 19 Jun 2002 00:16:09 +0200
+
+wmifinfo (0.05-1) unstable; urgency=low
+
+ * Initial Release (closes: Bug#148406).
+ * Changed Makefile to install in $(DESTDIR)
+
+ -- Søren Boll Overgaard <boll at debian.org> Fri, 7 Jun 2002 16:23:13 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..be64580
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,16 @@
+Source: wmifinfo
+Section: x11
+Priority: optional
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends: debhelper (>= 9), libx11-dev, libxext-dev, libxpm-dev, quilt
+Standards-Version: 3.9.5
+Homepage: http://zevv.nl/play/code/wmifinfo/
+
+Package: wmifinfo
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Dockapp that shows information for all interfaces
+ wmifinfo is a simple applet showing basic network info for all available
+ interfaces. It shows IP address, netmask, gateway and MAC address in a
+ similar way to ifconfig.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..388f00a
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,26 @@
+This package was downloaded from http://zevv.nl/play/code/wmifinfo/
+
+Files: debian/*
+Copyright: © 2002 Søren Boll Overgaard <boll at debian.org>
+License: GPL-2+
+ The Debian packaging information is under the GPL, version 2 or later
+
+Files: *
+Copyright: © 2004 Ico Doornekamp <ico at pruts.nl>
+License: GPL-2+
+ 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.
+
+ 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.
+
+ 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.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in file "/usr/share/common-licenses/GPL"
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..59de2e9
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,3 @@
+?package(wmifinfo):needs="X11" section="Applications/Network/Monitoring"\
+ title="wmifinfo" command="/usr/bin/wmifinfo"
+
diff --git a/debian/patches/makefile_add_ldflags.patch b/debian/patches/makefile_add_ldflags.patch
new file mode 100644
index 0000000..bf91837
--- /dev/null
+++ b/debian/patches/makefile_add_ldflags.patch
@@ -0,0 +1,13 @@
+Author: Emanuele Rocca <ema at debian.org>
+Description: Use LDFLAGS in Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@
+ $(CC) $(COPTS) $(CFLAGS) -c $<
+
+ $(BIN): $(FILES)
+- $(LD) -o $@ $(FILES) $(LDOPTS)
++ $(LD) -o $@ $(FILES) $(LDOPTS) $(LDFLAGS)
+
+ clean:
+ rm -f *.o $(BIN) core ./.#* *.orig *.rej
diff --git a/debian/patches/makefile_patch.patch b/debian/patches/makefile_patch.patch
new file mode 100644
index 0000000..31b426f
--- /dev/null
+++ b/debian/patches/makefile_patch.patch
@@ -0,0 +1,45 @@
+Author: Enrique Monge
+Description: Add CFLAGS, use rights PATHs and INSTALL instead of 'cp'
+--- wmifinfo-0.09.orig/Makefile 2005-03-14 01:28:31.000000000 -0600
++++ wmifinfo-0.09/Makefile 2008-10-28 09:31:44.000000000 -0600
+@@ -2,7 +2,7 @@
+ # Set this to 'y' if you want support for reading the link quality
+ # of nowiresneeded 1148 PCMCIA or Swallow cards
+
+-ENABLE_NWN_SUPPORT=n
++ENABLE_NWN_SUPPORT=y
+
+
+ ##################################################################
+@@ -13,9 +13,11 @@ VERSION=0.09
+
+ CC = gcc
+ LD = gcc
+-COPTS = -Wall -O2 -D'VERSION="$(VERSION)"' -D'NAME="$(NAME)"'
++COPTS = -D'VERSION="$(VERSION)"' -D'NAME="$(NAME)"'
+ LDOPTS = -lX11 -L/usr/X11R6/lib -lXpm -lXext
+-BINDIR = /usr/local/bin
++BINDIR = $(DESTDIR)/usr/bin/
++INSTALL=/usr/bin/install
++INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
+
+ BIN = wmifinfo
+ FILES = wmifinfo.o xutils.o
+@@ -28,7 +30,7 @@ endif
+ all: $(BIN)
+
+ .c.o:
+- $(CC) $(COPTS) -c $<
++ $(CC) $(COPTS) $(CFLAGS) -c $<
+
+ $(BIN): $(FILES)
+ $(LD) -o $@ $(FILES) $(LDOPTS)
+@@ -37,7 +39,7 @@ clean:
+ rm -f *.o $(BIN) core ./.#* *.orig *.rej
+
+ install:
+- cp $(BIN) $(BINDIR)
++ $(INSTALL_PROGRAM) $(BIN) $(BINDIR)
+
+ dist: clean
+ rm -rf /tmp/wmifinfo-$(VERSION)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c165d91
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+wmifinfo-timeval_fix.patch
+makefile_patch.patch
+makefile_add_ldflags.patch
diff --git a/debian/patches/wmifinfo-timeval_fix.patch b/debian/patches/wmifinfo-timeval_fix.patch
new file mode 100644
index 0000000..cd24fe5
--- /dev/null
+++ b/debian/patches/wmifinfo-timeval_fix.patch
@@ -0,0 +1,23 @@
+Author: Julien BLACHE
+Description: This add set a valid timeval to wmifinfo.c
+--- wmifinfo-0.09.orig/wmifinfo.c
++++ wmifinfo-0.09/wmifinfo.c
+@@ -49,6 +49,7 @@
+ #define MAXIFS 10
+ #ifdef linux
+ #define DELAY 1000000L
++#define USEC_PER_SEC 1000000L
+ #else
+ #define DELAY 100000L
+ #endif
+@@ -267,8 +268,8 @@
+ }
+
+ #ifdef linux
+- tv.tv_sec = 0;
+- tv.tv_usec = DELAY;
++ tv.tv_sec = DELAY / USEC_PER_SEC;
++ tv.tv_usec = DELAY - (tv.tv_sec * USEC_PER_SEC);
+
+ FD_ZERO(&fds);
+ FD_SET(ConnectionNumber(display), &fds);
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..bf09b77
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,67 @@
+#!/usr/bin/make -f
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+INSTALL=/usr/bin/install
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
+
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch $@
+
+build-arch: build
+build-indep: build
+
+build: patch build-stamp
+
+build-stamp: $(QUILT_STAMPFN) configure-stamp
+ dh_testdir
+ $(MAKE) CFLAGS="$(CFLAGS)"
+ touch $@
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ dh_clean build-stamp configure-stamp
+ [ ! -f Makefile ] || $(MAKE) clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/wmifinfo INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs README
+ dh_installmenu
+ dh_installman debian/wmifinfo.1
+ dh_installchangelogs Changelog
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..eee8838
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.zevv.nl/play/code/wmifinfo/wmifinfo-(.*)\.tgz
diff --git a/debian/wmifinfo.1 b/debian/wmifinfo.1
new file mode 100644
index 0000000..a4c96f2
--- /dev/null
+++ b/debian/wmifinfo.1
@@ -0,0 +1,63 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH WMIFINFO 1 "June 7, 2002"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+wmifinfo \- dockapp for showing basic network info for all available interfaces
+.SH SYNOPSIS
+.B wmifinfo
+.RI [-lh] [-i interface]
+
+This manual page documents briefly the
+.B wmifinfo
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the GNU Info format; see below.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBwmifinfo\fP is is a simple applet showing basic network info for all
+available interfaces.
+It shows IP address, netmask, gateway and MAC address. A bit like ifconfig.
+Left-button click moves to the next interface, right-button click calls
+ifup/ifdown scripts.
+Please report bugs if you find any.
+.SH OPTIONS
+A summary of options is included below.
+.TP
+.B \-h
+Show summary of options.
+.TP
+.B \-v
+Show version of program.
+.TP
+.B \-d <cmd>
+Command to exec for iface-down
+.TP
+.B \-i <interface>
+Start with given interface, if available
+.TP
+.B \-l
+LCD display mode
+.TP
+.B \-u
+Command to exec for iface-up
+.br
+.SH AUTHOR
+This manual page was written by S�ren Boll Overgaard <boll at debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmifinfo.git
More information about the Pkg-wmaker-commits
mailing list