debian/changelog | 10 +- debian/control | 3 debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff | 42 ---------- 3 files changed, 10 insertions(+), 45 deletions(-)
New commits: commit 9deb38f9cf5b986a1ebcde8c708a5b9ec021723f Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Tue May 22 12:28:13 2007 +0300 Conflict with the ubuntu packages to force removal on upgrade. diff --git a/debian/changelog b/debian/changelog index 9464f9e..46d1e65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,7 @@ x11-apps (1) UNRELEASED; urgency=low - Split the Build-Dep line into multiple lines - Clean up the description. - Replaces: xbase-clients (<= 1:7.2.ds2-3) 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 affect this package. * debian/x11-apps.dirs: Remove. @@ -37,7 +37,7 @@ x11-apps (1) UNRELEASED; urgency=low - Edit 01_xwd_do_not_spew_usage_on_connection_error.diff to patch only xwd. - -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 22 May 2007 10:25:20 +0300 + -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 22 May 2007 12:27:16 +0300 xbase-clients (1:7.2.ds2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 87fb751..5c0404a 100644 --- a/debian/control +++ b/debian/control @@ -37,6 +37,9 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, cpp Pre-Depends: x11-common (>= 1:7.0.0) Suggests: mesa-utils +Conflicts: oclock, x11perf, xbiff, xcalc, xclipboard, + xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, xman, + xmore, xwd, xwud Replaces: xbase-clients (<= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, xman, xmore, xwd, xwud commit 12f2f69d85364d568f7e76bbe4a9abe22d75da7b Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Tue May 22 10:33:16 2007 +0300 Edit 01_xwd_do_not_spew_usage_on_connection_error.diff to patch only xwd. Fix the changelog too. diff --git a/debian/changelog b/debian/changelog index bf93220..9464f9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,14 +26,18 @@ x11-apps (1) UNRELEASED; urgency=low - Split the Build-Dep line into multiple lines - Clean up the description. - Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother. - - Replaces: <all the included packages> to work around old Ubuntu packaging. + - Replaces: <all the included packages> to work around old Ubuntu + packaging. * debian/copyright: Leave only copyright notices that affect this package. * debian/x11-apps.dirs: Remove. * debian/x11-apps.install, rules: Edit to reflect new packaging. * debian/local/: Remove. - * debian/patches: Delete patches which do not concern this package. + * debian/patches: + - Delete patches which do not concern this package. + - Edit 01_xwd_do_not_spew_usage_on_connection_error.diff to patch only + xwd. - -- Timo Aaltonen <[EMAIL PROTECTED]> Sat, 19 May 2007 00:57:31 +0300 + -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 22 May 2007 10:25:20 +0300 xbase-clients (1:7.2.ds2-3) unstable; urgency=low diff --git a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff index 622fcdd..f67abc4 100644 --- a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff +++ b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff @@ -10,34 +10,6 @@ The user should only be shown a usage messages when: Not submitted upstream to XFree86 or X.Org. -Index: xlsfonts/dsimple.c -=================================================================== ---- xlsfonts/dsimple.c.orig 2006-07-11 04:53:33.000000000 +0200 -+++ xlsfonts/dsimple.c 2007-02-11 08:14:45.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: xprop/dsimple.c -=================================================================== ---- xprop/dsimple.c.orig 2007-02-11 08:15:17.000000000 +0100 -+++ xprop/dsimple.c 2007-02-11 08:15:40.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: xwd/dsimple.c =================================================================== --- xwd/dsimple.c.orig 2007-02-11 08:15:57.000000000 +0100 @@ -52,17 +24,3 @@ Index: xwd/dsimple.c } return(d); -Index: xwininfo/dsimple.c -=================================================================== ---- xwininfo/dsimple.c.orig 2007-02-11 08:16:29.000000000 +0100 -+++ xwininfo/dsimple.c 2007-02-11 08:16:47.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); -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]