x11-utils: Changes to 'debian-unstable'
debian/changelog | 6 +-
debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff | 24 ++++++----
debian/patches/series | 2
3 files changed, 20 insertions(+), 12 deletions(-)
New commits:
commit 2411abcafc4cf21aff1d4e9b048fac5d0fec433c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 16 00:38:50 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 22ec365..b8e3b4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-utils (7.4+1) UNRELEASED; urgency=low
+x11-utils (7.4+1) unstable; urgency=low
[ Brice Goglin ]
* xwininfo 1.0.4.
@@ -9,7 +9,7 @@ x11-utils (7.4+1) UNRELEASED; urgency=low
* Make patch 04_xlsfonts_do_not_spew_usage_on_connection_error.diff apply
with -p1. Update its upstream status.
- -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 20:43:07 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 16 Feb 2009 00:35:40 +0100
x11-utils (7.3+2+nmu1) unstable; urgency=low
commit a2df0f1c8aefda062fe814bd0f12b30c35b8c824
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 16 00:38:36 2009 +0100
Make patch 04_xlsfonts_do_not_spew_usage_on_connection_error.diff apply with -p1
Also update its upstream status.
diff --git a/debian/changelog b/debian/changelog
index f5f3571..22ec365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ x11-utils (7.4+1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building
the apps in parallel. Install is still sequential, at least for now.
+ * Make patch 04_xlsfonts_do_not_spew_usage_on_connection_error.diff apply
+ with -p1. Update its upstream status.
-- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 20:43:07 +0200
diff --git a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
index e917678..b931b98 100644
--- a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
+++ b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
@@ -8,10 +8,12 @@ The user should only be shown a usage messages when:
* it is asked for with a --help option or the like.
* the command line is syntactically invalid.
-Not submitted upstream to XFree86 or X.Org.
+Applied in X.Org git.
---- xlsfonts/dsimple.c.orig
-+++ xlsfonts/dsimple.c
+Index: x11-utils/xlsfonts/dsimple.c
+===================================================================
+--- x11-utils.orig/xlsfonts/dsimple.c
++++ x11-utils/xlsfonts/dsimple.c
@@ -188,8 +188,7 @@
if (d == NULL) {
fprintf (stderr, "%s: unable to open display '%s'\n",
@@ -22,9 +24,11 @@ Not submitted upstream to XFree86 or X.Org.
}
return(d);
---- xprop/dsimple.c.orig
-+++ xprop/dsimple.c
-@@ -122,8 +122,7 @@
+Index: x11-utils/xprop/dsimple.c
+===================================================================
+--- x11-utils.orig/xprop/dsimple.c
++++ x11-utils/xprop/dsimple.c
+@@ -123,8 +123,7 @@
if (d == NULL) {
fprintf (stderr, "%s: unable to open display '%s'\n",
program_name, XDisplayName (display_name));
@@ -34,9 +38,11 @@ Not submitted upstream to XFree86 or X.Org.
}
return(d);
---- xwininfo/dsimple.c.orig
-+++ xwininfo/dsimple.c
-@@ -109,8 +109,7 @@
+Index: x11-utils/xwininfo/dsimple.c
+===================================================================
+--- x11-utils.orig/xwininfo/dsimple.c
++++ x11-utils/xwininfo/dsimple.c
+@@ -110,8 +110,7 @@
if (d == NULL) {
fprintf (stderr, "%s: unable to open display '%s'\n",
program_name, XDisplayName (display_name));
diff --git a/debian/patches/series b/debian/patches/series
index 24a51a9..8f2d3a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
02_xev_flush_standard_output.diff
-04_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0
+04_xlsfonts_do_not_spew_usage_on_connection_error.diff
05_xprop_spy_exit_on_destroy.diff
Reply to: