tags 579037 + patch
tags 579037 + pending
thanks

Dear maintainer,

I've prepared an NMU for xwpe (versioned as 1.5.30a-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru xwpe-1.5.30a/debian/README.Debian xwpe-1.5.30a/debian/README.Debian
--- xwpe-1.5.30a/debian/README.Debian   2010-05-10 21:59:25.000000000 -0700
+++ xwpe-1.5.30a/debian/README.Debian   2010-05-05 15:09:13.000000000 -0700
@@ -1,7 +1,7 @@
 Xwpe Package for Debian
 =======================
 
-The xwpe is in maintainance mode, and has not big updates
+The xwpe is in maintenance mode, and has not big updates
 since ages. It has a few known bugs too. Use it at your own risk.
 I would suggest you to use wpe only under a standard tty and
 xwpe under X. The pure ncurses version has a few issues under
diff -Nru xwpe-1.5.30a/debian/changelog xwpe-1.5.30a/debian/changelog
--- xwpe-1.5.30a/debian/changelog       2010-05-10 21:59:25.000000000 -0700
+++ xwpe-1.5.30a/debian/changelog       2010-05-08 17:13:20.000000000 -0700
@@ -1,3 +1,32 @@
+xwpe (1.5.30a-2.1) unstable; urgency=low
+
+  [ Jari Aalto ]
+  * Non-maintainer upload.
+    - Update to packaging format "3.0 (quilt)".
+  * debian/compat
+    - Update to 7.
+  * debian/control
+    - (Build-Depends): update obsolete x-dev t o x11proto-core-dev.
+      (important; Closes: #579037).
+      Update to debhelper 7.1. Remove dpatch.
+    - (Homepage): Add new field.
+    - (Standards-Version): Update to 3.8.4.
+  * debian/copyright
+    - Point to GPL-2.
+  * debian/menu
+    - Add missing double quotes to values.
+    - Update obsolete "Apps/" to "Applications/".
+  * debian/README.Debian
+    - Fix spelling.
+  * debian/rules
+    - Remoeve dpatch; obsoleted by new packaging format.
+  * debian/source/format
+    - New file.
+  * debian/watch
+     - New file.
+
+ -- Jari Aalto <[email protected]>  Sun, 09 May 2010 02:49:50 +0300
+
 xwpe (1.5.30a-2) unstable; urgency=high
 
   * Forcing NCURSES definition due to a configuration bug which rendered the
@@ -216,7 +245,3 @@
   * New upstream release
 
  -- Igor Grobman <[email protected]>  Sat, 11 Jan 1997 10:47:57 -0500
-
-Local variables:
-mode: debian-changelog
-End:
diff -Nru xwpe-1.5.30a/debian/compat xwpe-1.5.30a/debian/compat
--- xwpe-1.5.30a/debian/compat  2010-05-10 21:59:25.000000000 -0700
+++ xwpe-1.5.30a/debian/compat  2010-05-05 15:02:46.000000000 -0700
@@ -1 +1 @@
-5
+7
diff -Nru xwpe-1.5.30a/debian/control xwpe-1.5.30a/debian/control
--- xwpe-1.5.30a/debian/control 2010-05-10 21:59:25.000000000 -0700
+++ xwpe-1.5.30a/debian/control 2010-05-08 16:51:11.000000000 -0700
@@ -2,8 +2,9 @@
 Section: editors
 Priority: optional
 Maintainer: Francesco Paolo Lovergine <[email protected]>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>=5.0.0), libgpmg1-dev [!kfreebsd-i386 
!kfreebsd-amd64 !hurd-i386], libncurses5-dev | libncurses-dev, libx11-dev, 
x-dev, zlib1g-dev | libz-dev, dpatch
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.1), libgpmg1-dev [!kfreebsd-i386 
!kfreebsd-amd64 !hurd-i386], libncurses5-dev | libncurses-dev, libx11-dev, 
x11proto-core-dev, zlib1g-dev | libz-dev
+Homepage: http://www.identicalsoftware.com/xwpe
 
 Package: xwpe
 Architecture: any
@@ -24,4 +25,4 @@
  .
  Although it is designed to be a tool for programmers (when invoked as
  wpe or xwpe), it can also be used as an easy to learn text editor
- (when invoked as we or xwe).
+ (when invoked as program 'we' or 'xwe').
diff -Nru xwpe-1.5.30a/debian/copyright xwpe-1.5.30a/debian/copyright
--- xwpe-1.5.30a/debian/copyright       2010-05-10 21:59:25.000000000 -0700
+++ xwpe-1.5.30a/debian/copyright       2010-05-05 15:01:59.000000000 -0700
@@ -12,4 +12,4 @@
  damages resulting from the use of xwpe.
 
 On Debian systems the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
