debian/changelog | 9 ++++
debian/patches/02_xedit_manpage_typos.diff | 22 ------------
debian/patches/03_xconsole_implicit_pointer_conversion.diff | 16 --------
debian/patches/series | 2 -
4 files changed, 9 insertions(+), 40 deletions(-)
New commits:
commit b49591c90eda046644f1626b1231de288d508b49
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Nov 2 23:07:07 2010 +0100
02_xedit_manpage_typos.diff was applied upstream in 1.2.0, drop it from the
source package
It wasn't getting applied anyway.
diff --git a/debian/changelog b/debian/changelog
index 8e28fc4..be02079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ x11-apps (7.6+2) UNRELEASED; urgency=low
* Drop 03_xconsole_implicit_pointer_conversion.diff, doesn't seem needed
anymore.
+ * 02_xedit_manpage_typos.diff was applied upstream in 1.2.0, drop it from
+ the source package (it wasn't getting applied anyway).
-- Julien Cristau <jcris...@debian.org> Tue, 02 Nov 2010 23:03:01 +0100
diff --git a/debian/patches/02_xedit_manpage_typos.diff
b/debian/patches/02_xedit_manpage_typos.diff
deleted file mode 100644
index f20b400..0000000
--- a/debian/patches/02_xedit_manpage_typos.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xbase-clients/xedit/xedit.man
-===================================================================
---- xbase-clients.orig/xedit/xedit.man 2006-02-18 14:56:14.000000000 -0500
-+++ xbase-clients/xedit/xedit.man 2006-02-26 20:37:32.000000000 -0500
-@@ -291,7 +291,7 @@
- .B autoReplace (\fPClass \fBReplace)
- This resource is useful to automatically correct common misspelling errors,
but
- can also be used to create simple macros. The format is
--\fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines.
-+\fI{non-blanks}{blanks}[{string}]\fP. Fields are separated by newlines.
- Example of use:
- \"
- .br
-@@ -308,7 +308,7 @@
- when you type that words.
- .TP 8
- .B ispell.dictionaries (\fPClass \fBispell.Dictionary)
--Specifies a list of dictionary names, separeted by spaces, available to the
-+Specifies a list of dictionary names, separated by spaces, available to the
- ispell program. The default value is \fI"american americamed+ english"\fP.
- .TP 8
- .B ispell.dictionary (\fPClass \fBispell.Dictionary)
diff --git a/debian/patches/series b/debian/patches/series
index 8f17f23..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-#02_xedit_manpage_typos.diff
commit 9ad8c623e6a34ccac4fb107e795c44327efebb60
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Nov 2 23:03:42 2010 +0100
Drop 03_xconsole_implicit_pointer_conversion.diff, doesn't seem needed
anymore.
diff --git a/debian/changelog b/debian/changelog
index b655189..8e28fc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-apps (7.6+2) UNRELEASED; urgency=low
+
+ * Drop 03_xconsole_implicit_pointer_conversion.diff, doesn't seem needed
+ anymore.
+
+ -- Julien Cristau <jcris...@debian.org> Tue, 02 Nov 2010 23:03:01 +0100
+
x11-apps (7.6+1) experimental; urgency=low
[ Robert Hooker ]
diff --git a/debian/patches/03_xconsole_implicit_pointer_conversion.diff
b/debian/patches/03_xconsole_implicit_pointer_conversion.diff
deleted file mode 100644
index 2cc8903..0000000
--- a/debian/patches/03_xconsole_implicit_pointer_conversion.diff
+++ /dev/null
@@ -1,16 +0,0 @@
----
- xconsole/xconsole.c | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: x11-apps/xconsole/xconsole.c
-===================================================================
---- x11-apps.orig/xconsole/xconsole.c 2009-07-27 18:42:39.000000000 +0200
-+++ x11-apps/xconsole/xconsole.c 2009-12-06 11:57:56.000000000 +0100
-@@ -32,6 +32,7 @@
- #include "config.h"
- #endif
-
-+#define _XOPEN_SOURCE
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Xatom.h>
diff --git a/debian/patches/series b/debian/patches/series
index a7acd68..8f17f23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
#02_xedit_manpage_typos.diff
-03_xconsole_implicit_pointer_conversion.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pdp0t-0005rr...@alioth.debian.org
