Package: xstroke
Version: 0.5.12
Author: Guillem Jover <guillem@hadrons.org>
Status: applied
Description:
 Non-maintainer upload.
 Added flex to Build-Depends.
  (Closes: #171381). Thanks H. S. Teoh <hsteoh@quickfur.ath.cx>.
 Include keysym.h instead of obsolete keysymdef.h.
  (Closes: #196334). Thanks Matt Kraai <kraai@alumni.cmu.edu>.
 Fix infinite recursion within re_comp().
  (Closes: #181141). Thanks Carl Worth <cworth@east.isi.edu>.
 Added rman to Build-Depends.
 Unified debian/xstroke.docs with debian/docs, removed the former.
 Removed redundant entries in debian/docs.
 Removed debian/conffiles contents so no redundancies are generarted.
 Fixed watch file.
 Fixed xstroke-help:
 - Use sensible-browser to view html help file.
 - Move script to /usr/share/lib/xstroke so there is no need for
   a manpage, and modified etc/alphabets accordingly.
   (Closes: #170467).
 Fixed html help page not rendering correctly on some browsers.
 Fixed command path in menu entry.
 Added a log directory.

diff -Naur xstroke-0.5.12-ma5/action_item.h xstroke-0.5.12-ma5-nmu/action_item.h
--- xstroke-0.5.12-ma5/action_item.h	2001-10-31 20:51:51.000000000 +0100
+++ xstroke-0.5.12-ma5-nmu/action_item.h	2003-10-13 09:14:44.000000000 +0200
@@ -17,8 +17,7 @@
 #define ACTION_ITEM_H
 
 #include <X11/X.h>
-#define XK_MISCELLANY
-#include <X11/keysymdef.h>
+#include <X11/keysym.h>
 #include <X11/Xutil.h>
 
 enum action_type
diff -Naur xstroke-0.5.12-ma5/debian/changelog xstroke-0.5.12-ma5-nmu/debian/changelog
--- xstroke-0.5.12-ma5/debian/changelog	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/changelog	2003-10-13 09:14:44.000000000 +0200
@@ -1,3 +1,28 @@
+xstroke (0.5.12-ma5-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Added flex to Build-Depends.
+    (Closes: #171381). Thanks H. S. Teoh <hsteoh@quickfur.ath.cx>.
+  * Include keysym.h instead of obsolete keysymdef.h.
+    (Closes: #196334). Thanks Matt Kraai <kraai@alumni.cmu.edu>.
+  * Fix infinite recursion within re_comp().
+    (Closes: #181141). Thanks Carl Worth <cworth@east.isi.edu>.
+  * Added rman to Build-Depends.
+  * Unified debian/xstroke.docs with debian/docs, removed the former.
+  * Removed redundant entries in debian/docs.
+  * Removed debian/conffiles contents so no redundancies are generarted.
+  * Fixed watch file.
+  * Fixed xstroke-help:
+    - Use sensible-browser to view html help file.
+    - Move script to /usr/share/lib/xstroke so there is no need for
+      a manpage, and modified etc/alphabets accordingly.
+      (Closes: #170467).
+  * Fixed html help page not rendering correctly on some browsers.
+  * Fixed command path in menu entry.
+  * Added a log directory.
+
+ -- Guillem Jover <guillem@debian.org>  Sun, 12 Oct 2003 23:11:23 +0200
+
 xstroke (0.5.12-ma5-2.1) unstable; urgency=low
 
   * Non-maintainer bugsquash upload
diff -Naur xstroke-0.5.12-ma5/debian/conffiles xstroke-0.5.12-ma5-nmu/debian/conffiles
--- xstroke-0.5.12-ma5/debian/conffiles	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/conffiles	2003-10-13 09:14:44.000000000 +0200
@@ -1,2 +0,0 @@
-/etc/xstroke/alphabet
-/etc/xstroke/alphabet
diff -Naur xstroke-0.5.12-ma5/debian/control xstroke-0.5.12-ma5-nmu/debian/control
--- xstroke-0.5.12-ma5/debian/control	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/control	2003-10-13 09:14:44.000000000 +0200
@@ -2,7 +2,8 @@
 Section: x11
 Priority: optional
 Maintainer: Paul Hedderly <prh@debian.org>
-Build-Depends: debhelper (>> 3.0.0), libncurses5-dev, xutils, xlibs-dev, tetex-bin, bison
+Build-Depends: debhelper (>> 3.0.0), libncurses5-dev, xutils, xlibs-dev,
+ tetex-bin, bison, flex, rman
 Standards-Version: 3.5.2
 
 Package: xstroke
diff -Naur xstroke-0.5.12-ma5/debian/dirs xstroke-0.5.12-ma5-nmu/debian/dirs
--- xstroke-0.5.12-ma5/debian/dirs	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/dirs	2003-10-13 09:14:44.000000000 +0200
@@ -1,4 +1,4 @@
-usr/bin
-usr/sbin
-usr/X11R6/bin
 etc/xstroke
+usr/share/xstroke
+usr/X11R6/bin
+var/log/xstroke
diff -Naur xstroke-0.5.12-ma5/debian/docs xstroke-0.5.12-ma5-nmu/debian/docs
--- xstroke-0.5.12-ma5/debian/docs	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/docs	2003-10-13 09:14:44.000000000 +0200
@@ -1,4 +1,7 @@
 README
 TODO
-README
-TODO
+doc/alphabet_123.png
+doc/alphabet_abc.png
+doc/alphabet_extra.png
+doc/alphabet_punc.png
+doc/xstroke-help.html
diff -Naur xstroke-0.5.12-ma5/debian/menu xstroke-0.5.12-ma5-nmu/debian/menu
--- xstroke-0.5.12-ma5/debian/menu	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/menu	2003-10-13 09:14:44.000000000 +0200
@@ -1,2 +1,2 @@
 ?package(xstroke):needs=X11 section=Apps/Tools\
-  title="xstroke" command="/usr/bin/xstroke"
+  title="xstroke" command="xstroke"
diff -Naur xstroke-0.5.12-ma5/debian/rules xstroke-0.5.12-ma5-nmu/debian/rules
--- xstroke-0.5.12-ma5/debian/rules	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/rules	2003-10-13 09:14:44.000000000 +0200
@@ -59,7 +59,7 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/xstroke
 	mkdir -p $(CURDIR)/debian/xstroke/usr/X11R6/man/man1
 	gzip -c9v xstroke.man > $(CURDIR)/debian/xstroke/usr/X11R6/man/man1/xstroke.1.gz
-	cp doc/xstroke-help $(CURDIR)/debian/xstroke/usr/bin/
+	cp doc/xstroke-help $(CURDIR)/debian/xstroke/usr/share/xstroke/
 
 
 # Build architecture-independent files here.
@@ -82,7 +82,7 @@
 	dh_installcron
 	dh_installman
 	dh_installinfo
-	dh_undocumented xstroke-help.1
+#	dh_undocumented
 	dh_installchangelogs ChangeLog
 	dh_link
 	dh_strip
diff -Naur xstroke-0.5.12-ma5/debian/watch xstroke-0.5.12-ma5-nmu/debian/watch
--- xstroke-0.5.12-ma5/debian/watch	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/watch	2003-10-13 09:14:44.000000000 +0200
@@ -3,4 +3,4 @@
 # to check for upstream updates and more.
 # Site		Directory		Pattern			Version	Script
 version=2
-sunsite.unc.edu	/pub/Linux/Incoming	xstroke-0-cvs-(.*)\.tar\.gz	debian	uupdate
+ftp://ftp.handhelds.org/pub/projects/xstroke/release-0.5 xstroke-0.5.(.*)\.tar\.gz	debian	uupdate
diff -Naur xstroke-0.5.12-ma5/debian/xstroke.docs xstroke-0.5.12-ma5-nmu/debian/xstroke.docs
--- xstroke-0.5.12-ma5/debian/xstroke.docs	2003-10-13 09:15:04.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/debian/xstroke.docs	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-doc/alphabet_123.png
-doc/alphabet_abc.png
-doc/alphabet_extra.png
-doc/alphabet_punc.png
-doc/xstroke-help.html
diff -Naur xstroke-0.5.12-ma5/doc/xstroke-help xstroke-0.5.12-ma5-nmu/doc/xstroke-help
--- xstroke-0.5.12-ma5/doc/xstroke-help	2001-09-27 16:10:11.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/doc/xstroke-help	2003-10-13 09:14:44.000000000 +0200
@@ -1,2 +1,2 @@
 #!/bin/sh
-dillo file:/usr/share/doc/xstroke/xstroke-help.html
+sensible-browser file:/usr/share/doc/xstroke/xstroke-help.html
diff -Naur xstroke-0.5.12-ma5/doc/xstroke-help.html xstroke-0.5.12-ma5-nmu/doc/xstroke-help.html
--- xstroke-0.5.12-ma5/doc/xstroke-help.html	2001-09-27 16:10:11.000000000 +0200
+++ xstroke-0.5.12-ma5-nmu/doc/xstroke-help.html	2003-10-13 09:14:44.000000000 +0200
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <title>xstroke helptitle>
+    <title>xstroke help</title>
   </head>
 
   <body>
diff -Naur xstroke-0.5.12-ma5/etc/alphabet xstroke-0.5.12-ma5-nmu/etc/alphabet
--- xstroke-0.5.12-ma5/etc/alphabet	2001-12-10 18:01:19.000000000 +0100
+++ xstroke-0.5.12-ma5-nmu/etc/alphabet	2003-10-13 09:14:44.000000000 +0200
@@ -158,7 +158,7 @@
   }
 
   # Full-screen bottom-to-top gives help
-  Exec "xstroke-help" = {
+  Exec "/usr/share/xstroke/xstroke-help" = {
 	grid("852")
 	anchor("852")
   }
@@ -196,7 +196,7 @@
 # Return needs some strengthening in terms of precedence
 Key Return = grid("3[26]?5[48]?7?")
 
-Exec "xstroke-help" = {
+Exec "/usr/share/xstroke/xstroke-help" = {
 	grid("(9[68]?5[24]?1?[24]?5[68]?9?|9?[68]?5[24]?1?[24]?5[68]?9)")
 	doc("95[15]1[15]59")
 }
@@ -565,7 +565,7 @@
 }
 # standard 5
 Key 5 = {
-	grid("6?3?[25]?5?[14]*[25]*[69]*+[58]*87?4?")
+	grid("6?3?[25]?5?[14]*[25]*[69]+[58]*87?4?")
 	doc("325698")
 	doc("255698")
 }
diff -Naur xstroke-0.5.12-ma5/etc/alphabet.dir xstroke-0.5.12-ma5-nmu/etc/alphabet.dir
--- xstroke-0.5.12-ma5/etc/alphabet.dir	2002-02-02 18:52:41.000000000 +0100
+++ xstroke-0.5.12-ma5-nmu/etc/alphabet.dir	2003-10-13 09:14:44.000000000 +0200
@@ -162,7 +162,7 @@
   }
 
   # Full-screen bottom-to-top gives help
-  Exec "xstroke-help" = {
+  Exec "/usr/share/xstroke/xstroke-help" = {
 	dir("`l")
 	anchor("852")
   }
@@ -197,7 +197,7 @@
 	     "punctuation_in_letter_mode",
 	     "no_capitals_in_lowercase_mode"
 {
-Exec "xstroke-help" = {
+Exec "/usr/share/xstroke/xstroke-help" = {
 	dir("`l")
 	doc("95[15]1[15]59")
 }
@@ -538,7 +538,7 @@
 #}
 ## standard 5
 #Key 5 = {
-#	grid("6?3?[25]?5?[14]*[25]*[69]*+[58]*87?4?")
+#	grid("6?3?[25]?5?[14]*[25]*[69]+[58]*87?4?")
 #	doc("325698")
 #	doc("255698")
 #}
@@ -1174,4 +1174,4 @@
 #
 #### NEWPAGE
 #}
-#
\ No newline at end of file
+#
