[Pkg-wmaker-commits] [wmfire] 12/61: Imported Debian patch 1.2.3-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 03:38:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmfire.
commit 462d58f9451f8779f150c0235321a1f4d389224c
Merge: deb9020 3ba4156
Author: Charles Fry <debian at frogcircus.org>
Date: Tue Dec 6 10:58:02 2005 -0500
Imported Debian patch 1.2.3-1
ChangeLog | 6 +
Makefile.in | 279 +-
aclocal.m4 | 1055 ++--
config.guess | 1327 -----
config.sub | 1410 ------
configure | 1017 ++--
configure.in | 2 +-
debian/changelog | 9 +
debian/control | 4 +-
debian/copyright | 2 +-
debian/docs | 3 +-
debian/patches/00list | 4 +-
debian/patches/01_config.dpatch | 1648 ------
.../{02_resource.dpatch => 01_resource.dpatch} | 32 +-
debian/patches/03_gtk20.dpatch | 28 -
debian/postinst | 47 -
debian/prerm | 37 -
debian/rules | 8 +-
depcomp | 368 +-
install-sh | 495 +-
libtool | 5285 --------------------
ltmain.sh | 4999 ------------------
missing | 237 +-
mkinstalldirs | 40 -
src/Makefile.in | 197 +-
src/wmfire.c | 11 +-
wmfire.1 | 17 +-
27 files changed, 2297 insertions(+), 16270 deletions(-)
diff --cc debian/changelog
index 2445a34,0000000..8dbf872
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,152 -1,0 +1,161 @@@
++wmfire (1.2.3-1) unstable; urgency=low
++
++ * New upstream release. (Closes: #341255)
++ * Removed unused maintainer scripts.
++ * Simplified dependencies.
++ * Build with autotools.
++
++ -- Charles Fry <debian at frogcircus.org> Tue, 6 Dec 2005 10:58:02 -0500
++
+wmfire (1.2.2-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #328475)
+ * Moved to CDBS and dpatch.
+
+ -- Charles Fry <debian at frogcircus.org> Thu, 29 Sep 2005 08:08:03 -0400
+
+wmfire (1.2.1-6) unstable; urgency=low
+
+ * New maintainer. (Closes: #326779)
+ * Previous NMU was succesfully performed. (Closes: #326575)
+
+ -- Charles Fry <debian at frogcircus.org> Wed, 7 Sep 2005 01:23:45 -0400
+
+wmfire (1.2.1-5) unstable; urgency=low
+
+ * Orphan package and set maintainer to Debian QA Group
+ * Bump standards version to 3.6.2 (no change required)
+ * Update FSF address
+ * Bump libgtop2-dev build-dep to get a version past the soname change.
+ (Closes: #316764, #322524)
+ * Break build-dependencies for the xorg transition.
+ - Remove xlibs-dev build-dep.
+ - Add libxt-dev build-dep (for the AC_PATH_X macro to detect X), upstream
+ should specialize the macro call if they don't need this lib.
+ - Add libx11-dev build-dep.
+ - Add libxext-dev build-dep.
+
+ -- Loic Minier <lool at dooz.org> Sun, 4 Sep 2005 10:06:12 +0200
+
+wmfire (1.2.1-4) unstable; urgency=low
+
+ * applied the patch from Alan Swanson (see #250937) (Closes: #250937,
+ #256782)
+ * adjusted mandir to be FHS 2.1 compatible
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Tue, 17 Aug 2004 15:49:00 +0000
+
+wmfire (1.2.1-3) unstable; urgency=low
+
+ * Changed Build-Depends: libgtop2-dev (>=2.6.0-4) (Closes: #252189)
+ * sponsored by Martin Wuertele <maxx at debian.org>
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Sat, 12 Jun 2004 13:27:21 +0200
+
+wmfire (1.2.1-2) unstable; urgency=low
+
+ * recompile against libgtop-2.2 (Closes: #252189)
+ * sponsored by Martin Wuertele <maxx at debian.org>
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Sun, 6 Jun 2004 13:55:52 +0000
+
+wmfire (1.2.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #242536)
+ * manually applied the patch from Christof Douma (see #228357)
+ * some very small changes in wmfire.menu
+ * sponsored by Martin Wuertele <maxx at debian.org>
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Sun, 9 May 2004 20:37:58 +0200
+
+wmfire (1.1.99-5) unstable; urgency=low
+
+ * corrected the manpage section
+ * applied a patch from Christof Douma to manually set the X resource name (Closes: #228357)
+ * formating fixes to the manpage
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Sun, 18 Jan 2004 19:25:55 +0100
+
+wmfire (1.1.99-4) unstable; urgency=low
+
+ * New maintainer (really, this time)
+ * rm config.{log,cache,status} in build-stamp target to clean up upstream cruft
+ * updated config.sub and config.guess
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Fri, 2 Jan 2004 14:09:20 +0100
+
+wmfire (1.1.99-3) unstable; urgency=low
+
+ * New Maintainer (Closes: #210794)
+ * created wmfire.menu
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Fri, 2 Jan 2004 11:41:38 +0100
+
+wmfire (1.1.99-2) unstable; urgency=low
+
+ * Fix missing build-depends on libgtop2-dev (closes: Bug#225225).
+
+ -- Søren Boll Overgaard <boll at debian.org> Sun, 28 Dec 2003 15:34:32 +0000
+
+wmfire (1.1.99-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Søren Boll Overgaard <boll at debian.org> Sun, 21 Dec 2003 22:37:20 +0000
+
+wmfire (1.0.0-3) unstable; urgency=low
+
+ * Fix manpage (closes: Bug#165589).
+
+ -- Søren Boll Overgaard <boll at debian.org> Sun, 20 Oct 2002 18:17:47 +0200
+
+wmfire (1.0.0-2) unstable; urgency=low
+
+ * Fix build-deps (closes: Bug#165437).
+
+ -- Søren Boll Overgaard <boll at debian.org> Sat, 19 Oct 2002 11:20:00 +0200
+
+wmfire (1.0.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * New maintaner (closes: Bug#164989).
+ * New upstream maintainer.
+ * Install manpage for wmfire (closes: Bug#87084).
+ * Add build-depends/depends, to support now and improved[TM] code.
+ * Dont leave processes hanging (closes: Bug#98391).
+
+ -- Søren Boll Overgaard <boll at debian.org> Fri, 18 Oct 2002 10:31:15 +0200
+
+wmfire (0.0.3.9pre4-2) unstable; urgency=low
+
+ * typo. closes: #125490
+ * install wmfire to /usr/bin not /usr/X11R6/bin.
+ * Remove 'undocumented manpage'. closes: #87084
+
+ -- Ryuichi Arafune <arafune at debian.org> Sat, 22 Dec 2001 14:46:20 +0900
+
+wmfire (0.0.3.9pre4-1) unstable; urgency=low
+
+ * New upstream version: closes #46005, #61321
+
+ -- Ryuichi Arafune <arafune at debian.org> Mon, 3 Apr 2000 20:18:50 +0900
+
+wmfire (0.0.3.8-3) unstable; urgency=low
+
+ * Readme.Debian (empgy file) removed. (Bug#54371)
+
+ -- Ryuichi Arafune <arafune at debian.org> Sat, 8 Jan 2000 09:29:04 +0900
+
+wmfire (0.0.3.8-2) unstable; urgency=low
+
+ * /usr/doc -> /usr/share/doc/ (Use debhelper 2.0.40).
+ * lintian free
+
+ -- Ryuichi Arafune <arafune at debian.org> Tue, 7 Sep 1999 20:31:51 +0900
+
+wmfire (0.0.3.8-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Ryuichi Arafune <arafune at debian.org> Fri, 27 Aug 1999 12:33:40 +0900
+
diff --cc debian/control
index 9123e50,0000000..7ffb573
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,0 +1,15 @@@
+Source: wmfire
+Section: x11
+Priority: optional
+Maintainer: Charles Fry <debian at frogcircus.org>
- Build-Depends: debhelper (>=4.0.0), libgtop2-dev (>= 2.10.0-1), libgtk2.0-dev, libxt-dev, libx11-dev, dpatch, cdbs
++Build-Depends: cdbs, debhelper (>=4.1.0), libgtop2-dev (>= 2.10.0-1), libgtk2.0-dev, dpatch, autotools-dev
+Standards-Version: 3.6.2
+
+Package: wmfire
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: very cool fiery way of showing your CPU usage
+ A windowmaker (or similar) dockapp, which shows your current CPU usage as
+ a roaring fire.
+ .
- Homepage: http://www.swanson.ukfsn.org/#wmfire
++ Homepage: http://www.swanson.ukfsn.org/#wmfire
diff --cc debian/copyright
index 5660142,0000000..b6b0471
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,28 -1,0 +1,28 @@@
+This package was debianized by Ryuichi Arafune <arafune at debian.org> on
+Fri, 27 Aug 1999 12:33:40 +0900.
+
+It was downloaded from http://www.swanson.ukfsn.org/#wmfire
+
+Upstream Authors:
- This version: Alan Swanson <swanson at uklinux.net>
++This version: Alan Swanson <swanson at ukfsn.org>
+Previous versions: Zinx Verituse <zinx at linuxfreak.com>
+
+Copyright:
+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:
+
+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, version 2, can be found in /usr/share/common-licenses/GPL-2.
diff --cc debian/docs
index 50bd824,0000000..8e59dcd
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,2 -1,0 +1,1 @@@
- NEWS
- README
++ALL_I_GET_IS_A_GREY_BOX
diff --cc debian/patches/00list
index 4055027,0000000..94e86cc
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,3 -1,0 +1,1 @@@
- 01_config
- 02_resource
- 03_gtk20
++01_resource.dpatch
diff --cc debian/patches/01_resource.dpatch
index a89c1fd,0000000..6845d65
mode 100644,000000..100644
--- a/debian/patches/01_resource.dpatch
+++ b/debian/patches/01_resource.dpatch
@@@ -1,74 -1,0 +1,74 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_resource.dpatch by <debian at frogcircus.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add -r option to specify resource name
+
+ at DPATCH@
- diff -urNad --exclude=CVS --exclude=.svn ./src/wmfire.c /tmp/dpep-work.9JzguN/wmfire/src/wmfire.c
- --- ./src/wmfire.c 2004-08-01 10:06:42.000000000 -0400
- +++ /tmp/dpep-work.9JzguN/wmfire/src/wmfire.c 2005-09-14 23:17:38.226063079 -0400
- @@ -133,6 +133,7 @@
++diff -urNad wmfire~/src/wmfire.c wmfire/src/wmfire.c
++--- wmfire~/src/wmfire.c 2005-12-04 05:39:16.000000000 -0500
+++++ wmfire/src/wmfire.c 2005-12-06 10:52:31.055785408 -0500
++@@ -134,6 +134,7 @@
+ int cpu_id = 0;
+ int cpu_nice = 1;
+ char net_dev[16] = "ppp0";
++char resource_name[64] = "wmfire";
+ int net_spd = 0;
+ char *file_name = NULL;
+ int file_max = 100;
- @@ -568,12 +569,12 @@
++@@ -569,12 +570,12 @@
+
+ attr.width = 64;
+ attr.height = 64;
+- attr.title = "wmfire";
++ attr.title = resource_name;
+ attr.event_mask = MASK;
+ attr.wclass = GDK_INPUT_OUTPUT;
+ attr.visual = gdk_visual_get_system();
+ attr.colormap = gdk_colormap_get_system();
+- attr.wmclass_name = "wmfire";
++ attr.wmclass_name = resource_name;
+ attr.wmclass_class = "wmfire";
+ attr.window_type = GDK_WINDOW_TOPLEVEL;
+
- @@ -650,7 +651,7 @@
++@@ -653,7 +654,7 @@
+ bm.flame = fire[cmap].data;
+
+ /* Parse command options */
- - while ((i = getopt(argc, argv, "c:mni:s:xF:H:L:pf:lbhg:S:")) != -1) {
- + while ((i = getopt(argc, argv, "c:mni:r:s:xF:H:L:pf:lbhg:S:")) != -1) {
++- while ((i = getopt(argc, argv, "c:mni:s:xF:H:L:pf:lbhg:yS:")) != -1) {
+++ while ((i = getopt(argc, argv, "c:mni:r:s:xF:H:L:pf:lbhg:yS:")) != -1) {
+ switch (i) {
+ case 'S':
+ if (optarg)
- @@ -681,6 +682,10 @@
++@@ -687,6 +688,10 @@
+ if (optarg)
+ strncpy(net_dev, optarg, sizeof (net_dev));
+ break;
++ case 'r':
++ if(optarg)
++ strcpy(resource_name, optarg);
++ break;
+ case 's':
+ if (optarg)
+ net_spd = atoi(optarg);
- @@ -760,5 +765,6 @@
++@@ -767,5 +772,6 @@
+ fprintf(stderr, "%d:%s ", i + 1, fire[i].text);
+ fprintf(stderr, "\n\t-l\t\t\tlock flame colour and monitor\n");
+ fprintf(stderr, "\t-b\t\t\tactivate broken window manager fix\n");
++ fprintf(stderr, "\t-r [...]\t\tchange resource name (default:%s)\n", resource_name);
+ fprintf(stderr, "\t-h\t\t\tprints this help\n");
+ }
- diff -urNad --exclude=CVS --exclude=.svn ./wmfire.1 /tmp/dpep-work.9JzguN/wmfire/wmfire.1
- --- ./wmfire.1 2004-06-28 15:27:52.000000000 -0400
- +++ /tmp/dpep-work.9JzguN/wmfire/wmfire.1 2005-09-14 23:18:23.250972034 -0400
- @@ -93,6 +93,10 @@
++diff -urNad wmfire~/wmfire.1 wmfire/wmfire.1
++--- wmfire~/wmfire.1 2005-12-04 05:39:16.000000000 -0500
+++++ wmfire/wmfire.1 2005-12-06 10:51:28.318260676 -0500
++@@ -98,6 +98,10 @@
+ .B -p
+ Fire effect only (no monitoring)
+ .TP
++.B -r
++.RI [ ... ]
++Change resource name (default:wmfire)
++.TP
+ .B -s [...][K|M]
- Change the network speed (Automatic preset values for interfaces: ppp=56K
- eth=100M)
++ Change the network speed - kilobytes or megabytes
++ .br
diff --cc debian/rules
index a56f453,0000000..7fb9de7
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,9 -1,0 +1,15 @@@
+#!/usr/bin/make -f
+#-*- makefile -*-
+
+include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
++include /usr/share/cdbs/1/class/autotools.mk
++
++# remove dependency on libglib2.0-0, libpango1.0-0 and libxext6
++DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR) LDFLAGS="-lgdk-x11-2.0 -lgtop-2.0" wmfire_LDADD="" AM_LDFLAGS=""
++
++# don't need upstream AUTHORS
++DEB_INSTALL_DOCS_ALL = ./README ./NEWS
+
+# allow dpatch-edit-patch to work (since dpatch.mk is broken, see bug #284231)
+unpatch: deapply-dpatches
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfire.git
More information about the Pkg-wmaker-commits
mailing list