debian/changelog | 15
++++++----
debian/control | 2 +
debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff | 14
---------
3 files changed, 11 insertions(+), 20 deletions(-)
New commits:
commit 3be41dc20911903b023819d9bb233e04b623a1fd
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Tue May 22 12:29:36 2007 +0300
Conflict with the ubuntu packages to force removal on upgrade.
diff --git a/debian/changelog b/debian/changelog
index d50c47f..1fb81bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,7 @@ x11-utils (1) UNRELEASED; urgency=low
- Modify description.
- Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
to make upgrades smoother.
- - Replaces: <all the included packages> to work around old Ubuntu
+ - C/R: <all the included packages> to work around old Ubuntu
packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*luit missing*
@@ -41,7 +41,7 @@ x11-utils (1) UNRELEASED; urgency=low
- Edit 04_xlsfonts_do_not_spew_usage_on_connection_error.diff
to not try patch xwd.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 22 May 2007 10:44:14 +0300
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 22 May 2007 12:29:01 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1832cf4..0bdd236 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,8 @@ Package: x11-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0)
+Conflicts: appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev,
xfd, xfontsel,
+ xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo
Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd,
xfontsel,
xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo
commit 5cece51681ee05a90fb18ceb89483c27b2a0f032
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Tue May 22 10:45:47 2007 +0300
Edit 04_xlsfonts_do_not_spew_usage_on_connection_error.diff to not try
patch xwd.
diff --git a/debian/changelog b/debian/changelog
index abcfc2e..d50c47f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,11 +34,14 @@ x11-utils (1) UNRELEASED; urgency=low
packaging.
* debian/x11-utils.dirs: Remove.
* debian/local/: Remove.
- * debian/patches: Delete patches which do not relate to this package.
- Also, add a patch for luit from xutils, and rename the patches to
- start from 01.
-
- -- Timo Aaltonen <[EMAIL PROTECTED]> Sat, 19 May 2007 01:21:19 +0300
+ * debian/patches:
+ - Delete patches which do not relate to this package.
+ - Add a patch for luit from xutils, and rename the patches to
+ start from 01.
+ - Edit 04_xlsfonts_do_not_spew_usage_on_connection_error.diff
+ to not try patch xwd.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 22 May 2007 10:44:14 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
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 622fcdd..2e8a872 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
@@ -38,20 +38,6 @@ Index: xprop/dsimple.c
}
return(d);
-Index: xwd/dsimple.c
-===================================================================
---- xwd/dsimple.c.orig 2007-02-11 08:15:57.000000000 +0100
-+++ xwd/dsimple.c 2007-02-11 08:16:10.000000000 +0100
-@@ -188,8 +188,7 @@
- if (d == NULL) {
- fprintf (stderr, "%s: unable to open display '%s'\n",
- program_name, XDisplayName (display_name));
-- usage ();
-- /* doesn't return */
-+ exit(1);
- }
-
- return(d);
Index: xwininfo/dsimple.c
===================================================================
--- xwininfo/dsimple.c.orig 2007-02-11 08:16:29.000000000 +0100
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
