x11-apps: Changes to 'debian-unstable'
debian/changelog | 24 +++++++++++++++++++++++-
debian/control | 24 ++++++++++++++++--------
2 files changed, 39 insertions(+), 9 deletions(-)
New commits:
commit f2d0f8737829013aad941c6543700351685288f9
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 01:13:51 2007 +0300
debian/control: add Conflicts/Replaces, edit description.
diff --git a/debian/changelog b/debian/changelog
index 547c79e..b778d2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,40 @@
x11-apps (1) UNRELEASED; urgency=low
* Split xbase-clients, new versioning.
+ * Included packages:
+ - oclock 1.0.1
+ - x11perf 1.4.1
+ - xbiff 1.0.1
+ - xcalc 1.0.1
+ - xclipboard 1.0.1
+ - xclock 1.0.2
+ - xconsole 1.0.2
+ - xcursorgen 1.0.1
+ - xditview 1.0.1
+ - xedit 1.0.2
+ - xeyes 1.0.1
+ - xload 1.0.1
+ - xlogo 1.0.1
+ - xmag 1.0.1
+ - xman 1.0.2
+ - xmore 1.0.1
+ - xwd 1.0.1
+ - xwud 1.0.1
* debian/control:
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Split the Build-Dep line into multiple lines
- Clean up the description.
+ - Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades
+ smoother.
+ - 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.
* debian/x11-apps.install, rules: Edit to reflect new packaging.
* debian/local/: Remove.
* debian/patches: Delete patches which do not concern this package.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 16 May 2007 18:52:19 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 19 May 2007 00:57:31 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 797e83f..6913d19 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,10 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1),
- libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>= 2.1.8.2-6), libxkbfile-dev (>= 1:1.0.1-1),
- libxmuu-dev (>= 1:1.0.1-1), libxrender-dev (>= 1:0.9.0.2-2), libxt-dev (>= 1:1.0.0-1), xbitmaps, quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev, libx11-dev (>= 2:1.0.0-1),
+ libxaw7-dev (>= 1:1.0.1-1), libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1),
+ libxft-dev (>= 2.1.8.2-6), libxkbfile-dev (>= 1:1.0.1-1), libxmuu-dev (>= 1:1.0.1-1),
+ libxrender-dev (>= 1:0.9.0.2-2), libxt-dev (>= 1:1.0.0-1), xbitmaps, quilt
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -36,26 +37,33 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0)
Suggests: mesa-utils
-Description: miscellaneous X applications
+Conflicts: 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
+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
+Description: X applications
An X client is a program that interfaces with an X server (almost always via
the X libraries), and thus with some input and output hardware like a
graphics card, monitor, keyboard, and pointing device (such as a mouse).
.
- This package provides a miscellaneous assortment of several dozen X clients
+ This package provides a miscellaneous assortment of X applications
that ship with the X Window System, including:
- oclock and xclock, graphical clocks;
- - xedit, a text editor;
- xbiff, a tool which tells you when you have new email;
- xcalc, a scientific calculator desktop accessory;
- xclipboard, a tool to manage cut-and-pasted text selections;
- - xcutsel, which exchanges selection and cut buffer contents;
- xconsole, which monitors system console messages;
+ - xcursorgen;
+ - xditview, a viewer for ditroff output;
+ - xedit, a text editor;
- xeyes, a demo program in which a pair of eyes track the pointer;
- - xfd, a tool that displays all the glyphs in a given X font;
- xload, a monitor for the system load average;
- xlogo, a demo program that displays the X logo;
- xmag, which magnifies parts of the X screen;
- xman, a manual page browser;
+ - xmore;
- xwd, a utility for taking window dumps ("screenshots") of the X session;
- xwud, a viewer for window dumps created by xwd;
- Xmark, x11perf, and x11perfcomp, tools for benchmarking graphical
Reply to: