tags 515424 + pending
thanks
Dear maintainer,
I've prepared an NMU for xwrits (versioned as 2.21-6.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru xwrits-2.21/debian/changelog xwrits-2.21/debian/changelog
--- xwrits-2.21/debian/changelog 2010-05-16 22:08:45.000000000 -0700
+++ xwrits-2.21/debian/changelog 2010-05-04 11:39:32.000000000 -0700
@@ -1,6 +1,38 @@
+xwrits (2.21-6.1) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Move to packaging format "3.0 (quilt)".
+ * debian/clean
+ - Mew file.
+ * debian/compat
+ - New file.
+ * debian/control
+ - (Build-Depends): update obsolete xutils to xutils-dev.
+ (important; Closes: #515424). Remove *-1 version suffix
+ from texinfo dependency. Update to debhelper 7.1.
+ - (Depends): add ${misc:Depends}.
+ - (Homepage): New field.
+ - (Standards-Version): update to 3.8.4.
+ * debian/copyright
+ - Update layout and point to GPL-2.
+ * debian/rules
+ - Delete EOL whitespaces.
+ - (DH_COMPAT): Remove.
+ - (install): Update dh_clean to dh_prep.
+ - (clean): Fix lintian debian-rules-ignores-make-clean-error.
+ * debian/source/format
+ - New file.
+ * debian/watch
+ - New file.
+ * xwrits.1
+ - Fix hyphens.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 04 May 2010 21:39:32 +0300
+
xwrits (2.21-6) unstable; urgency=low
- * Altered rest.c and schedule.c to apply patch from Roderick Schertler
+ * Altered rest.c and schedule.c to apply patch from Roderick Schertler
(closes: #315572).
* New maintainer email address (same maintainer).
@@ -8,7 +40,7 @@
xwrits (2.21-5) unstable; urgency=low
- * Changed rest.c to make xwrits ignore all synthetic events. Patch
provided
+ * Changed rest.c to make xwrits ignore all synthetic events. Patch provided
by James Kirk (closes: #297229).
* New maintainer email address (same maintainer).
@@ -17,23 +49,23 @@
xwrits (2.21-4) unstable; urgency=low
* Build-depends on xlibs-dev changed to list only required packages.
- * Removed unnecessary paragraph about patenting of GIF files from
+ * Removed unnecessary paragraph about patenting of GIF files from
debian/copyright.
* Changed debian/rules to support support DEB_BUILD_OPTIONS=noopt.
* Removed debian/README.debian, because it contains no information that isn't
- also written elsewhere.
+ also written elsewhere.
-- Helen Faulkner <helen_ml_faulk...@yahoo.co.uk> Sun, 19 Dec 2004 11:03:19
+0000
xwrits (2.21-3) unstable; urgency=low
* New maintainer (closes: Bug#224839).
- * Changed debian/copyright file to standardise formatting and include new
+ * Changed debian/copyright file to standardise formatting and include new
upstream website.
* Changed debian/rules to use debhelper compatability version 4.
* Changed debian/control to removed build-depends on automake and autoconf,
- since these are not required to build xwrits.
- * Changed standards version to 3.6.1.
+ since these are not required to build xwrits.
+ * Changed standards version to 3.6.1.
-- Helen Faulkner <helen_ml_faulk...@yahoo.co.uk> Thu, 05 Aug 2004 13:36:13
+0100
diff -Nru xwrits-2.21/debian/compat xwrits-2.21/debian/compat
--- xwrits-2.21/debian/compat 1969-12-31 16:00:00.000000000 -0800
+++ xwrits-2.21/debian/compat 2010-05-04 11:27:08.000000000 -0700
@@ -0,0 +1 @@
+7
diff -Nru xwrits-2.21/debian/control xwrits-2.21/debian/control
--- xwrits-2.21/debian/control 2010-05-16 22:08:45.000000000 -0700
+++ xwrits-2.21/debian/control 2010-05-04 11:37:28.000000000 -0700
@@ -2,12 +2,13 @@
Section: x11
Priority: optional
Maintainer: Helen Faulkner <he...@debian.org>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), perl (>= 5.6), texinfo (>= 4.2-1),
libice-dev, libsm-dev, libx11-dev, libxext-dev, xutils (>= 4.2.1-3)
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.1), perl (>= 5.6), texinfo (>= 4.2),
libice-dev, libsm-dev, libx11-dev, libxext-dev, xutils-dev
+Homepage: http://www.lcdf.org/~eddietwo/xwrits
Package: xwrits
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: reminds you to take a break from typing
xwrits helps you prevent repetitive stress injury.
.
diff -Nru xwrits-2.21/debian/copyright xwrits-2.21/debian/copyright
--- xwrits-2.21/debian/copyright 2010-05-16 22:08:45.000000000 -0700
+++ xwrits-2.21/debian/copyright 2010-05-04 11:37:30.000000000 -0700
@@ -1,25 +1,30 @@
-Xwrits was first packaged by Jay Kominek on Wed, 10 Jun 1998.
-The maintenance was taken over by Hugo Haas on Thu, 6 Jul 2000.
-The maintenance was taken over by Helen Faulkner on Thu, 5th Aug 2004.
+Bianized by:
-The source for this package can be downloaded from
- http://www.lcdf.org/~eddietwo/xwrits/
+ Jay Kominek on Wed, 10 Jun 1998.
+ The maintenance was taken over by Hugo Haas on Thu, 6 Jul 2000.
+ The maintenance was taken over by Helen Faulkner on Thu, 5th Aug 2004.
-Upstream Author: Eddie Kohler <koh...@icir.org>.
+It was downloaded from:
+
+ http://www.lcdf.org/~eddietwo/xwrits
+
+Upstream Author:
+
+ Eddie Kohler <koh...@icir.org>.
Copyright:
- Source and pictures copyright 1994-2001 Eddie Kohler:
- koh...@icir.org and http://www.icir.org/kohler/
+ Source and pictures copyright 1994-2001 Eddie Kohler:
+ koh...@icir.org and http://www.icir.org/kohler/
- This package is distributed under the GNU General Public License, Version
- 2, or, at your discretion, any later version. The GNU General Public License
- is available via the Web at <http://www.gnu.org/copyleft/gpl.html>. The GPL
- is designed to allow you to alter and redistribute the package, as long as
- you do not deny that freedom to others.
+ This package is distributed under the GNU General Public License, Version
+ 2, or, at your discretion, any later version. The GNU General Public
License
+ is available via the Web at <http://www.gnu.org/copyleft/gpl.html>. The GPL
+ is designed to allow you to alter and redistribute the package, as long as
+ you do not deny that freedom to others.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in "/usr/share/common-licenses/GPL-2".
diff -Nru xwrits-2.21/debian/patches/debian-changes-2.21-6.1
xwrits-2.21/debian/patches/debian-changes-2.21-6.1
--- xwrits-2.21/debian/patches/debian-changes-2.21-6.1 1969-12-31
16:00:00.000000000 -0800
+++ xwrits-2.21/debian/patches/debian-changes-2.21-6.1 2010-05-16
22:06:04.000000000 -0700
@@ -0,0 +1,101 @@
+Description: Upstream changes introduced in version 2.21-6.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ xwrits (2.21-6.1) unstable; urgency=low
+ .
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Move to packaging format "3.0 (quilt)".
+ * debian/clean
+ - Mew file.
+ * debian/compat
+ - New file.
+ * debian/control
+ - (Build-Depends): update obsolete xutils to xutils-dev.
+ (important; Closes: #515424). Remove *-1 version suffix
+ from texinfo dependency. Update to debhelper 7.1.
+ - (Depends): add ${misc:Depends}.
+ - (Homepage): New field.
+ - (Standards-Version): update to 3.8.4.
+ * debian/copyright
+ - Update layout and point to GPL-2.
+ * debian/rules
+ - Delete EOL whitespaces.
+ - (DH_COMPAT): Remove.
+ - (install): Update dh_clean to dh_prep.
+ - (clean): Fix lintian debian-rules-ignores-make-clean-error.
+ * debian/source/format
+ - New file.
+ * debian/watch
+ - New file.
+ * xwrits.1
+ - Fix hyphens.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Jari Aalto <jari.aa...@cante.net>
+Bug-Debian: http://bugs.debian.org/515424
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- xwrits-2.21.orig/schedule.c
++++ xwrits-2.21/schedule.c
+@@ -273,6 +273,7 @@ loopmaster(Alarmloopfunc alarm_looper, X
+ || root_y < ports[i]->last_mouse_y - mouse_sensitivity
+ || root_y > ports[i]->last_mouse_y + mouse_sensitivity) {
+ XEvent event;
++ memset(&event, 0, sizeof(event));
+ event.type = MotionNotify; /* skeletal MotionNotify event */
+ if (x_looper && ports[i]->last_mouse_root)
+ ret_val = x_looper(&event, &now);
+--- xwrits-2.21.orig/xwrits.1
++++ xwrits-2.21/xwrits.1
+@@ -68,7 +68,7 @@ for 10 minutes.
+ Any options preceding an \fBafter\fP option also apply following it, unless
+ you explicitly cancel them. For example:
+ .nf
+- xwrits +finger after=10 -finger
++ xwrits +finger after=10 \-finger
+ .fi
+ .PP
+ Multiple \fBafter\fP options create a series of escalations. \fIDelay\fP
+@@ -308,7 +308,7 @@ Here is the way I run xwrits:
+ .fi
+ This looks pretty spectacular:
+ .nf
+- xwrits t=0 b=:2 f fla=:.5 m=:.31 max=100 -i
++ xwrits t=0 b=:2 f fla=:.5 m=:.31 max=100 \-i
+ .fi
+ Whee!!
+ '
+--- xwrits-2.21.orig/rest.c
++++ xwrits-2.21/rest.c
+@@ -12,9 +12,17 @@ static int
+ wait_x_loop(XEvent *e, const struct timeval *now)
+ {
+ struct timeval diff;
++
++
++ // patch to get xwrits to ignore all synthetic events, provided by
++ // Roderick Schertler, 2005
++ if(e->xany.send_event)
++ return 0; //whatever tran_rest means it ignores the event
+
+ if (e->type == KeyPress || e->type == MotionNotify
+ || e->type == ButtonPress) {
++
++
+ xwSUBTIME(diff, *now, last_key_time);
+ last_key_time = *now;
+
diff -Nru xwrits-2.21/debian/patches/series xwrits-2.21/debian/patches/series
--- xwrits-2.21/debian/patches/series 1969-12-31 16:00:00.000000000 -0800
+++ xwrits-2.21/debian/patches/series 2010-05-04 11:35:10.000000000 -0700
@@ -0,0 +1 @@
+debian-changes-2.21-6.1
diff -Nru xwrits-2.21/debian/rules xwrits-2.21/debian/rules
--- xwrits-2.21/debian/rules 2010-05-16 22:08:45.000000000 -0700
+++ xwrits-2.21/debian/rules 2010-05-04 11:32:14.000000000 -0700
@@ -1,13 +1,8 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
@@ -29,14 +24,14 @@
rm -f build-stamp
# Commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) prefix=`pwd`/debian/xwrits/usr
mandir=`pwd`/debian/xwrits/usr/share/man install
@@ -48,7 +43,7 @@
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
- dh_testroot
+ dh_testroot
dh_installdocs README GESTURES
dh_installchangelogs NEWS
dh_link
diff -Nru xwrits-2.21/debian/source/format xwrits-2.21/debian/source/format
--- xwrits-2.21/debian/source/format 1969-12-31 16:00:00.000000000 -0800
+++ xwrits-2.21/debian/source/format 2010-05-04 11:32:45.000000000 -0700
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru xwrits-2.21/debian/watch xwrits-2.21/debian/watch
--- xwrits-2.21/debian/watch 1969-12-31 16:00:00.000000000 -0800
+++ xwrits-2.21/debian/watch 2010-05-04 11:39:19.000000000 -0700
@@ -0,0 +1,2 @@
+version=3
+ http://www.lcdf.org/~eddietwo/xwrits/ .*xwrits-([\d.]+).*\.tar\.gz
diff -Nru xwrits-2.21/rest.c xwrits-2.21/rest.c
--- xwrits-2.21/rest.c 2010-05-16 22:08:45.000000000 -0700
+++ xwrits-2.21/rest.c 2002-05-06 17:31:11.000000000 -0700
@@ -12,17 +12,9 @@
wait_x_loop(XEvent *e, const struct timeval *now)
{
struct timeval diff;
-
-
- // patch to get xwrits to ignore all synthetic events, provided by
- // Roderick Schertler, 2005
- if(e->xany.send_event)
- return 0; //whatever tran_rest means it ignores the event
if (e->type == KeyPress || e->type == MotionNotify
|| e->type == ButtonPress) {
-
-
xwSUBTIME(diff, *now, last_key_time);
last_key_time = *now;
diff -Nru xwrits-2.21/schedule.c xwrits-2.21/schedule.c
--- xwrits-2.21/schedule.c 2010-05-16 22:08:45.000000000 -0700
+++ xwrits-2.21/schedule.c 2002-05-06 16:30:57.000000000 -0700
@@ -273,7 +273,6 @@
|| root_y < ports[i]->last_mouse_y - mouse_sensitivity
|| root_y > ports[i]->last_mouse_y + mouse_sensitivity) {
XEvent event;
- memset(&event, 0, sizeof(event));
event.type = MotionNotify; /* skeletal MotionNotify event */
if (x_looper && ports[i]->last_mouse_root)
ret_val = x_looper(&event, &now);
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