+can be found in "/usr/share/common-licenses/GPL-2".
diff -Nru xwpe-1.5.30a/debian/menu xwpe-1.5.30a/debian/menu
--- xwpe-1.5.30a/debian/menu    2010-05-10 21:59:25.000000000 -0700
+++ xwpe-1.5.30a/debian/menu    2010-05-05 15:11:36.000000000 -0700
@@ -1,5 +1,5 @@
-?package(xwpe):needs=X11 section=Apps/Editors \
+?package(xwpe):needs="X11" section="Applications/Editors" \
   title="xwpe" command="/usr/bin/xwpe"
 
-?package(xwpe):needs=text section=Apps/Editors \
+?package(xwpe):needs="text" section="Applications/Editors" \
   title="wpe" command="/usr/bin/wpe"
diff -Nru xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes.dpatch 
xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes.dpatch
--- xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes.dpatch      
1969-12-31 16:00:00.000000000 -0800
+++ xwpe-1.5.30a/debian/patches/10-xwpe.1_eng-manpage-fixes.dpatch      
2010-05-08 17:10:48.000000000 -0700
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## /tmp/xwpe.1_eng-manpage-fixes.patch.dpatch by Jari Aalto 
<[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: 
+## DP: Author: Jari Aalto <[email protected]>
+## DP: 
+## DP: 
+## DP:     xwpe.1_eng: hyphen fixes etc.
+
+...@dpatch@
+
+diff --git a/xwpe.1_eng b/xwpe.1_eng
+index b8551b8..4520c8e 100644
+--- a/xwpe.1_eng
++++ b/xwpe.1_eng
+@@ -14,7 +14,7 @@
+ .if t .sp .5
+ ..
+ .ta .3i .6i .9i 1.2i 1.5i 1.8i
+-.TH xwpe alpha "May 3, 1999"
++.TH xwpe 1 "May 3, 1999"
+ .UC
+ .SH NAME
+ xwpe, xwe, wpe, we \- X-Window Programming Environment
+@@ -82,7 +82,7 @@ The next file is a message-file.
+ Start \fIxwpe\fP in the \fIrecover mode\fP. The internal buffers
+ are saved in files with the postfix `.ESV' in the name
+ if a signal is caught by \fIxwpe\fP (except for SIGKILL).
+-If the editor is invoked with the `-r' option is
++If the editor is invoked with the `\-r' option is
+ specified in the command line, the old session will be
+ recovered.
+ 
+@@ -181,8 +181,8 @@ definition.
+ "string:  Characters used for comments depending on the
+           column."
+ "string:  Special single characters."
+-"integer: Column for comments (-1 for none)."
+-"integer: Column for continuing line (-1 for none)"
++"integer: Column for comments (\-1 for none)."
++"integer: Column for continuing line (\-1 for none)"
+ "Integer: Column for comment till the end of line (1000
+           for none)"
+ .EE
+@@ -217,7 +217,7 @@ An example:
+  struct switch typedef union unsigned void volatile
+  while
+  0
+- ~^()[]{}<>+-/*%=|&!.?:,; /* */ NULL NULL "'#\\  -1 -1 1000
++ ~^()[]{}<>+\-/*%=|&!.?:,; /* */ NULL NULL "'#\\  \-1 \-1 1000
+ 
+  .f
+  64
+@@ -257,7 +257,7 @@ would be greatly appreciated.
+ 
+ Documentation hasn't been updated.
+ 
+-Compilers are assumed to have a -c and -o option.  This causes problems
++Compilers are assumed to have a \-c and \-o option.  This causes problems
+ for those who wish to use java, perl, or other languages.
+ 
+ \fBmake install\fP installs x versions even if not compiled in.
diff -Nru xwpe-1.5.30a/debian/patches/debian-changes-1.5.30a-2.1 
xwpe-1.5.30a/debian/patches/debian-changes-1.5.30a-2.1
--- xwpe-1.5.30a/debian/patches/debian-changes-1.5.30a-2.1      1969-12-31 
16:00:00.000000000 -0800
+++ xwpe-1.5.30a/debian/patches/debian-changes-1.5.30a-2.1      2010-05-10 
21:56:33.000000000 -0700
@@ -0,0 +1,59 @@
+Description: Upstream changes introduced in version 1.5.30a-2.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:
+ .
+ xwpe (1.5.30a-2.1) unstable; urgency=low
+ .
+   [ Jari Aalto ]
+   * Non-maintainer upload.
+     - Update to packaging format "3.0 (quilt)".
+   * debian/compat
+     - Update to 7.
+   * debian/control
+     - (Build-Depends): update obsolete x-dev t o x11proto-core-dev.
+       (important; Closes: #579037).
+       Update to debhelper 7.1. Remove dpatch.
+     - (Homepage): Add new field.
+     - (Standards-Version): Update to 3.8.4.
+   * debian/copyright
+     - Point to GPL-2.
+   * debian/menu
+     - Add missing double quotes to values.
+     - Update obsolete "Apps/" to "Applications/".
+   * debian/README.Debian
+     - Fix spelling.
+   * debian/rules
+     - Remoeve dpatch; obsoleted by new packaging format.
+   * debian/source/format
+     - New file.
+   * debian/watch
+      - New file.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Jari Aalto <[email protected]>
+Bug-Debian: http://bugs.debian.org/579037
+
+---
+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>
+
+--- xwpe-1.5.30a.orig/we_wind.c
++++ xwpe-1.5.30a/we_wind.c
+@@ -1372,7 +1372,7 @@ int e_schr_lst_wsv(char *str, int xa, in
+                               && e_mouse.x <= xa+n-1) ret = CDO;
+ #endif
+       if (ret == CDO && e_sv_window(xa+n, ya, &num, *df, f) == WPE_CR)
+-          strcpy(str, (*df)->name[num]);
++          (strcpy)(str, (*df)->name[num]);
+    }  while(ret == CDO);
+    return(ret);
+ }
diff -Nru xwpe-1.5.30a/debian/patches/series xwpe-1.5.30a/debian/patches/series
--- xwpe-1.5.30a/debian/patches/series  1969-12-31 16:00:00.000000000 -0800
+++ xwpe-1.5.30a/debian/patches/series  2010-05-08 17:13:24.000000000 -0700
@@ -0,0 +1,3 @@
+10-xwpe.1_eng-manpage-fixes.dpatch
+tparm_proto.dpatch
+debian-changes-1.5.30a-2.1
diff -Nru xwpe-1.5.30a/debian/rules xwpe-1.5.30a/debian/rules
--- xwpe-1.5.30a/debian/rules   2010-05-10 21:59:25.000000000 -0700
+++ xwpe-1.5.30a/debian/rules   2010-05-08 16:50:27.000000000 -0700
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -11,10 +8,8 @@
   CFLAGS += -g
 endif
 
-include /usr/share/dpatch/dpatch.make
-
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
        dh_testdir
 
        PRNTCMD=lpr ./configure --prefix=/usr \
@@ -26,7 +21,7 @@
 
        touch build-stamp
 
-clean: myclean unpatch
+clean: myclean
 myclean:
        dh_testdir
        dh_testroot
@@ -65,4 +60,4 @@
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary patch unpatch myclean
+.PHONY: build clean binary-indep binary-arch binary myclean
diff -Nru xwpe-1.5.30a/debian/source/format xwpe-1.5.30a/debian/source/format
--- xwpe-1.5.30a/debian/source/format   1969-12-31 16:00:00.000000000 -0800
+++ xwpe-1.5.30a/debian/source/format   2010-05-08 17:13:01.000000000 -0700
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru xwpe-1.5.30a/debian/watch xwpe-1.5.30a/debian/watch
--- xwpe-1.5.30a/debian/watch   1969-12-31 16:00:00.000000000 -0800
+++ xwpe-1.5.30a/debian/watch   2010-05-05 15:06:32.000000000 -0700
@@ -0,0 +1,4 @@
+version=3
+http://www.identicalsoftware.com/xwpe/index.html .*xwpe-([\d.]+.*)\.tar\.gz
+
+
diff -Nru xwpe-1.5.30a/we_wind.c xwpe-1.5.30a/we_wind.c
--- xwpe-1.5.30a/we_wind.c      2010-05-10 21:59:25.000000000 -0700
+++ xwpe-1.5.30a/we_wind.c      2005-07-06 18:53:09.000000000 -0700
@@ -1372,7 +1372,7 @@
                                && e_mouse.x <= xa+n-1) ret = CDO;
 #endif
       if (ret == CDO && e_sv_window(xa+n, ya, &num, *df, f) == WPE_CR)
-          (strcpy)(str, (*df)->name[num]);
+          strcpy(str, (*df)->name[num]);
    }  while(ret == CDO);
    return(ret);
 }



-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to