Bug#254565: two cursors
Hi I can confirm this bug. I have a SuperSavage IX/C SDR chip on my Thinkpad T23. Someone changed my cursor-theme to the one from industrial-theme, and I suddenly got two cursors. Changing the driver to disable HWCursor fixed this, but shouldn't it be disabled by default when using a LCD-panel? (as it says on the manpage) t
Re: uncompatible window manager?
On Tue, 21 Nov 2000, Christian Hammers wrote: Hello When starting gnome it says that I dont´ have a compatible window manager although I'm using sawfish-gnome. Upon which does it make this decision? Or is sawfish-gnome really no GNOME compatible window manager? I've had similar problems (using Helix-Gnome). Try moving the .gnome and .sawfish -directories to something like .gnome-old etc (while not running gnome!). Then try running gnome again and see what happens. Of course you'll lose your configs, but you may try to move them later on one by one... Sometimes it impossible to get shortcuts defined in sawfish (=you have to edit them manually, in console!), but that's a _bit_ off-topic here :-) - SUGGESTION It would be nice, if there was some sort of a changelog online that one can check out before updating (now I mean the X-packages =), as the kernel is having (like the one in ~testing/test11.log). But maybe that would be one task too many for Branden, eh?-) t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
x11proto-bigreqs: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit 3ba2b10e9eaac8755da830458c7bfbf82816d6c1 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 11:17:09 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 88e8235..6dd71dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-bigreqs (1.0.2-5) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 11:15:34 +0300 + x11proto-bigreqs (1.0.2-4) unstable; urgency=low * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-composite: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit c04fca0f3a10eae5473329d7bc2681a1216be3fc Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 11:29:04 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 1a3d4f1..7e2e7b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-composite (1:0.3.1-3) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 11:19:49 +0300 + x11proto-composite (0.3.1-2) unstable; urgency=low [ Andres Salomon ] -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-bigreqs: Changes to 'debian-unstable'
debian/changelog |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 29e24df9a369675cdb0128518d31209e3aa6e724 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 11:30:30 2007 +0300 Really bump the epoch... diff --git a/debian/changelog b/debian/changelog index 6dd71dc..1167423 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-bigreqs (1.0.2-5) UNRELEASED; urgency=low +x11proto-bigreqs (1:1.0.2-5) UNRELEASED; urgency=low * Bump the epoch so that this can be synced to Ubuntu in the future. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-dmx: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit a2b0b157573394a56e19707567f4ff748faf60ca Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 11:33:12 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 0ede34e..0045fdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-dmx (1:2.2.2-5) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 11:31:13 +0300 + x11proto-dmx (2.2.2-4) unstable; urgency=low * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-fixes: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit 96f1c8118602739a8308e73d3d95cec10e7e2941 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 11:35:04 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 5bc5574..6a983a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-fixes (1:4.0-3) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 11:33:46 +0300 + x11proto-fixes (4.0-2) unstable; urgency=low [ Drew Parsons ] -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-acecad: Changes to 'debian-unstable'
debian/changelog |5 - debian/control |2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 13a5aa09760ccea77c7409633a40c2fbaf9b56f0 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 16:40:07 2007 +0300 Drop linux-kernel-headers from Build-Depends. diff --git a/debian/changelog b/debian/changelog index 8210181..b1330c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,10 @@ xserver-xorg-input-acecad (1:1.1.1-1) UNRELEASED; urgency=low module in the long description. * Remove Fabio from uploaders with his permission. He's always welcome back. - -- Brice Goglin [EMAIL PROTECTED] Fri, 27 Apr 2007 18:38:11 +0200 + [ Timo Aaltonen ] + * Drop linux-kernel-headers from Build-Depends. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 16:37:38 +0300 xserver-xorg-input-acecad (1:1.1.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 870089b..de4a3af 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.2.99.902), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev +Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-acecad XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-acecad.git -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-aiptek: Changes to 'debian-unstable'
debian/changelog |5 - debian/control |2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit ba92cf5ea5339c0c6d021851529d79df3fb8c97a Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 16:50:44 2007 +0300 Drop linux-kernel-headers from Build-Depends. diff --git a/debian/changelog b/debian/changelog index 25c056a..0bee760 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,10 @@ xserver-xorg-input-aiptek (1:1.0.1-3) UNRELEASED; urgency=low module in the long description. * Remove Fabio from uploaders with his permission. He's always welcome back. - -- Brice Goglin [EMAIL PROTECTED] Tue, 24 Apr 2007 23:17:35 +0200 + [ Timo Aaltonen ] + * Drop linux-kernel-headers from Build-Depends. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 16:46:59 +0300 xserver-xorg-input-aiptek (1:1.0.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 544f6f9..63c8887 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.2.99.902), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev +Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-aiptek XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-aiptek.git -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-ur98: Changes to 'debian-unstable'
debian/changelog |5 - debian/control |2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit f17e7d5dc58a4b2a5533a1584fd0ddb96ab9d6cb Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 16:56:54 2007 +0300 Drop linux-kernel-headers from Build-Depends. diff --git a/debian/changelog b/debian/changelog index ebdd264..e8b32bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,10 @@ xserver-xorg-input-ur98 (1:1.1.0-3) UNRELEASED; urgency=low * Add a link to www.X.org and a reference to the xf86-input-ur98 module in the long description. - -- Brice Goglin [EMAIL PROTECTED] Sun, 22 Apr 2007 10:55:02 +0200 + [ Timo Aaltonen ] + * Drop linux-kernel-headers from Build-Depends. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 16:53:37 +0300 xserver-xorg-input-ur98 (1:1.1.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 3496114..60fe546 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED] -Build-Depends: debhelper (= 4.0.0), pkg-config, xserver-xorg-dev (= 2:1.2.99.902), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev +Build-Depends: debhelper (= 4.0.0), pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev Standards-Version: 3.7.2.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-ur98 XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-ur98.git -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-vmmouse: Changes to 'debian-unstable'
debian/changelog |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) New commits: commit f156aa888ff8293b044a22cfad83dbd935982b18 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 17:09:38 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 08e1870..a9da4bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-vmmouse (12.4.1-1) UNRELEASED; urgency=low +xserver-xorg-input-vmmouse (1:12.4.1-1) UNRELEASED; urgency=low [ Julien Cristau ] * Add link to xserver-xorg-core bug script, so that bugreports contain @@ -15,7 +15,10 @@ xserver-xorg-input-vmmouse (12.4.1-1) UNRELEASED; urgency=low * Add a link to www.X.org and a reference to the xf86-input-vmmouse module in the long description. - -- Brice Goglin [EMAIL PROTECTED] Wed, 25 Apr 2007 01:03:55 +0200 + [ Timo Aaltonen ] + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 17:03:42 +0300 xserver-xorg-input-vmmouse (12.4.0-2) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-sunbw2: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 0a5a25da76cbd796e1b06c2694d4c99c17c21472
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 4 17:53:30 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-nv.
diff --git a/debian/changelog b/debian/changelog
index 86652f1..8b9d325 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,10 @@ xserver-xorg-video-sunbw2 (1:1.1.0-5) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin [EMAIL PROTECTED] Tue, 01 May 2007 13:48:36 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-nv.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 17:52:59 +0300
xserver-xorg-video-sunbw2 (1:1.1.0-4) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 66db424..533521e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-sunbw2
Architecture: sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-sunbw2
+Conflicts: xserver-xorg-driver-sunbw2
Description: X.Org X server -- Sun BW2 display driver
This package provides the driver for Sun BW2 video devices.
.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-suncg3: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 24c659dd78bde6de384f1f66caac25bf1423e992
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 4 18:07:53 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-suncg3.
diff --git a/debian/changelog b/debian/changelog
index a07ca2a..b02a2e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,10 @@ xserver-xorg-video-suncg3 (1:1.1.0-3) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin [EMAIL PROTECTED] Tue, 01 May 2007 14:39:58 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-suncg3.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 18:02:59 +0300
xserver-xorg-video-suncg3 (1:1.1.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 81c52d7..eacdd54 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-suncg3
Architecture: sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-suncg3
+Conflicts: xserver-xorg-driver-suncg3
Description: X.Org X server -- Sun CG3 display driver
This package provides the driver for Sun CG3 video devices.
.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-suncg6: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 654bfa09f79b793319427efe7cf9eeed20623dab
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 4 18:11:35 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-suncg6.
diff --git a/debian/changelog b/debian/changelog
index 2dacc37..94c1351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,10 @@ xserver-xorg-video-suncg6 (1:1.1.0-4) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin [EMAIL PROTECTED] Tue, 01 May 2007 14:58:37 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-suncg6.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 18:09:50 +0300
xserver-xorg-video-suncg6 (1:1.1.0-3) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 412988d..3b02551 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-suncg6
Architecture: sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-suncg6
+Conflicts: xserver-xorg-driver-suncg6
Description: X.Org X server -- Sun CG6 display driver
This package provides the driver for Sun CG6 video devices.
.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-suncg14: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ea3af12fc9b4d0cb9f34f9d86e581abc92b4f90f
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 4 18:14:15 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-suncg14.
diff --git a/debian/changelog b/debian/changelog
index 1606fc8..7830e83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,10 @@ xserver-xorg-video-suncg14 (1:1.1.0-4) UNRELEASED;
urgency=low
* Remove Fabio from uploaders with his permission. He's always welcome back.
* Pull upstream manpage fix e37c03efea954f675961f2b1babbfb0787f4d3c9
- -- Brice Goglin [EMAIL PROTECTED] Tue, 01 May 2007 14:00:20 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-suncg14.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 18:13:35 +0300
xserver-xorg-video-suncg14 (1:1.1.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9db174c..391fd5e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-suncg14
Architecture: sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-suncg14
+Conflicts: xserver-xorg-driver-suncg14
Description: X.Org X server -- Sun CG14 display driver
This package provides the driver for Sun CG14 video devices.
.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-sunbw2: Changes to 'debian-unstable'
debian/changelog |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a0f61a2cf2b0689c05c4946188d57f5b95dd803 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 18:15:44 2007 +0300 Fix the changelog from previous commit.. diff --git a/debian/changelog b/debian/changelog index 8b9d325..5b427bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ xserver-xorg-video-sunbw2 (1:1.1.0-5) UNRELEASED; urgency=low * Remove Fabio from uploaders with his permission. He's always welcome back. [ Timo Aaltonen ] - * Replaces/Conflicts: xserver-xorg-driver-nv. + * Replaces/Conflicts: xserver-xorg-driver-sunbw2. -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 17:52:59 +0300 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-sunffb: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit c6af3639f2052eaaf0149eea905a93e019147dcd
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 4 18:17:39 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-sunffb.
diff --git a/debian/changelog b/debian/changelog
index 78283c0..5120b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,10 @@ xserver-xorg-video-sunffb (1:1.1.0-3) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin [EMAIL PROTECTED] Tue, 01 May 2007 15:32:58 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-sunffb.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 18:17:06 +0300
xserver-xorg-video-sunffb (1:1.1.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1565d01..b946171 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-sunffb
Architecture: sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-sunffb
+Conflicts: xserver-xorg-driver-sunffb
Description: X.Org X server -- Sun FFB display driver
This package provides the driver for Sun Creator, Creator3D, and Elite3D
video devices.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-sunleo: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3ec910b8f55f26f418c9485b02c64f31d9e41ed1
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 4 18:20:50 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-sunleo.
diff --git a/debian/changelog b/debian/changelog
index 87f54ab..6b932fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,10 @@ xserver-xorg-video-sunleo (1:1.1.0-3) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin [EMAIL PROTECTED] Tue, 01 May 2007 15:19:23 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-sunleo.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 18:19:37 +0300
xserver-xorg-video-sunleo (1:1.1.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e67cb35..2bb0485 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-sunleo
Architecture: sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-sunleo
+Conflicts: xserver-xorg-driver-sunleo
Description: X.Org X server -- Sun Leo display driver
This package provides the driver for Sun Leo (ZX) video devices.
.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-suntcx: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit c6d017b7add54e86cd4358c460753123f00f0d91
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 4 18:23:53 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-suntcx.
diff --git a/debian/changelog b/debian/changelog
index 2266729..4a28547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,10 @@ xserver-xorg-video-suntcx (1:1.1.0-3) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin [EMAIL PROTECTED] Tue, 01 May 2007 18:49:10 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-suntcx.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 18:23:01 +0300
xserver-xorg-video-suntcx (1:1.1.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a44d794..97b969b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-suntcx
Architecture: sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-suntcx
+Conflicts: xserver-xorg-driver-suntcx
Description: X.Org X server -- Sun TCX display driver
This package provides the driver for Sun TCX video devices.
.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxinerama: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit 1f14e258a731b0db7f039922b56b920d373b19a2 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Fri May 4 23:47:31 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index c692612..dc66d46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxinerama (2:1.0.2-2) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Fri, 4 May 2007 23:43:59 +0300 + libxinerama (1:1.0.2-1) unstable; urgency=low * New upstream release. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxtrap: Changes to 'debian-unstable'
debian/changelog |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 6cfbd705faca3c5681acb6ad95b8ac048230f2f5 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 5 00:01:55 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index b842a91..c292dad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -libxtrap (1:1.0.0-4) UNRELEASED; urgency=low +libxtrap (2:1.0.0-4) UNRELEASED; urgency=low + [ Julien Cristau ] * Add XS-Vcs-* and drop outdated CVS info from the descriptions. - -- Julien Cristau [EMAIL PROTECTED] Sat, 07 Apr 2007 17:35:06 +0200 + [ Timo Aaltonen ] + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Sat, 5 May 2007 00:01:05 +0300 libxtrap (1:1.0.0-3) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
[RFC] Splitting/reorganizing xbase-clients xutils
Hi! Currently there are some bugs on xbase-clients (151613, 153551, 199675, 332521) where it has been requested to reorganize xbase-clients/xutils. I asked about this a while back, and now I'm willing to step up and do what's needed for that.. First, here's a brutal work done exactly the way it's done in Fedora (please don't flame me to death, this was just to get something as a starting point :) Suggested bundle name (Fedora name) - software(current Debian package) separate # separating xauth has been requested in aforementioned bugs, and makes # sense for servers xauth (xbase-clients) xinit (xbase-clients) xsm (Fedora: xorg-x11-xsm) -- # xsm pulls openssh as Build-Dep, which makes slower buildd's crawl rstart (xutils) smproxy (xbase-clients) xsm (xbase-clients) xkbutils (Fedora: xorg-x11-xkb-utils) - # the same as xkbutils bundle in Ubuntu setxkbmap (xbase-clients) xkbcomp (xbase-clients) xkbevd (xbase-clients) xkbprint(xbase-clients) xkbutils(xbase-clients) xbase-apps (Fedora: xorg-x11-apps) -- oclock (xbase-clients) xclock (xbase-clients) xpr (none?) xwd (xbase-clients) xwud(xbase-clients) luit(xutils) x11perf (xbase-clients) xbiff (xbase-clients) xclipboard (xbase-clients) xconsole(xbase-clients) xcursorgen (xbase-clients) xeyes (xbase-clients) xkill (xbase-clients) xload (xbase-clients) xlogo (xbase-clients) xmag(xbase-clients) xmessage(xbase-clients) xbase-resutils (Fedora: xorg-x11-resutils) -- appres (xbase-clients) editres (xbase-clients) listres (xbase-clients) viewres (xbase-clients) xbase-utils (Fedora: xorg-x11-utils) xdpyinfo(xbase-clients) xdriinfo(xbase-clients) xev (xbase-clients) xfd (xbase-clients) xfontsel(xbase-clients) xlsatoms(xbase-clients) xlsclients (xbase-clients) xlsfonts(xbase-clients) xprop (xbase-clients) xvinfo (xbase-clients) xwininfo(xbase-clients) xbase-xserver-utils (Fedora: xorg-x11-server-utils) - iceauth (xbase-clients) rgb (xutils) sessreg (xutils) xcmsdb (xbase-clients) xgamma (xbase-clients) xhost (xbase-clients) xmodmap (xbase-clients) xrandr (xbase-clients) xrdb(xbase-clients) xrefresh(xbase-clients) xset(xbase-clients) xsetmode(xbase-clients) xsetpointer (xbase-clients) xsetroot(xbase-clients) xstdcmap(xbase-clients) xtrap (xbase-clients) xvidtune(xbase-clients) xfonts-utils (Fedora: xorg-x11-font-utils) -- # pretty much the same as xfonts-utils now bdftopcf(xfonts-utils) font-util (xfonts-utils) fonttosfnt (none?) mkfontdir (xfonts-utils) mkfontscale (xfonts-utils) xfs (Fedora:xorg-x11-xfs) - # why not bundle these together? fslsfonts (xutils) fstobdf (xbase-clients) showfont(xutils) xfs (xfs) xfsinfo (xutils) ?? (Fedora: xorg-x11-xfwp) -- # no idea about these, we don't have them so not useful? proxymngr xfindproxy (mentioned in xbase-clients control file, but not there) xfwp Finally, here are the leftover bits from xbase-clients and xutils not found from Fedora: # xbase-clients beforelight bitmap ico xcalc (xbase-apps?) xdbedizzy xditview(xbase-apps?) xedit (xbase-apps?) xf86dga xgc xman(xbase-apps?) xmore (xbase-apps?) # xutils scripts The leftovers could be added to a sensible bundle, or dropped. -- It's getting late here, so there might be some errors left.. Let the discussion begin! :P t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [RFC] Splitting/reorganizing xbase-clients xutils
On Sat, 5 May 2007, Brice Goglin wrote: Note that ico, xcalc, xdbedizzy, xditview, xedit, xgc, xman, xmore might be dropped by upstream in the future (see http://lists.freedesktop.org/archives/xorg/2007-April/023355.html) Are you planning to split the binary package only or also the source? I hadn't thought of that, but as we spoke on #debian-x, we could use one big source which then would generate binary bundles, with the exception of xauth, xinit, xfs and xsm which use their own source packages? Regarding what Fedora does, I don't see why we would have to split into so many packages. Moving xauth in its own package seems important. Splitting all tiny client from server utilities too. However, for instance, I don't see why appres/editres/listres/viewres would need to be in their own xbase-resutils, they could stay with xrdb or something like that. Also the difference between xfonts-utils and xfs programs does not look easy to understand. Yes, here is the latest list (updated when something new comes up): http://users.tkk.fi/~tjaalton/xbase-clients-split.txt general consensus on #debian-x seemed to be that this looks pretty good now. There are however some packages which are not in any of the new bundles. Also, renaming xfonts-utils and xutils-dev was thought as too riski, since there are too many reverse deps on them. Further comments welcome :) t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xorg: Changes to 'debian-unstable'
debian/changelog |6 +- debian/local/Xsession.d/20x11-common_process-args |2 +- debian/local/Xsession.d/30x11-common_xresources |2 +- 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 65eafe9f7c3e721eb73e81a1c16af7c5b447f1d1 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sun May 6 18:37:40 2007 +0300 Xsession.d/*: change 'which' - '/usr/bin/which', since the zsh builtin command can in some circumstances make the login fail. diff --git a/debian/changelog b/debian/changelog index 64c3194..542f5af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,11 @@ xorg (1:7.2-4) UNRELEASED; urgency=low * Add armel support, thanks to Riku Voipio (closes: #408817). * Make xephem conflict versioned as = 3.4-5 (closes: #419533). - -- Brice Goglin [EMAIL PROTECTED] Mon, 30 Apr 2007 12:17:46 +0200 + [ Timo Aaltonen ] + * Xsession.d/*: change 'which' - '/usr/bin/which', since the zsh builtin +command can in some circumstances make the login fail. + + -- Timo Aaltonen [EMAIL PROTECTED] Sun, 6 May 2007 18:33:29 +0300 xorg (1:7.2-3) unstable; urgency=low diff --git a/debian/local/Xsession.d/20x11-common_process-args b/debian/local/Xsession.d/20x11-common_process-args index 2a412bd..53e7a7b 100644 --- a/debian/local/Xsession.d/20x11-common_process-args +++ b/debian/local/Xsession.d/20x11-common_process-args @@ -33,7 +33,7 @@ case $# in ;; *) # Specific program was requested. -STARTUP_FULL_PATH=$(which $1 || true) +STARTUP_FULL_PATH=$(/usr/bin/which $1 || true) if [ -n $STARTUP_FULL_PATH ] [ -e $STARTUP_FULL_PATH ]; then if [ -x $STARTUP_FULL_PATH ]; then STARTUP=$1 diff --git a/debian/local/Xsession.d/30x11-common_xresources b/debian/local/Xsession.d/30x11-common_xresources index 1c3bd83..f9f6e13 100644 --- a/debian/local/Xsession.d/30x11-common_xresources +++ b/debian/local/Xsession.d/30x11-common_xresources @@ -4,7 +4,7 @@ # If xrdb (from xbase-clients) is installed, merge system-wide X resources. # Then merge the user's X resources, if the options file is so configured. -if which xrdb /dev/null 21; then +if /usr/bin/which xrdb /dev/null 21; then if [ -d $SYSRESOURCES ]; then RESOURCEFILES=$(run-parts --list $SYSRESOURCES) if [ -n $RESOURCEFILES ]; then -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-apps: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 5375e21abc8e9626241b08d4664080f53dec92d7 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Wed May 16 18:31:07 2007 +0300 * Split xbase-clients, new versioning. * debian/control: - Remove unnecessary Build-Deps. - Split the Build-Dep line into multiple lines - Clean up the description. * 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. commit 2ae6373794edcade76e8deb403d4fbdf529a39e9 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:30:01 2007 +0200 xsm: autoreconf commit 710b00382004e6d028cff06358100e58b7629e69 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:29:28 2007 +0200 Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep. commit 3f2b543846b267ce7b94d2496ba2105dd1059854 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 22:00:38 2007 +0200 Prepare changelog for upload. commit 36583884f30bc161d500a03f0f076a066da9deb7 Merge: d8b681b7fd716cd936e90020618c64846dcdf846 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:42:31 2007 +0200 Merge branch 'xsfbs-unstable' of ../../xsfbs into debian-unstable commit d8b681b7fd716cd936e90020618c64846dcdf846 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:41:42 2007 +0200 Add XS-Vcs-* in debian/control. commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Branden Robinson [EMAIL PROTECTED](none) Date: Thu Apr 12 23:18:32 2007 -0400 Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. commit bdedaeb6f91abf59a10190e6b0ab0c227a4c5ba1 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Apr 12 11:46:00 2007 +0200 Update long description. XKB configuration data is in xkb-data, not xlibs; Base bitmap images have moved to xbitmaps. commit d71d95be45c5f5939523ed4d69f817beecc83b25 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Apr 11 21:42:17 2007 +0200 Remove mention of xf86cfg in package description (really closes: #362066). commit 0cf66c046cb53d95a2b994034e008906ff16f0c6 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 15:53:48 2007 +0200 Document each app's build-dependencies in debian/control commit 6e403cb28bc215733a0bdc16625249d3e437ce0f Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 14:52:19 2007 +0200 Add patch for xmodmap(1) to refer to the correct location for XKeysymDB. commit d251a8ca189c07129110297eb3202e55cc6e78c2 Author: Brice Goglin [EMAIL PROTECTED] Date: Mon Mar 12 00:43:40 2007 +0100 * Restore Depends: on cpp (got lost during modularization) since xrdb needs it to process .Xdefaults. commit 88ec478ece124aa4422fe030a7267810a420e131 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 9 12:49:43 2007 +0100 Fix versioned build-dep on libxinerama-dev. Thanks, Paul Hampson! commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 18:00:22 2007 +0100 Build-depend on libxinerama-dev xdpyinfo needs to be built against libxinerama to support the corresponding extension. commit 72811b4cede7275a35d36b44bcb5f431a8aa0133 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 2 20:28:15 2007 +0100 Fix copy/paste typo in the input driver provides. commit 4a943db2564c4f573ce2f5f676a841267e961f16 Author: David Nusinow [EMAIL PROTECTED] Date: Thu Mar 1 22:06:04 2007 -0500 Fix one missed bit from the serverabiver - serverminver rename commit 1344bb9deda5ba54215d0ec5b164706999236b0b Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 28 23:08:17 2007 -0500 Fix typo that prevented the input abi versioning from working. Good catch Julien commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f Author: David Nusinow [EMAIL PROTECTED] Date: Tue Feb 27 21:50:20 2007 -0500 Add support for X server input ABI versioning commit 00fc799ec3107c0c29286b75e780bef82c1fa137 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 22:47:30 2007 -0500 Fix name of serverminver commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's
x11-apps: Changes to 'debian-unstable'
debian/changelog |3 ++- debian/control |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit e1fc5aa61489ab01a95263122dedd494b2a8 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Wed May 16 18:52:50 2007 +0300 debian/control: rename Source. diff --git a/debian/changelog b/debian/changelog index 1750b8b..547c79e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x11-apps (1) UNRELEASED; urgency=low * Split xbase-clients, new versioning. * debian/control: +- Rename Package and Source. - Remove unnecessary Build-Deps. - Split the Build-Dep line into multiple lines - Clean up the description. @@ -11,7 +12,7 @@ x11-apps (1) UNRELEASED; urgency=low * debian/local/: Remove. * debian/patches: Delete patches which do not concern this package. - -- Timo Aaltonen [EMAIL PROTECTED] Wed, 16 May 2007 18:10:27 +0300 + -- Timo Aaltonen [EMAIL PROTECTED] Wed, 16 May 2007 18:52:19 +0300 xbase-clients (1:7.2.ds2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index e01c2fb..81ca5e4 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: xbase-clients +Source: x11-apps Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-apps: Changes to 'debian-unstable'
debian/control |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4cf1be47f8a2ae44e14e28315f62441e644fdfdb Author: Timo Aaltonen [EMAIL PROTECTED] Date: Wed May 16 18:55:05 2007 +0300 re-add quilt as build-dep. diff --git a/debian/control b/debian/control index 81ca5e4..065ea05 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,9 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Julien Cristau [EMAIL PROTECTED] 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), libxmuu-dev (= 1:1.0.1-1), - libxrender-dev (= 1:0.9.0.2-2), libxt-dev (= 1:1.0.0-1), xbitmaps + 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 +# debhelper for the packaging, pkg-config needed by configure scripts # Individual apps: # oclock: libx11-dev, libxmu-dev, libxext-dev # x11perf: libx11-dev, libxmuu-dev, libxrender-dev, libxft-dev, libxext-dev -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-apps: Changes to 'debian-unstable'
debian/control |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 79228a62518981ecf99bbac7fc1513e0dfbbb95b Author: Timo Aaltonen [EMAIL PROTECTED] Date: Wed May 16 19:08:34 2007 +0300 debian/control: re-add build-dep on libxkbfile-dev diff --git a/debian/control b/debian/control index 065ea05..797e83f 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Julien Cristau [EMAIL PROTECTED] 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), libxmuu-dev (= 1:1.0.1-1), - libxrender-dev (= 1:0.9.0.2-2), libxt-dev (= 1:1.0.0-1), xbitmaps, quilt + 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: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xkb-utils: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 0dc97b8bf0704ace3e9b2cb39b2ff30297e929c1 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Wed May 16 23:06:48 2007 +0300 Split base-clients, rip xkb-related tools in here. commit 2ae6373794edcade76e8deb403d4fbdf529a39e9 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:30:01 2007 +0200 xsm: autoreconf commit 710b00382004e6d028cff06358100e58b7629e69 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:29:28 2007 +0200 Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep. commit 3f2b543846b267ce7b94d2496ba2105dd1059854 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 22:00:38 2007 +0200 Prepare changelog for upload. commit 36583884f30bc161d500a03f0f076a066da9deb7 Merge: d8b681b7fd716cd936e90020618c64846dcdf846 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:42:31 2007 +0200 Merge branch 'xsfbs-unstable' of ../../xsfbs into debian-unstable commit d8b681b7fd716cd936e90020618c64846dcdf846 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:41:42 2007 +0200 Add XS-Vcs-* in debian/control. commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Branden Robinson [EMAIL PROTECTED](none) Date: Thu Apr 12 23:18:32 2007 -0400 Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. commit bdedaeb6f91abf59a10190e6b0ab0c227a4c5ba1 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Apr 12 11:46:00 2007 +0200 Update long description. XKB configuration data is in xkb-data, not xlibs; Base bitmap images have moved to xbitmaps. commit d71d95be45c5f5939523ed4d69f817beecc83b25 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Apr 11 21:42:17 2007 +0200 Remove mention of xf86cfg in package description (really closes: #362066). commit 0cf66c046cb53d95a2b994034e008906ff16f0c6 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 15:53:48 2007 +0200 Document each app's build-dependencies in debian/control commit 6e403cb28bc215733a0bdc16625249d3e437ce0f Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 14:52:19 2007 +0200 Add patch for xmodmap(1) to refer to the correct location for XKeysymDB. commit d251a8ca189c07129110297eb3202e55cc6e78c2 Author: Brice Goglin [EMAIL PROTECTED] Date: Mon Mar 12 00:43:40 2007 +0100 * Restore Depends: on cpp (got lost during modularization) since xrdb needs it to process .Xdefaults. commit 88ec478ece124aa4422fe030a7267810a420e131 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 9 12:49:43 2007 +0100 Fix versioned build-dep on libxinerama-dev. Thanks, Paul Hampson! commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 18:00:22 2007 +0100 Build-depend on libxinerama-dev xdpyinfo needs to be built against libxinerama to support the corresponding extension. commit 72811b4cede7275a35d36b44bcb5f431a8aa0133 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 2 20:28:15 2007 +0100 Fix copy/paste typo in the input driver provides. commit 4a943db2564c4f573ce2f5f676a841267e961f16 Author: David Nusinow [EMAIL PROTECTED] Date: Thu Mar 1 22:06:04 2007 -0500 Fix one missed bit from the serverabiver - serverminver rename commit 1344bb9deda5ba54215d0ec5b164706999236b0b Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 28 23:08:17 2007 -0500 Fix typo that prevented the input abi versioning from working. Good catch Julien commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f Author: David Nusinow [EMAIL PROTECTED] Date: Tue Feb 27 21:50:20 2007 -0500 Add support for X server input ABI versioning commit 00fc799ec3107c0c29286b75e780bef82c1fa137 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 22:47:30 2007 -0500 Fix name of serverminver commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. commit aa3a74d10a25cf19c5290963d33cc05e9a5e9762 Author: Julien Cristau [EMAIL PROTECTED] Date: Tue Feb 20 08:29:44 2007 +0100 Autoreconf with patches applied. This makes the __XKBCONFIGROOT__ substitution actually work. commit
x11-utils: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 7e422750f34a07f2b5c892e752e2361d5d2c Author: Timo Aaltonen [EMAIL PROTECTED] Date: Thu May 17 00:10:52 2007 +0300 Split xbase-clients, include generic X utilities here. commit 2ae6373794edcade76e8deb403d4fbdf529a39e9 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:30:01 2007 +0200 xsm: autoreconf commit 710b00382004e6d028cff06358100e58b7629e69 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:29:28 2007 +0200 Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep. commit 3f2b543846b267ce7b94d2496ba2105dd1059854 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 22:00:38 2007 +0200 Prepare changelog for upload. commit 36583884f30bc161d500a03f0f076a066da9deb7 Merge: d8b681b7fd716cd936e90020618c64846dcdf846 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:42:31 2007 +0200 Merge branch 'xsfbs-unstable' of ../../xsfbs into debian-unstable commit d8b681b7fd716cd936e90020618c64846dcdf846 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:41:42 2007 +0200 Add XS-Vcs-* in debian/control. commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Branden Robinson [EMAIL PROTECTED](none) Date: Thu Apr 12 23:18:32 2007 -0400 Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. commit bdedaeb6f91abf59a10190e6b0ab0c227a4c5ba1 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Apr 12 11:46:00 2007 +0200 Update long description. XKB configuration data is in xkb-data, not xlibs; Base bitmap images have moved to xbitmaps. commit d71d95be45c5f5939523ed4d69f817beecc83b25 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Apr 11 21:42:17 2007 +0200 Remove mention of xf86cfg in package description (really closes: #362066). commit 0cf66c046cb53d95a2b994034e008906ff16f0c6 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 15:53:48 2007 +0200 Document each app's build-dependencies in debian/control commit 6e403cb28bc215733a0bdc16625249d3e437ce0f Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 14:52:19 2007 +0200 Add patch for xmodmap(1) to refer to the correct location for XKeysymDB. commit d251a8ca189c07129110297eb3202e55cc6e78c2 Author: Brice Goglin [EMAIL PROTECTED] Date: Mon Mar 12 00:43:40 2007 +0100 * Restore Depends: on cpp (got lost during modularization) since xrdb needs it to process .Xdefaults. commit 88ec478ece124aa4422fe030a7267810a420e131 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 9 12:49:43 2007 +0100 Fix versioned build-dep on libxinerama-dev. Thanks, Paul Hampson! commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 18:00:22 2007 +0100 Build-depend on libxinerama-dev xdpyinfo needs to be built against libxinerama to support the corresponding extension. commit 72811b4cede7275a35d36b44bcb5f431a8aa0133 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 2 20:28:15 2007 +0100 Fix copy/paste typo in the input driver provides. commit 4a943db2564c4f573ce2f5f676a841267e961f16 Author: David Nusinow [EMAIL PROTECTED] Date: Thu Mar 1 22:06:04 2007 -0500 Fix one missed bit from the serverabiver - serverminver rename commit 1344bb9deda5ba54215d0ec5b164706999236b0b Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 28 23:08:17 2007 -0500 Fix typo that prevented the input abi versioning from working. Good catch Julien commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f Author: David Nusinow [EMAIL PROTECTED] Date: Tue Feb 27 21:50:20 2007 -0500 Add support for X server input ABI versioning commit 00fc799ec3107c0c29286b75e780bef82c1fa137 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 22:47:30 2007 -0500 Fix name of serverminver commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. commit aa3a74d10a25cf19c5290963d33cc05e9a5e9762 Author: Julien Cristau [EMAIL PROTECTED] Date: Tue Feb 20 08:29:44 2007 +0100 Autoreconf with patches applied. This makes the __XKBCONFIGROOT__ substitution actually work. commit
x11-xserver-utils: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 128d532d9ac12d33fc0a7e818e66c99e7e374eea Author: Timo Aaltonen [EMAIL PROTECTED] Date: Thu May 17 00:56:51 2007 +0300 Split xbase-clients, include xserver related utilities here. commit 2ae6373794edcade76e8deb403d4fbdf529a39e9 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:30:01 2007 +0200 xsm: autoreconf commit 710b00382004e6d028cff06358100e58b7629e69 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:29:28 2007 +0200 Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep. commit 3f2b543846b267ce7b94d2496ba2105dd1059854 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 22:00:38 2007 +0200 Prepare changelog for upload. commit 36583884f30bc161d500a03f0f076a066da9deb7 Merge: d8b681b7fd716cd936e90020618c64846dcdf846 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:42:31 2007 +0200 Merge branch 'xsfbs-unstable' of ../../xsfbs into debian-unstable commit d8b681b7fd716cd936e90020618c64846dcdf846 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:41:42 2007 +0200 Add XS-Vcs-* in debian/control. commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Branden Robinson [EMAIL PROTECTED](none) Date: Thu Apr 12 23:18:32 2007 -0400 Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. commit bdedaeb6f91abf59a10190e6b0ab0c227a4c5ba1 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Apr 12 11:46:00 2007 +0200 Update long description. XKB configuration data is in xkb-data, not xlibs; Base bitmap images have moved to xbitmaps. commit d71d95be45c5f5939523ed4d69f817beecc83b25 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Apr 11 21:42:17 2007 +0200 Remove mention of xf86cfg in package description (really closes: #362066). commit 0cf66c046cb53d95a2b994034e008906ff16f0c6 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 15:53:48 2007 +0200 Document each app's build-dependencies in debian/control commit 6e403cb28bc215733a0bdc16625249d3e437ce0f Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 14:52:19 2007 +0200 Add patch for xmodmap(1) to refer to the correct location for XKeysymDB. commit d251a8ca189c07129110297eb3202e55cc6e78c2 Author: Brice Goglin [EMAIL PROTECTED] Date: Mon Mar 12 00:43:40 2007 +0100 * Restore Depends: on cpp (got lost during modularization) since xrdb needs it to process .Xdefaults. commit 88ec478ece124aa4422fe030a7267810a420e131 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 9 12:49:43 2007 +0100 Fix versioned build-dep on libxinerama-dev. Thanks, Paul Hampson! commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 18:00:22 2007 +0100 Build-depend on libxinerama-dev xdpyinfo needs to be built against libxinerama to support the corresponding extension. commit 72811b4cede7275a35d36b44bcb5f431a8aa0133 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 2 20:28:15 2007 +0100 Fix copy/paste typo in the input driver provides. commit 4a943db2564c4f573ce2f5f676a841267e961f16 Author: David Nusinow [EMAIL PROTECTED] Date: Thu Mar 1 22:06:04 2007 -0500 Fix one missed bit from the serverabiver - serverminver rename commit 1344bb9deda5ba54215d0ec5b164706999236b0b Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 28 23:08:17 2007 -0500 Fix typo that prevented the input abi versioning from working. Good catch Julien commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f Author: David Nusinow [EMAIL PROTECTED] Date: Tue Feb 27 21:50:20 2007 -0500 Add support for X server input ABI versioning commit 00fc799ec3107c0c29286b75e780bef82c1fa137 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 22:47:30 2007 -0500 Fix name of serverminver commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. commit aa3a74d10a25cf19c5290963d33cc05e9a5e9762 Author: Julien Cristau [EMAIL PROTECTED] Date: Tue Feb 20 08:29:44 2007 +0100 Autoreconf with patches applied. This makes the __XKBCONFIGROOT__ substitution actually work. commit
preliminary packaging for xbase-clients split done
Hi As you've probably noticed, I've pushed some packages to git.d.o which have been made according to the plan (*). Also the source package has been split, since that would hopefully make it easier to triage bugs, and also makes updates smaller when some component is changed. This is just a start, but they should build fine. Possibly some Replaces-trickery is needed to make upgrades smooth. Note that the versioning is not necessarily final; we discussed about it breafly with Julien and decided to start from '1' for now. Comments are welcome as always. pushed packages so far: x11-apps x11-utils x11-xkb-utils x11-xserver-utils yet to be done: xauth xinit xsm xfs (add packages from xutils/xbase-clients) poke at will! * http://users.tkk.fi/~tjaalton/xbase-clients-split.txt t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xsm: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit a45a9390ae07ac9ca9caf2d14fcc13ca802add9c Author: Timo Aaltonen [EMAIL PROTECTED] Date: Thu May 17 09:19:03 2007 +0300 Split xbase-clients, include session manager related utilities here. commit 2ae6373794edcade76e8deb403d4fbdf529a39e9 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:30:01 2007 +0200 xsm: autoreconf commit 710b00382004e6d028cff06358100e58b7629e69 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:29:28 2007 +0200 Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep. commit 3f2b543846b267ce7b94d2496ba2105dd1059854 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 22:00:38 2007 +0200 Prepare changelog for upload. commit 36583884f30bc161d500a03f0f076a066da9deb7 Merge: d8b681b7fd716cd936e90020618c64846dcdf846 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:42:31 2007 +0200 Merge branch 'xsfbs-unstable' of ../../xsfbs into debian-unstable commit d8b681b7fd716cd936e90020618c64846dcdf846 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:41:42 2007 +0200 Add XS-Vcs-* in debian/control. commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Branden Robinson [EMAIL PROTECTED](none) Date: Thu Apr 12 23:18:32 2007 -0400 Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. commit bdedaeb6f91abf59a10190e6b0ab0c227a4c5ba1 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Apr 12 11:46:00 2007 +0200 Update long description. XKB configuration data is in xkb-data, not xlibs; Base bitmap images have moved to xbitmaps. commit d71d95be45c5f5939523ed4d69f817beecc83b25 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Apr 11 21:42:17 2007 +0200 Remove mention of xf86cfg in package description (really closes: #362066). commit 0cf66c046cb53d95a2b994034e008906ff16f0c6 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 15:53:48 2007 +0200 Document each app's build-dependencies in debian/control commit 6e403cb28bc215733a0bdc16625249d3e437ce0f Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 14:52:19 2007 +0200 Add patch for xmodmap(1) to refer to the correct location for XKeysymDB. commit d251a8ca189c07129110297eb3202e55cc6e78c2 Author: Brice Goglin [EMAIL PROTECTED] Date: Mon Mar 12 00:43:40 2007 +0100 * Restore Depends: on cpp (got lost during modularization) since xrdb needs it to process .Xdefaults. commit 88ec478ece124aa4422fe030a7267810a420e131 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 9 12:49:43 2007 +0100 Fix versioned build-dep on libxinerama-dev. Thanks, Paul Hampson! commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 18:00:22 2007 +0100 Build-depend on libxinerama-dev xdpyinfo needs to be built against libxinerama to support the corresponding extension. commit 72811b4cede7275a35d36b44bcb5f431a8aa0133 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 2 20:28:15 2007 +0100 Fix copy/paste typo in the input driver provides. commit 4a943db2564c4f573ce2f5f676a841267e961f16 Author: David Nusinow [EMAIL PROTECTED] Date: Thu Mar 1 22:06:04 2007 -0500 Fix one missed bit from the serverabiver - serverminver rename commit 1344bb9deda5ba54215d0ec5b164706999236b0b Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 28 23:08:17 2007 -0500 Fix typo that prevented the input abi versioning from working. Good catch Julien commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f Author: David Nusinow [EMAIL PROTECTED] Date: Tue Feb 27 21:50:20 2007 -0500 Add support for X server input ABI versioning commit 00fc799ec3107c0c29286b75e780bef82c1fa137 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 22:47:30 2007 -0500 Fix name of serverminver commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. commit aa3a74d10a25cf19c5290963d33cc05e9a5e9762 Author: Julien Cristau [EMAIL PROTECTED] Date: Tue Feb 20 08:29:44 2007 +0100 Autoreconf with patches applied. This makes the __XKBCONFIGROOT__ substitution actually work
xauth: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit f0dc26ed195827821c86733fdd117a24af39ff95 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Thu May 17 14:59:37 2007 +0300 Split xbase-clients, new versioning using the module version. commit 2ae6373794edcade76e8deb403d4fbdf529a39e9 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:30:01 2007 +0200 xsm: autoreconf commit 710b00382004e6d028cff06358100e58b7629e69 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:29:28 2007 +0200 Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep. commit 3f2b543846b267ce7b94d2496ba2105dd1059854 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 22:00:38 2007 +0200 Prepare changelog for upload. commit 36583884f30bc161d500a03f0f076a066da9deb7 Merge: d8b681b7fd716cd936e90020618c64846dcdf846 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:42:31 2007 +0200 Merge branch 'xsfbs-unstable' of ../../xsfbs into debian-unstable commit d8b681b7fd716cd936e90020618c64846dcdf846 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:41:42 2007 +0200 Add XS-Vcs-* in debian/control. commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Branden Robinson [EMAIL PROTECTED](none) Date: Thu Apr 12 23:18:32 2007 -0400 Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. commit bdedaeb6f91abf59a10190e6b0ab0c227a4c5ba1 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Apr 12 11:46:00 2007 +0200 Update long description. XKB configuration data is in xkb-data, not xlibs; Base bitmap images have moved to xbitmaps. commit d71d95be45c5f5939523ed4d69f817beecc83b25 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Apr 11 21:42:17 2007 +0200 Remove mention of xf86cfg in package description (really closes: #362066). commit 0cf66c046cb53d95a2b994034e008906ff16f0c6 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 15:53:48 2007 +0200 Document each app's build-dependencies in debian/control commit 6e403cb28bc215733a0bdc16625249d3e437ce0f Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 14:52:19 2007 +0200 Add patch for xmodmap(1) to refer to the correct location for XKeysymDB. commit d251a8ca189c07129110297eb3202e55cc6e78c2 Author: Brice Goglin [EMAIL PROTECTED] Date: Mon Mar 12 00:43:40 2007 +0100 * Restore Depends: on cpp (got lost during modularization) since xrdb needs it to process .Xdefaults. commit 88ec478ece124aa4422fe030a7267810a420e131 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 9 12:49:43 2007 +0100 Fix versioned build-dep on libxinerama-dev. Thanks, Paul Hampson! commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 18:00:22 2007 +0100 Build-depend on libxinerama-dev xdpyinfo needs to be built against libxinerama to support the corresponding extension. commit 72811b4cede7275a35d36b44bcb5f431a8aa0133 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 2 20:28:15 2007 +0100 Fix copy/paste typo in the input driver provides. commit 4a943db2564c4f573ce2f5f676a841267e961f16 Author: David Nusinow [EMAIL PROTECTED] Date: Thu Mar 1 22:06:04 2007 -0500 Fix one missed bit from the serverabiver - serverminver rename commit 1344bb9deda5ba54215d0ec5b164706999236b0b Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 28 23:08:17 2007 -0500 Fix typo that prevented the input abi versioning from working. Good catch Julien commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f Author: David Nusinow [EMAIL PROTECTED] Date: Tue Feb 27 21:50:20 2007 -0500 Add support for X server input ABI versioning commit 00fc799ec3107c0c29286b75e780bef82c1fa137 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 22:47:30 2007 -0500 Fix name of serverminver commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. commit aa3a74d10a25cf19c5290963d33cc05e9a5e9762 Author: Julien Cristau [EMAIL PROTECTED] Date: Tue Feb 20 08:29:44 2007 +0100 Autoreconf with patches applied. This makes the __XKBCONFIGROOT__ substitution actually work. commit
xinit: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 4cdbf9a16ab977377f075a375fec0e57f4afbb2d Author: Timo Aaltonen [EMAIL PROTECTED] Date: Thu May 17 15:43:44 2007 +0300 Split xbase-clients, new versioning using the module version. commit 2ae6373794edcade76e8deb403d4fbdf529a39e9 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:30:01 2007 +0200 xsm: autoreconf commit 710b00382004e6d028cff06358100e58b7629e69 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed May 9 16:29:28 2007 +0200 Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep. commit 3f2b543846b267ce7b94d2496ba2105dd1059854 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 22:00:38 2007 +0200 Prepare changelog for upload. commit 36583884f30bc161d500a03f0f076a066da9deb7 Merge: d8b681b7fd716cd936e90020618c64846dcdf846 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:42:31 2007 +0200 Merge branch 'xsfbs-unstable' of ../../xsfbs into debian-unstable commit d8b681b7fd716cd936e90020618c64846dcdf846 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Apr 20 21:41:42 2007 +0200 Add XS-Vcs-* in debian/control. commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Branden Robinson [EMAIL PROTECTED](none) Date: Thu Apr 12 23:18:32 2007 -0400 Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. commit bdedaeb6f91abf59a10190e6b0ab0c227a4c5ba1 Author: Julien Cristau [EMAIL PROTECTED] Date: Thu Apr 12 11:46:00 2007 +0200 Update long description. XKB configuration data is in xkb-data, not xlibs; Base bitmap images have moved to xbitmaps. commit d71d95be45c5f5939523ed4d69f817beecc83b25 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Apr 11 21:42:17 2007 +0200 Remove mention of xf86cfg in package description (really closes: #362066). commit 0cf66c046cb53d95a2b994034e008906ff16f0c6 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 15:53:48 2007 +0200 Document each app's build-dependencies in debian/control commit 6e403cb28bc215733a0bdc16625249d3e437ce0f Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 30 14:52:19 2007 +0200 Add patch for xmodmap(1) to refer to the correct location for XKeysymDB. commit d251a8ca189c07129110297eb3202e55cc6e78c2 Author: Brice Goglin [EMAIL PROTECTED] Date: Mon Mar 12 00:43:40 2007 +0100 * Restore Depends: on cpp (got lost during modularization) since xrdb needs it to process .Xdefaults. commit 88ec478ece124aa4422fe030a7267810a420e131 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 9 12:49:43 2007 +0100 Fix versioned build-dep on libxinerama-dev. Thanks, Paul Hampson! commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Mar 7 18:00:22 2007 +0100 Build-depend on libxinerama-dev xdpyinfo needs to be built against libxinerama to support the corresponding extension. commit 72811b4cede7275a35d36b44bcb5f431a8aa0133 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 2 20:28:15 2007 +0100 Fix copy/paste typo in the input driver provides. commit 4a943db2564c4f573ce2f5f676a841267e961f16 Author: David Nusinow [EMAIL PROTECTED] Date: Thu Mar 1 22:06:04 2007 -0500 Fix one missed bit from the serverabiver - serverminver rename commit 1344bb9deda5ba54215d0ec5b164706999236b0b Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 28 23:08:17 2007 -0500 Fix typo that prevented the input abi versioning from working. Good catch Julien commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f Author: David Nusinow [EMAIL PROTECTED] Date: Tue Feb 27 21:50:20 2007 -0500 Add support for X server input ABI versioning commit 00fc799ec3107c0c29286b75e780bef82c1fa137 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 22:47:30 2007 -0500 Fix name of serverminver commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. commit aa3a74d10a25cf19c5290963d33cc05e9a5e9762 Author: Julien Cristau [EMAIL PROTECTED] Date: Tue Feb 20 08:29:44 2007 +0100 Autoreconf with patches applied. This makes the __XKBCONFIGROOT__ substitution actually work. commit
xauth: Changes to 'debian-unstable'
debian/control |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 663a1f99e4de8c420088e1125a81eb42e1729bc9
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 18 11:23:14 2007 +0300
debian/control: modify description (snippet from old xutils).
diff --git a/debian/control b/debian/control
index 109fbc2..93c5ed4 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,11 @@ Package: xauth
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Suggests: pdksh
Description: X authentication utility
xauth is a small utility to read and manipulate Xauthority files, which
are used by servers and clients alike to control authentication and access
to X sessions.
-
+ .
+ xauth's xauth_switch_to_sun-des-1 script requires a ksh implementation
+ to be installed.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xfs-utils: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 58ff550cfb6af91a016aeb4d93b909fbd98e1143 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 19 00:38:09 2007 +0300 Split xbase-clients/xutils, new versioning. commit d4027f3605f6f9cea4ec15d71f8388b0d92197e5 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 4 19:07:17 2007 -0500 Add xfsinfo 1.0.1 source which was lost in the conversion commit 905563e467618b21b4e2edcfae4416cc9f9470c9 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 4 19:06:31 2007 -0500 Add showfont 1.0.1 which was lost in the conversion commit 5e78ae1336b533c7d4a155c8920fcd0af77ecbfa Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 4 19:05:46 2007 -0500 Add sessreg 1.0.1 source which was lost in the conversion commit bdf0d4d4ba7c1da6207ff57b07fe0dcb74fcd053 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 4 19:04:44 2007 -0500 Add scripts 1.0.1 source which was lost in the conversion commit 40413944e68af767126302a9602cb3568d19ddc5 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 4 19:03:45 2007 -0500 Add luit 1.0.1 source which was lost in the conversion commit 5affac1621f1a12dbb185733eb8a6fbb04ce724b Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 4 19:02:41 2007 -0500 Add fslsfonts 1.0.1 source which was missed in the conversion commit 017f48457d846193ad64d4eed20e28805f0c3c87 Author: Julien Cristau [EMAIL PROTECTED] Date: Wed Nov 8 10:25:59 2006 + * Fix description of luit to refer to the libx11-data package instead of the obsolete xlibs-data. commit 4dbb8191a649ed05268e873308c5f3d2fd50cc7a Author: David Nusinow [EMAIL PROTECTED] Date: Tue Nov 7 04:07:16 2006 + Prepare changelog for upload commit 2b4469918190ad4db966e1cc87ed0cee5d265ec7 Author: Julien Cristau [EMAIL PROTECTED] Date: Mon Nov 6 05:42:40 2006 + * Add rgb to this package, as requested by David Madore [EMAIL PROTECTED] (closes: #389733). * Actually install fontname and fontprop without the .sh suffix, not in a subdir under /usr/bin (closes: #396507). * Fix path to locale.alias file in luit (closes: #369419). commit f21ee14b150a0975e13e1cf0eddbe1cc9a33a565 Author: Julien Cristau [EMAIL PROTECTED] Date: Mon Nov 6 03:03:44 2006 + * Add patch from upstream git to fix race condition in luit (closes: #291137). Thanks, Juliusz Chroboczek! commit 9f937ba9201a4adb11d040570ef3e90061a1735b Author: David Nusinow [EMAIL PROTECTED] Date: Sat Oct 14 17:36:47 2006 + Fix cracked out package version commit 3fa0847b8988cb78bb2981fc2d8568ca8bc001e5 Author: David Nusinow [EMAIL PROTECTED] Date: Sat Oct 14 17:25:39 2006 + * Remove the .sh suffix from fontname and fontprop commit b652a94f56862e385693aae4342afc8e646fcf4f Author: David Nusinow [EMAIL PROTECTED] Date: Sat Oct 14 17:21:27 2006 + Fix patch and remove autotools stuff we don't need commit 3e7774b933c2bbf1ae089e8eaf2918f294b3b4e8 Author: David Nusinow [EMAIL PROTECTED] Date: Sat Oct 14 16:51:05 2006 + * Internal directory name cleanup. This means we want a new .orig.tar.gz for cleanliness, so we do a minor version bump. This doesn't correspond to a new upstream release though. * Autoreconf to fix manpage suffix issues on non-linux platforms. Thanks Robert Millan and Michael Banck. Closes: #363481 commit 8d446c757ee209238a640b1b92edad3e8d9ed38e Author: David Nusinow [EMAIL PROTECTED] Date: Mon Jun 12 00:22:23 2006 + Prepare changelog for upload to unstable commit 49de4d75f35155d9cb84f9f70411b0902918dd40 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jun 11 23:43:29 2006 + * Add suggests on pdksh because the xauth_switch_to_sun-des-1 script is a ksh script. Document this requirement in the package description. commit 8429019766bfeb4af78ff1a4f9d61025abd5c48d Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jun 11 23:36:01 2006 + * Version and move x11-common to pre-depends from depends * Autoreconf all apps to fix manpage suffixes commit 92bf8e93a7cf8ed6bd1e4589bdaf1c97be3d1506 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jun 11 23:15:31 2006 + * Version pre-depends on x11-common * Bump policy version to 3.7.2.0 commit a561e66902d1662e2549a6a1e462fb30858072fb Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jun 11 23:11:52 2006 + * Bump debhelper compat to version 5 commit 626755db63ba6b0888100869f22a4d470c2f95fc Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jun 11 23:01:07 2006 + + We can drop the explicit shipping of rstart's commands in the .install file and just use a shell glob commit 7370c3daccb038147825cc2532ecd8cf6215b07d Author: David Nusinow [EMAIL PROTECTED] Date: Tue May 2 01:42:16 2006 + * Update rstart to version 1.0.2 commit d56e392a4cd13157d05ee4b3edd7a7a93baa63d0 Author: David Nusinow [EMAIL
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 [EMAIL PROTECTED]
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 [EMAIL PROTECTED] Wed, 16 May 2007 18:52:19 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] 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 [EMAIL PROTECTED], Branden Robinson [EMAIL
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED
x11-utils: Changes to 'debian-unstable'
debian/changelog |7
debian/control| 13
debian/patches/01_luit_fix_race_condition.diff| 146
++
debian/patches/02_xev_flush_standard_output.diff | 20 +
debian/patches/03_xvinfo_manpage_typo.diff| 13
debian/patches/04_xev_flush_standard_output.diff | 20 -
debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff | 68
debian/patches/07_xvinfo_manpage_typo.diff| 13
debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff | 68
debian/patches/series |8
10 files changed, 268 insertions(+), 108 deletions(-)
New commits:
commit db3583100b68ee51fefd55ad1739021655aba01e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 01:25:02 2007 +0300
debian/control: add Conflicts:/Replaces, description for luit.
debian/patches/series: option for luit patch.
diff --git a/debian/changelog b/debian/changelog
index 03f8c75..2a18106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ x11-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
+- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
+ xutils (=1:7.1.ds.3-1) to make upgrades smoother.
+- 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*
* debian/x11-utils.install, rules: Edit to reflect new
@@ -34,7 +37,7 @@ x11-utils (1) UNRELEASED; urgency=low
Also, add a patch for luit from xutils, and rename the patches to
start from 01.
- -- Timo Aaltonen [EMAIL PROTECTED] Fri, 18 May 2007 16:12:15 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 01:21:19 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3795564..0f8fd6f 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,12 @@ Package: x11-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: 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
+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
Suggests: mesa-utils
Description: X11 utilities
An X client is a program that interfaces with an X server (almost always via
@@ -49,6 +55,8 @@ Description: X11 utilities
This package provides a miscellaneous assortment of X utilities
that ship with the X Window System, including:
- appres, editres, listres and viewres, which query the X resource database;
+ - luit, a filter that can be run between an arbitrary application and a
+UTF-8 terminal emulator;
- xdpyinfo, a display information utility for X;
- xdriinfo, query configuration information of DRI drivers;
- xev, an X event displayer;
diff --git a/debian/patches/series b/debian/patches/series
index 5625030..962bb7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-01_luit_fix_race_condition.diff
+01_luit_fix_race_condition.diff -p0
02_xev_flush_standard_output.diff
03_xvinfo_manpage_typo.diff
04_xlsfonts_do_not_spew_usage_on_connection_error.diff
commit 0d43d3bee75173bedcc2ec3ed9c0dc89ff89ed23
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 18 16:14:02 2007 +0300
Add a patch for luit (from xutils), and rename them to start from 01.
debian/control: Edit the description.
diff --git a/debian/changelog b/debian/changelog
index aaf52c7..03f8c75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,10 @@ x11-utils (1) UNRELEASED; urgency=low
* 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] Wed, 16 May 2007 23:49:05 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Fri, 18 May 2007 16:12:15 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b4a3a90..3795564 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Description: X11 utilities
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
x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |5 -
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5227fac3918bdc9193c7b3401a64bef5cf07354d
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 01:32:29 2007 +0300
debian/control: add Conflicts/Replaces.
diff --git a/debian/changelog b/debian/changelog
index 8c6e808..4599ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Copy description from Ubuntu xkbutils-package.
+- 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 relate to
this package.
* debian/x11-xkb-utils.{dirs,install}, rules: Edit to reflect new
@@ -18,7 +21,7 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen [EMAIL PROTECTED] Wed, 16 May 2007 22:58:53 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 01:27:59 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6493148..8f8ad0f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0-1),
libxaw7-dev (= 1:1.0.1-1), libxkbfile-dev (= 1:1.0.1-1), quilt
+Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0-1),
+ libxaw7-dev (= 1:1.0.1-1), libxkbfile-dev (= 1:1.0.1-1), quilt
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -20,6 +21,8 @@ Package: x11-xkb-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: xbase-clients (= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
+Replaces: xbase-clients (= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
Description: X11 XKB utilities
xkbutils contains a number of client-side utilities for XKB, the X11
keyboard extension.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog |6
debian/control| 10
debian/patches/01_sessreg_implement_hostname_hashing.diff | 204 ++
debian/patches/02_xmodmap_manpage.diff| 13
debian/patches/17_xmodmap_manpage.diff| 13
debian/patches/series |3
6 files changed, 231 insertions(+), 18 deletions(-)
New commits:
commit 923173d4c1dca40738393854e54172720098c762
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 01:39:57 2007 +0300
debian/control: add Replaces/Conflicts plus other small changes.
debian/patches/series: add option to sessreg patch.
diff --git a/debian/changelog b/debian/changelog
index 3d02433..101169e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
+- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
+ xutils (=1:7.1.ds.3-1) to make upgrades smoother.
+- C/R: all the included packages to work around old Ubuntu packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rgb, sessreg missing*
* debian/x11-xserver-utils.install, rules: Edit to reflect new
@@ -30,9 +33,8 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
* debian/x11-xserver-utils.dirs: Remove.
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- *
- -- Timo Aaltonen [EMAIL PROTECTED] Thu, 17 May 2007 00:55:55 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 01:37:29 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d0a17a4..f5edb7a 100644
--- a/debian/control
+++ b/debian/control
@@ -35,12 +35,18 @@ Package: x11-xserver-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
-Description: miscellaneous X clients
+Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
+ iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
+ xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
+Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
+ iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
+ xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
+Description: X server utilities
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 Server utilities
that ship with the X Window System, including:
- iceauth, a tool for manipulating ICE protocol authorization records;
- rgb;
diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff
b/debian/patches/01_sessreg_implement_hostname_hashing.diff
new file mode 100644
index 000..69787a4
--- /dev/null
+++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff
@@ -0,0 +1,204 @@
+$Id: 085_sessreg_implement_hostname_hashing.diff 689 2005-10-19 22:11:30Z
dnusinow $
+
+The sessreg program assumes that hostnames in utmp entries are unique in
+the last four characters. When two entries are test:0 and fist:0, for
+example, this assumption fails.
+
+Rectify this problem by hashing the entire hostname field from the utmp
+entry, so that we can tell unlike hostnames apart with much greater
+reliability. There is still a possiblility of one hash collision in 2^32.
+
+This patch by Maximiliano Curia and Damián Viano, using a public-domain
+hash algorithm by Bob Jenkins.
+
+Not submitted to XFree86.
+
+Index: sessreg/sessreg.c
+===
+--- sessreg/sessreg.c.orig 2005-10-18 19:45:25.0 -0400
sessreg/sessreg.c 2005-10-18 21:36:02.0 -0400
+@@ -182,6 +182,18 @@
+ const char *host, Time_t date, int addp);
+ #endif
+
++#ifdef SYSV
++/* used for hashing ut_id */
++typedef unsigned long int ub4; /* unsigned 4-byte quantities */
++typedef unsigned char ub1; /* unsigned 1-byte quantities */
++
++#define hashsize(n) ((ub4)1(n))
++#define hashmask(n) (hashsize(n)-1)
++
++ub4 hash(register ub1 *k, register ub4 length, register ub4 initval);
++
++#endif
++
+ int wflag, uflag, lflag;
+ char *wtmp_file, *utmp_file, *line;
+ #ifdef USE_UTMPX
+@@ -469,21 +481,23 @@
+ bzero (u-ut_name, sizeof (u-ut_name));
+ #ifdef SYSV
+ if (line) {
+- int i;
+ /*
+- * this is a bit crufty, but
+- * follows the apparent conventions in
+- * the ttys file
xauth: Changes to 'debian-unstable'
debian/changelog |6 --
debian/control |2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4756bc8092258cd46b0233aba53c17ba4ab5028c
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 01:44:34 2007 +0300
debian/control: add Conflicts/Replaces.
diff --git a/debian/changelog b/debian/changelog
index b24fc74..4eea4ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
xauth (1:1.0.2-1) UNRELEASED; urgency=low
- * Split xbase-clients, new versioning using the module version.
+ * Split from xbase-clients, new versioning using the module version.
* debian/control:
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
+- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3) to make
+ upgrades smoother.
* debian/copyright: Leave only copyright notices that relate to
this package.
* debian/xauth.install, rules: Edit to reflect new packaging.
@@ -12,7 +14,7 @@ xauth (1:1.0.2-1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Remove.
- -- Timo Aaltonen [EMAIL PROTECTED] Thu, 17 May 2007 14:56:11 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 01:42:45 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 93c5ed4..a1d085e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Package: xauth
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: xbase-clients (= 1:7.2.ds2-3)
+Replaces: xbase-clients (= 1:7.2.ds2-3)
Suggests: pdksh
Description: X authentication utility
xauth is a small utility to read and manipulate Xauthority files, which
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xserver-utils: Changes to 'debian-unstable'
debian/rules |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12eae675d3812e0b41b8a94188bd568fd61cc986 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 19 01:48:44 2007 +0300 debian/rules: add '-Xrgb.txt' from xutils. diff --git a/debian/rules b/debian/rules index 98251e0..d11d712 100755 --- a/debian/rules +++ b/debian/rules @@ -85,7 +85,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp -Xrgb.txt --list-missing dh_installchangelogs dh_link dh_strip -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xsm: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |5 +
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 3b3b778bb2f578befa1d6b098106d03623d880dc
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 02:02:31 2007 +0300
debian/control: add Conflicts/Replaces.
diff --git a/debian/changelog b/debian/changelog
index 88f5d76..3c67c58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xsm (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
+- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
+ xutils (=1:7.1.ds.3-1) to make upgrades smoother.
+- C/R: smproxy to work around old Ubuntu packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rstart missing*
* debian/xsm.install, rules: Edit to reflect new packaging.
@@ -16,7 +19,7 @@ xsm (1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen [EMAIL PROTECTED] Thu, 17 May 2007 09:14:34 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 02:01:15 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8627172..6077dcf 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,8 @@ Package: xsm
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1), smproxy
+Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1), smproxy
Description: X session manager
This package provides the X session manager and related tools:
- rstart;
commit 18b5c313cead52b4bb09cb0bbd9e49baa46b1952
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Fri May 18 11:12:36 2007 +0300
debian/control: update description about rstart/rstartd (from xutils).
diff --git a/debian/control b/debian/control
index 125b6d6..8627172 100644
--- a/debian/control
+++ b/debian/control
@@ -24,3 +24,6 @@ Description: X session manager
- smproxy, a session manager proxy for X clients that do not use the X
session manager protocol;
- xsm, a session manager for X sessions;
+ Installation of an rsh or ssh daemon (server) is necessary if rstartd is
+ to be used, and installation of an rsh or ssh client is necessary if
+ rstart is to be used.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xfs-utils: Changes to 'debian-unstable'
debian/changelog |6 +-
debian/control |4
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit aa187529eae4987cfc46ff3824a74a3e05d2acd1
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 02:04:11 2007 +0300
debian/control: add Conflicts/Replaces.
diff --git a/debian/changelog b/debian/changelog
index ee5107f..5e67024 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,13 +10,17 @@ xfs-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Clean up the description.
+- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
+ xutils (=1:7.1.ds.3-1) to make upgrades smoother.
+- C/R: fslsfonts, fstobdf, showfont, xfsinfo to work around old Ubuntu
+ packaging.
* debian/copyright: Add fstobdf.
* debian/xfs-utils.dirs: Remove.
* debian/xfs-utils.install, rules: Edit to reflect new packaging.
* debian/local/: Remove.
* debian/patches: Remove.
- -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 00:19:43 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 00:48:41 +0300
xutils (1:7.1.ds.3-2) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 0109768..6331e97 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,10 @@ Package: xfs-utils
Architecture: any
Pre-Depends: x11-common (= 1:7.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, xfonts-utils, xutils-dev
+Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
+ fslsfonts, fstobdf, showfont, xfsinfo
+Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
+ fslsfonts, fstobdf, showfont, xfsinfo
Description: X font server utilities
xfs-utils provides a set of utility programs useful on a system that uses
a X font server.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-utils: Changes to 'debian-unstable'
debian/patches/series |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 10adf7b5b7ea17c39a244b2dc39231bd5e92aa78 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 19 02:13:43 2007 +0300 debian/patches/series: add option for xlsfonts patch. diff --git a/debian/patches/series b/debian/patches/series index 962bb7a..3c337e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 01_luit_fix_race_condition.diff -p0 02_xev_flush_standard_output.diff 03_xvinfo_manpage_typo.diff -04_xlsfonts_do_not_spew_usage_on_connection_error.diff +04_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xinit: Changes to 'debian-unstable'
debian/changelog |7 --
debian/control|2
debian/local/Xsession | 128 --
debian/local/Xsession.options |9 --
debian/local/xsession | 110
debian/xinit.install |2
6 files changed, 5 insertions(+), 253 deletions(-)
New commits:
commit d6542f512bc43d109e0775d706191b0469c981e7
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 01:58:12 2007 +0300
debian/control: add Conflicts/Replaces.
debian/local,xinit.install: remove xsession-files, leftovers from the
ubuntu package.
diff --git a/debian/changelog b/debian/changelog
index a1bdcec..127c3d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,16 +5,15 @@ xinit (1.0.2-1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
+- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3) to make
+ upgrades smoother.
* debian/copyright: Leave only copyright notices that relate to
this package.
* debian/xinit.install, rules: Edit to reflect new packaging.
* debian/xinit.dirs: Remove.
- * debian/local/: Add Xsession, Xsession.options and xsession from
-the Ubuntu package. Needs changing xorg.
-TODO: review the files.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen [EMAIL PROTECTED] Thu, 17 May 2007 15:34:56 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 01:55:32 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d689377..bc04d6f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Package: xinit
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: xbase-clients (= 1:7.2.ds2-3)
+Replaces: xbase-clients (= 1:7.2.ds2-3)
Description: X server initialisation tool
xinit and startx are programs which facilitate starting an X server, and
loading a base X session.
diff --git a/debian/local/Xsession b/debian/local/Xsession
deleted file mode 100755
index 85481ff..000
--- a/debian/local/Xsession
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# /etc/X11/Xsession
-#
-# global Xsession file -- used by display managers and xinit (startx)
-
-# $Id: Xsession 1507M 2004-09-13 07:36:26Z (local) $
-
-set -e
-
-PROGNAME=Xsession
-
-message () {
- # pretty-print messages of arbitrary length; use xmessage if it
- # is available and $DISPLAY is set
- MESSAGE=$PROGNAME: $*
- echo $MESSAGE | fold -s -w ${COLUMNS:-80} 2
- if [ -n $DISPLAY ] which xmessage /dev/null 21; then
-echo $MESSAGE | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
- fi
-}
-
-message_nonl () {
- # pretty-print messages of arbitrary length (no trailing newline); use
- # xmessage if it is available and $DISPLAY is set
- MESSAGE=$PROGNAME: $*
- echo -n $MESSAGE | fold -s -w ${COLUMNS:-80} 2;
- if [ -n $DISPLAY ] which xmessage /dev/null 21; then
-echo -n $MESSAGE | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
- fi
-}
-
-errormsg () {
- # exit script with error
- message $*
- exit 1
-}
-
-internal_errormsg () {
- # exit script with error; essentially a THIS SHOULD NEVER HAPPEN message
- # One big call to message() for the sake of xmessage; if we had two then
- # the user would have dismissed the error we want reported before seeing the
- # request to report it.
- errormsg $* \
- Please report the installed version of the \xfree86-common\ \
- package and the complete text of this error message to \
- debian-x@lists.debian.org.
-}
-
-run_parts () {
- # until run-parts --noexec is implemented
- if [ -z $1 ]; then
-internal_errormsg run_parts() called without an argument.
- fi
- if [ ! -d $1 ]; then
-internal_errormsg run_parts() called, but \$1\ does not exist or is \
- not a directory.
- fi
- for F in $(ls $1); do
-if expr $F : '[[:alnum:]_-]\+$' /dev/null 21; then
- if [ -f $1/$F ]; then
-echo $1/$F
- fi
-fi
- done
-}
-
-# initialize variables for use by all session scripts
-
-OPTIONFILE=/etc/X11/Xsession.options
-
-SYSRESOURCES=/etc/X11/Xresources
-USRRESOURCES=$HOME/.Xresources
-
-SYSSESSIONDIR=/etc/X11/Xsession.d
-USERXSESSION=$HOME/.xsession
-ALTUSERXSESSION=$HOME/.Xsession
-ERRFILE=$HOME/.xsession-errors
-
-# attempt to create an error file; abort if we cannot
-if touch $ERRFILE 2 /dev/null [ -w $ERRFILE ]
- [ ! -L $ERRFILE ]; then
- chmod 600 $ERRFILE
-elif ERRFILE=$(tempfile 2 /dev/null); then
- if ! ln -sf $ERRFILE ${TMPDIR:=/tmp}/xsession-$USER; then
-message warning: unable to symlink \$TMPDIR/xsession-$USER\ to \
- \$ERRFILE\; look for session log/errors in \
- \$TMPDIR/xsession-$USER\.
- fi
-else
- errormsg unable to create X session log/error file; aborting.
-fi
-
-exec
xauth: Changes to 'debian-unstable'
debian/rules | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit d75ef1dfdb0857bf82a3ec6a5db4827981383f11
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 02:58:01 2007 +0300
debian/rules: various fixes.
diff --git a/debian/rules b/debian/rules
index 6fe134d..db9f8cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# set this to the name of the main shlib's binary package
-PACKAGE = xauth
-
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
@@ -41,8 +38,8 @@ build-stamp:
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS=$(CFLAGS)
-MANCONF=/etc/manpath.config \
- $(MAKE)) || exit 1
+MANCONF=/etc/manpath.config
+ cd obj-$(DEB_BUILD_GNU_TYPE) $(MAKE) || exit 1
touch build-stamp
@@ -55,7 +52,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf *-obj-*
+ rm -rf obj-*
dh_clean
@@ -65,7 +62,7 @@ install: build
dh_clean -k
dh_installdirs
- cd -obj-$(DEB_BUILD_GNU_TYPE) $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd obj-$(DEB_BUILD_GNU_TYPE) $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
# Build architecture-dependent files here.
binary-arch: build install
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xfs-utils: Changes to 'debian-unstable'
debian/changelog |3
debian/rules |4
debian/xfs-utils.install |6
debian/xsfbs/xsfbs-autoreconf.mk | 150 ++
debian/xsfbs/xsfbs.mk| 379
debian/xsfbs/xsfbs.sh| 907 +++
debian/xutils.install| 22
7 files changed, 1446 insertions(+), 25 deletions(-)
New commits:
commit d11428820e8c7f9f9d09ef908c6f1208079445b1
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 03:06:27 2007 +0300
debian/{rules, xfs-utils.install}: remove old cruft.
diff --git a/debian/changelog b/debian/changelog
index 5e67024..f2ce2c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ xfs-utils (1) UNRELEASED; urgency=low
* debian/xfs-utils.install, rules: Edit to reflect new packaging.
* debian/local/: Remove.
* debian/patches: Remove.
+ * debian/rules: Comment out files from scripts/.
- -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 00:48:41 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 03:04:08 +0300
xutils (1:7.1.ds.3-2) UNRELEASED; urgency=low
diff --git a/debian/rules b/debian/rules
index 36c0d87..82fe7ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,8 +75,8 @@ install: build
cd $$FILE-obj-$(DEB_BUILD_GNU_TYPE) $(MAKE)
DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
- mv $(CURDIR)/debian/tmp/usr/bin/fontname.sh
$(CURDIR)/debian/tmp/usr/bin/fontname
- mv $(CURDIR)/debian/tmp/usr/bin/fontprop.sh
$(CURDIR)/debian/tmp/usr/bin/fontprop
+# mv $(CURDIR)/debian/tmp/usr/bin/fontname.sh
$(CURDIR)/debian/tmp/usr/bin/fontname
+# mv $(CURDIR)/debian/tmp/usr/bin/fontprop.sh
$(CURDIR)/debian/tmp/usr/bin/fontprop
# Build architecture-dependent files here.
binary-arch: build install
diff --git a/debian/xfs-utils.install b/debian/xfs-utils.install
new file mode 100644
index 000..95e52e7
--- /dev/null
+++ b/debian/xfs-utils.install
@@ -0,0 +1,6 @@
+usr/bin/fslsfonts
+usr/bin/showfont
+usr/bin/xfsinfo
+usr/share/man/man1/fslsfonts.1
+usr/share/man/man1/showfont.1
+usr/share/man/man1/xfsinfo.1
diff --git a/debian/xutils.install b/debian/xutils.install
deleted file mode 100644
index ecd2be8..000
--- a/debian/xutils.install
+++ /dev/null
@@ -1,22 +0,0 @@
-usr/bin/fslsfonts
-usr/bin/luit
-usr/bin/rstart
-usr/bin/rstartd
-usr/bin/xauth_switch_to_sun-des-1
-usr/bin/fontname
-usr/bin/fontprop
-usr/bin/xon
-usr/bin/sessreg
-usr/bin/showfont
-usr/bin/xfsinfo
-usr/bin/showrgb
-usr/share/man/man1/fslsfonts.1
-usr/share/man/man1/luit.1
-usr/share/man/man1/rstartd.1
-usr/share/man/man1/rstart.1
-usr/share/man/man1/xon.1
-usr/share/man/man1/sessreg.1
-usr/share/man/man1/showfont.1
-usr/share/man/man1/xfsinfo.1
-usr/share/man/man1/showrgb.1
-usr/lib/X11/rstart/*
commit d70b538077795bec1aaebd2ba87fb163e957ce56
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 03:00:56 2007 +0300
debian/xsfbs: import, xutils didn't have it.
diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
new file mode 100644
index 000..dce8fc8
--- /dev/null
+++ b/debian/xsfbs/xsfbs-autoreconf.mk
@@ -0,0 +1,150 @@
+#!/usr/bin/make -f
+# $Id$
+
+# Automagical conversion of autoreconf results into quilt patches.
+
+# Copyright 2006 Eugene Konev
+#
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or http://www.gnu.org/copyleft/gpl.txt.
+
+# The idea behind this is storing changes produced by autoreconf as a
+# separate patch on quilt stack (on top of stack actually).
+# The only usable target here is 'autoreconf`. Other targets are not
+# supposed to be called directly. DO NOT invoke them, unless you know what
+# you are doing.
+# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
+# were changed during patching (from upstream version or from previously
+# autoreconfed version) and call actual autoreconfing if they were.
+# The actual autoreconfing target (doautoreconf) WILL FAIL after
+# calling autoreconf and pushing changes into quilt stack by design. It
+# should never be invoked by automatic build process.
+# The proposed use is adding autoreconf into clean's prerequisites before
+# xsfclean like:
+# - clean: xsfclean
+# + clean: autoreconf xsfclean
+# This will ensure it is called when you build package with dpkg-buildpackage.
+
+# This dir will be used for producing diff of autoreconfed tree
+RECONF_DIR := xsfautoreconf
+
+# This files will be checked for changes
+RECONF_CHECKFILES += configure.ac Makefile.am
+
+# This files will not be hardlinked but copied
+RECONF_NOLINKFILES += aclocal.m4
+
+# This files/dirs will be pruned after autoreconf run
+RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
+
+# Internal target. Never invoke directly.
+stampdir_target+=check.md5sum
+$(STAMP_DIR)/check.md5sum:
+ dh_testdir
xinit: Changes to 'debian-unstable'
debian/changelog | 11 ++- debian/patches/03_debian_startx_manpage.diff | 77 +++ debian/patches/04_startx_paths.diff | 50 + debian/patches/05_use_bash.diff | 20 +++ debian/patches/09_debian_startx_manpage.diff | 77 --- debian/patches/12_startx_paths.diff | 50 - debian/patches/series|9 +-- debian/rules | 14 ++-- debian/xinit.install |2 9 files changed, 168 insertions(+), 142 deletions(-) New commits: commit 1781832f7cb5d45830957a91a0fe47c2c2370215 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 19 11:03:15 2007 +0300 debian/patches: add 05_use_bash.diff (LP: #31241) (Freedesktop: #4449), comment out the rest. debian/rules: install xserverrc here debian/xinit.install: fix diff --git a/debian/changelog b/debian/changelog index 127c3d7..07f0cb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,9 +11,14 @@ xinit (1.0.2-1) UNRELEASED; urgency=low this package. * debian/xinit.install, rules: Edit to reflect new packaging. * debian/xinit.dirs: Remove. - * debian/patches: Delete patches which do not relate to this package. - - -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 01:55:32 +0300 + * debian/patches: +- Delete patches which do not relate to this package. +- Comment out those that belong here, they seem to be applied + already. +- 05_use_bash.diff: fix a shell usage error (LP: #31241), + (Freedesktop: #4449) + + -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 10:55:03 +0300 xbase-clients (1:7.2.ds2-3) unstable; urgency=low diff --git a/debian/patches/05_use_bash.diff b/debian/patches/05_use_bash.diff new file mode 100644 index 000..aa4a546 --- /dev/null +++ b/debian/patches/05_use_bash.diff @@ -0,0 +1,20 @@ +Index: xinit/startx.cpp +=== +--- xinit.orig/startx.cpp 2007-05-19 10:14:49.0 +0300 xinit/startx.cpp 2007-05-19 10:15:15.0 +0300 +@@ -1,4 +1,4 @@ +-XCOMM!SHELL_CMD ++XCOMM!/bin/bash + + XCOMM $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ + XCOMM +Index: xinit/xinitrc.cpp +=== +--- xinit.orig/xinitrc.cpp 2007-05-19 10:15:24.0 +0300 xinit/xinitrc.cpp 2007-05-19 10:15:35.0 +0300 +@@ -1,4 +1,4 @@ +-XCOMM!SHELL_CMD ++XCOMM!/bin/bash + XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ + + XCOMM /etc/X11/xinit/xinitrc diff --git a/debian/patches/series b/debian/patches/series index 0bef68e..391785f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ #02_startx_hostname.diff #03_debian_startx_manpage.diff -p0 #04_startx_paths.diff +05_use_bash.diff diff --git a/debian/rules b/debian/rules index db9f8cc..b1cd566 100755 --- a/debian/rules +++ b/debian/rules @@ -64,6 +64,9 @@ install: build cd obj-$(DEB_BUILD_GNU_TYPE) $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + install -d debian/tmp/etc/X11/xinit + install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit + # Build architecture-dependent files here. binary-arch: build install dh_testdir diff --git a/debian/xinit.install b/debian/xinit.install index 84acd07..ac0f952 100644 --- a/debian/xinit.install +++ b/debian/xinit.install @@ -1,4 +1,4 @@ usr/bin/* usr/share/man/man1/* -debian/local/xserverrc etc/X11/xinit usr/lib/X11/xinit/xinitrc etc/X11/xinit +etc/X11/xinit/xserverrc commit 284a8dbcf4f9b70736220960b8363d2ac73b0c49 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 19 10:26:16 2007 +0300 debian/rules: modify so it works. debian/patches/*: renumber the patches, comment out from series as they are all applied already. diff --git a/debian/patches/03_debian_startx_manpage.diff b/debian/patches/03_debian_startx_manpage.diff new file mode 100644 index 000..4039218 --- /dev/null +++ b/debian/patches/03_debian_startx_manpage.diff @@ -0,0 +1,77 @@ +$Id: 902_debian_startx_manpage.diff 867 2005-11-13 16:29:11Z dnusinow $ + +Fix the startx manpage to be more correct for our setup; this patch by Branden +Robinson. + +Index: xinit/startx.man +=== +--- xinit/startx.man.orig 2005-11-12 16:31:16.0 -0500 xinit/startx.man 2005-11-13 11:00:34.0 -0500 +@@ -74,6 +74,28 @@ + .RE + #ifdef __SCOMAN__ + .PP ++Note that in the Debian system, what many people traditionally put in the ++.I .xinitrc ++file should go in ++.I .xsession ++instead; this permits the same X environment to be presented whether ++.IR startx , ++.IR xdm , ++or ++.I xinit ++is used to start the X session. All discussion of the ++.I .xinitrc ++file in the ++.IR xinit (1) ++manual
xsm: Changes to 'debian-unstable'
debian/changelog |6 +++--- debian/xsm.install |1 + 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 27de21594cbb14c8871e06231883903f042f44f4 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 19 11:48:09 2007 +0300 change versioning to match xsm version. add missing files to xsm.install. diff --git a/debian/changelog b/debian/changelog index 3c67c58..d5e969c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -xsm (1) UNRELEASED; urgency=low +xsm (1:1.0.1-1) UNRELEASED; urgency=low - * Split xbase-clients, new versioning. + * Split xbase-clients, new versioning using the xsm module version. * Included packages: - rstart 1.0.2 - smproxy 1.0.2 @@ -19,7 +19,7 @@ xsm (1) UNRELEASED; urgency=low * debian/local/: Remove. * debian/patches: Delete patches which do not relate to this package. - -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 02:01:15 +0300 + -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 11:08:44 +0300 xbase-clients (1:7.2.ds2-3) unstable; urgency=low diff --git a/debian/xsm.install b/debian/xsm.install index bdddeec..7eeaca4 100644 --- a/debian/xsm.install +++ b/debian/xsm.install @@ -2,3 +2,4 @@ usr/bin/* usr/share/man/man1/* usr/lib/X11/xsm/system.xsm etc/X11/app-defaults/* +usr/lib/X11/rstart/* -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xfs-utils: Changes to 'debian-unstable'
debian/changelog |8
debian/control |6 +++---
debian/rules |2 +-
debian/x11-xfs-utils.install |2 ++
debian/xfs-utils.install |6 --
5 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit 2cffe2bc1297ad8d81962ea5dd14680d3be03d62
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 11:51:42 2007 +0300
rename to x11-xfs-utils to minimize the chance of confusion with xfs the
filesystem.
x11-xfs-utils.install: rename, and modify so that every package gets
installed.
diff --git a/debian/changelog b/debian/changelog
index f2ce2c8..a820bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfs-utils (1) UNRELEASED; urgency=low
+x11-xfs-utils (1) UNRELEASED; urgency=low
* Split xbase-clients/xutils, new versioning.
* Included packages:
@@ -15,13 +15,13 @@ xfs-utils (1) UNRELEASED; urgency=low
- C/R: fslsfonts, fstobdf, showfont, xfsinfo to work around old Ubuntu
packaging.
* debian/copyright: Add fstobdf.
- * debian/xfs-utils.dirs: Remove.
- * debian/xfs-utils.install, rules: Edit to reflect new packaging.
+ * debian/x11-xfs-utils.dirs: Remove.
+ * debian/x11-xfs-utils.install, rules: Edit to reflect new packaging.
* debian/local/: Remove.
* debian/patches: Remove.
* debian/rules: Comment out files from scripts/.
- -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 03:04:08 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 11:48:38 +0300
xutils (1:7.1.ds.3-2) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 6331e97..e9adf3c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: xfs-utils
+Source: x11-xfs-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force debian-x@lists.debian.org
@@ -6,7 +6,7 @@ Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson
[EMAIL PROTECTED]
Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0),
libfs-dev (= 2:1.0.0)
Standards-Version: 3.7.2.0
-Package: xfs-utils
+Package: x11-xfs-utils
Architecture: any
Pre-Depends: x11-common (= 1:7.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, xfonts-utils, xutils-dev
@@ -15,7 +15,7 @@ Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (=
1:7.1.ds.3-1),
Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
fslsfonts, fstobdf, showfont, xfsinfo
Description: X font server utilities
- xfs-utils provides a set of utility programs useful on a system that uses
+ x11-xfs-utils provides a set of utility programs useful on a system that uses
a X font server.
.
The programs in this package include:
diff --git a/debian/rules b/debian/rules
index 82fe7ed..3a8faca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
#export DH_VERBOSE=1
# set this to the name of the main shlib's binary package
-PACKAGE = xfs-utils
+PACKAGE = x11-xfs-utils
include debian/xsfbs/xsfbs.mk
diff --git a/debian/x11-xfs-utils.install b/debian/x11-xfs-utils.install
new file mode 100644
index 000..68671de
--- /dev/null
+++ b/debian/x11-xfs-utils.install
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/share/man/man1/*
diff --git a/debian/xfs-utils.install b/debian/xfs-utils.install
deleted file mode 100644
index 95e52e7..000
--- a/debian/xfs-utils.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/fslsfonts
-usr/bin/showfont
-usr/bin/xfsinfo
-usr/share/man/man1/fslsfonts.1
-usr/share/man/man1/showfont.1
-usr/share/man/man1/xfsinfo.1
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson [EMAIL PROTECTED](none)
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to
it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau [EMAIL PROTECTED]
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides
x11-xfs-utils: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits:
commit 2cffe2bc1297ad8d81962ea5dd14680d3be03d62
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 11:51:42 2007 +0300
rename to x11-xfs-utils to minimize the chance of confusion with xfs the
filesystem.
x11-xfs-utils.install: rename, and modify so that every package gets
installed.
commit 65386cf6ea1a65e89fba78b32770f1876379f5f1
Merge: d11428820e8c7f9f9d09ef908c6f1208079445b1
271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 09:31:14 2007 +0300
Merge branch 'debian-unstable' of git://git.debian.org/git/pkg-xorg/xsfbs
into debian-unstable
commit d11428820e8c7f9f9d09ef908c6f1208079445b1
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 03:06:27 2007 +0300
debian/{rules, xfs-utils.install}: remove old cruft.
commit d70b538077795bec1aaebd2ba87fb163e957ce56
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 03:00:56 2007 +0300
debian/xsfbs: import, xutils didn't have it.
commit aa187529eae4987cfc46ff3824a74a3e05d2acd1
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 02:04:11 2007 +0300
debian/control: add Conflicts/Replaces.
commit 58ff550cfb6af91a016aeb4d93b909fbd98e1143
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 00:38:09 2007 +0300
Split xbase-clients/xutils, new versioning.
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson [EMAIL PROTECTED](none)
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to
it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau [EMAIL PROTECTED]
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow [EMAIL PROTECTED]
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver - serverminver rename
commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow [EMAIL PROTECTED]
Date: Wed Feb 28 23:08:17 2007 -0500
Fix typo that prevented the input abi versioning from working.
Good catch Julien
commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow [EMAIL PROTECTED]
Date: Tue Feb 27 21:50:20 2007 -0500
Add support for X server input ABI versioning
commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow [EMAIL PROTECTED]
Date: Wed Feb 21 22:47:30 2007 -0500
Fix name of serverminver
commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow [EMAIL PROTECTED]
Date: Wed Feb 21 21:37:52 2007 -0500
Update serverabi generation to also account for driver Provides
* Have the drivers use the file serverminver instead of serverabiver in
order
to generate the versioned dependency on the server. This is clearer
naming.
* Use serverabiver to actually store the server's video ABI version. This
is used to generate the Provides: line for drivers so the server can
depend on them properly. This goes in to the substvar
xviddriver:Provides.
commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau [EMAIL PROTECTED]
Date: Sat Feb 17 16:01:41 2007 +0100
Add new serverabi rule to generate drivers dependency on the server.
commit 502f9412dcaa6abd23b94372d86824c895cea3b8
Author: David Nusinow [EMAIL PROTECTED]
Date: Sun Feb 4 20:43:28 2007 -0500
Move the files so they'll be put in debian/xsfbs automatically when pulled
in to our git repos
commit d4027f3605f6f9cea4ec15d71f8388b0d92197e5
Author: David Nusinow [EMAIL PROTECTED]
Date: Sun Feb 4 19:07:17 2007 -0500
Add xfsinfo 1.0.1 source which was lost in the conversion
commit 905563e467618b21b4e2edcfae4416cc9f9470c9
Author: David Nusinow [EMAIL PROTECTED]
Date: Sun Feb 4 19:06:31 2007 -0500
Add showfont 1.0.1 which was lost in the conversion
commit 5e78ae1336b533c7d4a155c8920fcd0af77ecbfa
Author: David Nusinow [EMAIL PROTECTED]
Date: Sun Feb 4 19:05:46 2007 -0500
Add sessreg 1.0.1 source which was lost in the conversion
commit bdf0d4d4ba7c1da6207ff57b07fe0dcb74fcd053
Author: David Nusinow [EMAIL PROTECTED]
Date: Sun Feb 4 19:04:44 2007 -0500
Add scripts 1.0.1 source which was lost in the conversion
commit 40413944e68af767126302a9602cb3568d19ddc5
Author: David Nusinow [EMAIL PROTECTED]
Date: Sun Feb 4 19:03:45 2007 -0500
Add luit 1.0.1 source which was lost in the conversion
commit 5affac1621f1a12dbb185733eb8a6fbb04ce724b
Author: David Nusinow [EMAIL PROTECTED]
Date: Sun Feb 4 19:02:41 2007 -0500
Add fslsfonts 1.0.1 source which was missed in the conversion
commit 017f48457d846193ad64d4eed20e28805f0c3c87
Author: Julien Cristau [EMAIL PROTECTED
x11-apps: Changes to 'debian-unstable'
debian/changelog |5 ++---
debian/control |3 ---
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 13a7a180651337a5ab119f8f90546f962f529903
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 14:02:09 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index b778d2c..bf93220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,9 +25,8 @@ x11-apps (1) UNRELEASED; urgency=low
- 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.
+- Replaces: xbase-clients (= 1:7.2.ds2-3) to make upgrades smoother.
+- 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.
diff --git a/debian/control b/debian/control
index 6913d19..87fb751 100644
--- a/debian/control
+++ b/debian/control
@@ -37,9 +37,6 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
Suggests: mesa-utils
-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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-utils: Changes to 'debian-unstable'
debian/changelog |7 ---
debian/control |3 ---
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit b5f50c8b7ae90974077beafb5d0552a6c00bf52e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 14:06:23 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index 2a18106..abcfc2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,9 +24,10 @@ x11-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
-- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
- xutils (=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R: all the included packages to work around old Ubuntu packaging.
+- 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
+ packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*luit missing*
* debian/x11-utils.install, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index 0f8fd6f..1832cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -40,9 +40,6 @@ Package: x11-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
-Conflicts: 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
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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog |6 +++---
debian/control |1 -
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 9019e9079b7f2ec6cd1c8e17eb82003afa892799
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 14:08:52 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index 4599ff7..e963c29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,9 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Copy description from Ubuntu xkbutils-package.
-- 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.
+- Replaces: xbase-clients (= 1:7.2.ds2-3) to make upgrades smoother.
+- Replaces: all the included packages to work around old Ubuntu
+ packaging.
* debian/copyright: Leave only copyright notices that relate to
this package.
* debian/x11-xkb-utils.{dirs,install}, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index 8f8ad0f..aaa471c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Package: x11-xkb-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
-Conflicts: xbase-clients (= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
Replaces: xbase-clients (= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
Description: X11 XKB utilities
xkbutils contains a number of client-side utilities for XKB, the X11
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xfs-utils: Changes to 'debian-unstable'
debian/changelog |8
debian/control |2 --
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit f0e9da4a6bc97935148e81da9418b918fd15a66e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 14:07:34 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index a820bf1..a1e22fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,10 @@ x11-xfs-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Clean up the description.
-- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
- xutils (=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R: fslsfonts, fstobdf, showfont, xfsinfo to work around old Ubuntu
- packaging.
+- Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (=1:7.1.ds.3-1)
+ to make upgrades smoother.
+- Replaces: fslsfonts, fstobdf, showfont, xfsinfo to work around old
+ Ubuntu packaging.
* debian/copyright: Add fstobdf.
* debian/x11-xfs-utils.dirs: Remove.
* debian/x11-xfs-utils.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index e9adf3c..89752f3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,6 @@ Package: x11-xfs-utils
Architecture: any
Pre-Depends: x11-common (= 1:7.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, xfonts-utils, xutils-dev
-Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
- fslsfonts, fstobdf, showfont, xfsinfo
Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
fslsfonts, fstobdf, showfont, xfsinfo
Description: X font server utilities
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog |7 ---
debian/control |3 ---
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 6e1e2a7e1be922bea95398bae71c1329e8a71478
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 14:10:14 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index 101169e..9284755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,9 +23,10 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
-- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
- xutils (=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R: all the included packages to work around old Ubuntu packaging.
+- 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
+ packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rgb, sessreg missing*
* debian/x11-xserver-utils.install, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index f5edb7a..6023ee1 100644
--- a/debian/control
+++ b/debian/control
@@ -35,9 +35,6 @@ Package: x11-xserver-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
-Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
- iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
- xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xauth: Changes to 'debian-unstable'
debian/changelog |3 +--
debian/control |1 -
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 3d445fddff15ea7e108ba577f44df5b3853976e3
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 14:12:22 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index 4eea4ba..668413d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,7 @@ xauth (1:1.0.2-1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
-- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3) to make
- upgrades smoother.
+- Replaces: xbase-clients (= 1:7.2.ds2-3) to make upgrades smoother.
* debian/copyright: Leave only copyright notices that relate to
this package.
* debian/xauth.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index a1d085e..2002144 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Package: xauth
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
-Conflicts: xbase-clients (= 1:7.2.ds2-3)
Replaces: xbase-clients (= 1:7.2.ds2-3)
Suggests: pdksh
Description: X authentication utility
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xinit: Changes to 'debian-unstable'
debian/changelog |3 +--
debian/control |1 -
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit e131349a9302c9a1f25d287ccc1f766cd3f594dc
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 14:15:50 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index 07f0cb3..1f0030c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,7 @@ xinit (1.0.2-1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
-- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3) to make
- upgrades smoother.
+- Replaces: xbase-clients (= 1:7.2.ds2-3) to make upgrades smoother.
* debian/copyright: Leave only copyright notices that relate to
this package.
* debian/xinit.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index bc04d6f..010ffcc 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Package: xinit
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
-Conflicts: xbase-clients (= 1:7.2.ds2-3)
Replaces: xbase-clients (= 1:7.2.ds2-3)
Description: X server initialisation tool
xinit and startx are programs which facilitate starting an X server, and
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xsm: Changes to 'debian-unstable'
debian/changelog |6 +++---
debian/control |1 -
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 7a56d4384905af01ec3f302a315993cb05a1791b
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat May 19 14:17:27 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index d5e969c..3460947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,9 +9,9 @@ xsm (1:1.0.1-1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
-- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
- xutils (=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R: smproxy to work around old Ubuntu packaging.
+- Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (=1:7.1.ds.3-1)
+ to make upgrades smoother.
+- Replaces: smproxy to work around old Ubuntu packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rstart missing*
* debian/xsm.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index 6077dcf..b5594f0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Package: xsm
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
-Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1), smproxy
Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1), smproxy
Description: X session manager
This package provides the X session manager and related tools:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: preliminary packaging for xbase-clients split done
On Thu, 17 May 2007, Timo Aaltonen wrote: poke at will! * http://users.tkk.fi/~tjaalton/xbase-clients-split.txt The packages are now in a buildable shape, and also upgrades _should_ work without issues. I'll test upgrades next week, and after that they could be uploaded to experimental. Please note that the following packages have been dropped from the bundles. If they are still needed, please let me know. # xbase-clients beforelight bitmap ico will be dropped by upstream? xdbedizzy will be dropped by upstream? xf86dga xgc will be dropped by upstream? # xutils scripts (includes xon) t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog |4 ++--
debian/control |6 --
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit ad6e57b05d464a54e2abf39b47dad316b99baf99
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Tue May 22 12:13:19 2007 +0300
Conflict with the ubuntu packages to force removal on upgrade.
Add xrgb and xsetpointer to the C/R list.
diff --git a/debian/changelog b/debian/changelog
index 9284755..e44f19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ x11-xserver-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:*rgb, sessreg missing*
@@ -35,7 +35,7 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 01:37:29 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Tue, 22 May 2007 12:00:41 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6023ee1..8fc2bc9 100644
--- a/debian/control
+++ b/debian/control
@@ -35,9 +35,11 @@ Package: x11-xserver-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh,
xrgb, xset,
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
- iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
- xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
+ iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
Description: X server utilities
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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-apps: Changes to 'debian-unstable'
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.orig2006-07-11 04:53:33.0 +0200
-+++ xlsfonts/dsimple.c 2007-02-11 08:14:45.0 +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.0 +0100
-+++ xprop/dsimple.c2007-02-11 08:15:40.0 +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
x11-utils: Changes to 'debian-unstable'
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.0 +0100
-+++ xwd/dsimple.c 2007-02-11 08:16:10.0 +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.orig2007-02-11 08:16:29.0 +0100
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xfs-utils: Changes to 'debian-unstable'
debian/changelog |4 ++--
debian/control |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6a2f197fef236493ac971f8d21a1e4aeff641c15
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Tue May 22 12:35:59 2007 +0300
Conflict with the ubuntu packages to force removal on upgrade.
diff --git a/debian/changelog b/debian/changelog
index a1e22fb..1eecdec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ x11-xfs-utils (1) UNRELEASED; urgency=low
- Clean up the description.
- Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (=1:7.1.ds.3-1)
to make upgrades smoother.
-- Replaces: fslsfonts, fstobdf, showfont, xfsinfo to work around old
+- C/R: fslsfonts, fstobdf, showfont, xfsinfo to work around old
Ubuntu packaging.
* debian/copyright: Add fstobdf.
* debian/x11-xfs-utils.dirs: Remove.
@@ -21,7 +21,7 @@ x11-xfs-utils (1) UNRELEASED; urgency=low
* debian/patches: Remove.
* debian/rules: Comment out files from scripts/.
- -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 11:48:38 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Tue, 22 May 2007 12:34:17 +0300
xutils (1:7.1.ds.3-2) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 89752f3..01bfe02 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Package: x11-xfs-utils
Architecture: any
Pre-Depends: x11-common (= 1:7.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, xfonts-utils, xutils-dev
+Conflicts: fslsfonts, fstobdf, showfont, xfsinfo
Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
fslsfonts, fstobdf, showfont, xfsinfo
Description: X font server utilities
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog |4 ++--
debian/control |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 58e9c2464cdc3b02755e6ca160abd862daf9ae15
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Tue May 22 12:41:13 2007 +0300
Conflict with the ubuntu packages to force removal on upgrade.
diff --git a/debian/changelog b/debian/changelog
index e963c29..2e90e19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
- Remove unnecessary Build-Deps.
- Copy description from Ubuntu xkbutils-package.
- 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 relate to
this package.
@@ -21,7 +21,7 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 01:27:59 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Tue, 22 May 2007 12:40:12 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index aaa471c..7e856f9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: x11-xkb-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
Replaces: xbase-clients (= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
Description: X11 XKB utilities
xkbutils contains a number of client-side utilities for XKB, the X11
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xsm: Changes to 'debian-unstable'
debian/changelog |4 ++--
debian/control |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2c36dace5f13c1788fd7d7b589adb01d68b7
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Tue May 22 12:44:32 2007 +0300
Conflict with smproxy to force removal on upgrade (ubuntu).
diff --git a/debian/changelog b/debian/changelog
index 3460947..901636b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ xsm (1:1.0.1-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: smproxy to work around old Ubuntu packaging.
+- C/R: smproxy to work around old Ubuntu packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rstart missing*
* debian/xsm.install, rules: Edit to reflect new packaging.
@@ -19,7 +19,7 @@ xsm (1:1.0.1-1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen [EMAIL PROTECTED] Sat, 19 May 2007 11:08:44 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Tue, 22 May 2007 12:43:15 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b5594f0..cfc9faf 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Package: xsm
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: smproxy
Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1), smproxy
Description: X session manager
This package provides the X session manager and related tools:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-apps: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0f4d1a969898ff6599db578fa96f5516361f45d1 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 26 09:55:32 2007 +0300 Start versioning from 0.1 diff --git a/debian/changelog b/debian/changelog index 46d1e65..56e1ae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-apps (1) UNRELEASED; urgency=low +x11-apps (0.1) UNRELEASED; urgency=low * Split xbase-clients, new versioning. * Included packages: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-utils: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c1c7e181d2063bc107e24a588afac75a9be5e37 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 26 09:57:03 2007 +0300 Start versioning from 0.1 diff --git a/debian/changelog b/debian/changelog index 1fb81bb..77cfed5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-utils (1) UNRELEASED; urgency=low +x11-utils (0.1) UNRELEASED; urgency=low * Split xbase-clients, new versioning. * Included packages: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xfs-utils: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ea9859690b53e45c8b1f96df2a24074fb96297dd Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 26 09:59:10 2007 +0300 Start versioning from 0.1 diff --git a/debian/changelog b/debian/changelog index 1eecdec..f772ab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-xfs-utils (1) UNRELEASED; urgency=low +x11-xfs-utils (0.1) UNRELEASED; urgency=low * Split xbase-clients/xutils, new versioning. * Included packages: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 25a761236d54569e421b3fd5ccdc50e04b5d57f8 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 26 09:59:45 2007 +0300 Start versioning from 0.1 diff --git a/debian/changelog b/debian/changelog index 2e90e19..d5a14ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-xkb-utils (1) UNRELEASED; urgency=low +x11-xkb-utils (0.1) UNRELEASED; urgency=low * Split xbase-clients, new versioning. * Included packages: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b08782e35d5d095eba17f96f2e92f430c75c1fc7 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat May 26 10:00:47 2007 +0300 Start versioning from 0.1 diff --git a/debian/changelog b/debian/changelog index e44f19a..34a64fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-xserver-utils (1) UNRELEASED; urgency=low +x11-xserver-utils (0.1) UNRELEASED; urgency=low * Split xbase-clients, new versioning. * Included packages: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xutils-dev: Changes to 'debian-unstable'
debian/changelog |8
debian/control |3 +++
2 files changed, 11 insertions(+)
New commits:
commit 2357376b8e0f5da61c09ec2ee0b60814be2e40d6
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Mon Jun 4 12:36:00 2007 +0300
debian/control: add C/R/P for imake/makedepend/xorg-build-macros/xmkmf to
allow Ubuntu to sync this in future.
The change can be dropped after the next LTS release.
diff --git a/debian/changelog b/debian/changelog
index 681ba44..cb4105b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xutils-dev (1:7.2.ds2-2) UNRELEASED; urgency=low
+
+ * debian/control:
+- C/R/P: imake, makedepend, xorg-build-macros, xmkmf
+ Change from ubuntu to help upgrades from their earlier releases.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Mon, 4 Jun 2007 12:12:41 +0300
+
xutils-dev (1:7.2.ds2-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 910103e..3a0acc2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,9 @@ Package: xutils-dev
Architecture: any
Pre-Depends: x11-common (= 1:7.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
+Conflicts: imake (= 1:1.0.1-1), makedepend (= 1:1.0.0-1), xorg-build-macros
(= 1.0.1-1), xmkmf (= 0.99.0-6)
+Replaces: imake (= 1:1.0.1-1), makedepend (= 1:1.0.0-1), xorg-build-macros
(= 1.0.1-1), xmkmf (= 0.99.0-6)
+Provides: imake, makedepend, xorg-build-macros, xmkmf
Description: X Window System utility programs for development
xutils-dev provides a set of utility programs shipped with the X Window System
that do not require the X libraries; many of these programs are useful
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-session-utils: Changes to 'debian-unstable'
debian/changelog |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 2224fe9e1fb44c4d30409a7bf0b407b3b1907cd7 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Sat Jun 9 00:59:29 2007 +0300 Rename as x11-session-utils to be in line with the other bundled packages. Start versioning from 0.1 for now. diff --git a/debian/changelog b/debian/changelog index 901636b..2cec160 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -xsm (1:1.0.1-1) UNRELEASED; urgency=low +x11-session-utils (0.1) UNRELEASED; urgency=low - * Split xbase-clients, new versioning using the xsm module version. + * Split xbase-clients, new versioning. * Included packages: - rstart 1.0.2 - smproxy 1.0.2 @@ -19,7 +19,7 @@ xsm (1:1.0.1-1) UNRELEASED; urgency=low * debian/local/: Remove. * debian/patches: Delete patches which do not relate to this package. - -- Timo Aaltonen [EMAIL PROTECTED] Tue, 22 May 2007 12:43:15 +0300 + -- Timo Aaltonen [EMAIL PROTECTED] Sat, 9 Jun 2007 00:49:43 +0300 xbase-clients (1:7.2.ds2-3) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11-session-utils: Changes to 'debian-unstable'
debian/changelog |4 ++--
debian/control | 14 +++---
debian/rules |2 +-
debian/x11-session-utils.install |5 +
debian/xsm.install |5 -
5 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 4aecc282a816564154fdccc8ba4cbfd94a811ca0
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Sat Jun 9 01:59:16 2007 +0300
Add xsm to Conflicts/Replaces to allow upgrades on Ubuntu.
Also, fix various files due to the renaming.
diff --git a/debian/changelog b/debian/changelog
index 2cec160..749378f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ x11-session-utils (0.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.
-- C/R: smproxy to work around old Ubuntu packaging.
+- C/R: smproxy, xsm to work around old Ubuntu packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rstart missing*
* debian/xsm.install, rules: Edit to reflect new packaging.
@@ -19,7 +19,7 @@ x11-session-utils (0.1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen [EMAIL PROTECTED] Sat, 9 Jun 2007 00:49:43 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED] Sat, 9 Jun 2007 01:49:06 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cfc9faf..04db65b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: xsm
+Source: x11-session-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force debian-x@lists.debian.org
@@ -11,16 +11,16 @@ Build-Depends: debhelper (= 5.0.0), pkg-config,
libxaw7-dev (= 1:1.0.1-1), lib
# smproxy: libxt-dev, libxmu-dev
# xsm: openssh-client | ssh, libxaw7-dev, libxt-dev
Standards-Version: 3.7.2.0
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xsm
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xsm.git
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git
-Package: xsm
+Package: x11-session-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (= 1:7.0.0)
-Conflicts: smproxy
-Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1), smproxy
-Description: X session manager
+Conflicts: smproxy, xsm (= 1:1.0.1-1)
+Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1), smproxy,
xsm (= 1:1.0.1-1)
+Description: X session utilities
This package provides the X session manager and related tools:
- rstart;
- smproxy, a session manager proxy for X clients that do not use the X
diff --git a/debian/rules b/debian/rules
index b86288f..2018fec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
#export DH_VERBOSE=1
# set this to the name of the main shlib's binary package
-PACKAGE = xbase-clients
+PACKAGE = x11-session-utils
include debian/xsfbs/xsfbs.mk
diff --git a/debian/x11-session-utils.install b/debian/x11-session-utils.install
new file mode 100644
index 000..7eeaca4
--- /dev/null
+++ b/debian/x11-session-utils.install
@@ -0,0 +1,5 @@
+usr/bin/*
+usr/share/man/man1/*
+usr/lib/X11/xsm/system.xsm
+etc/X11/app-defaults/*
+usr/lib/X11/rstart/*
diff --git a/debian/xsm.install b/debian/xsm.install
deleted file mode 100644
index 7eeaca4..000
--- a/debian/xsm.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/*
-usr/share/man/man1/*
-usr/lib/X11/xsm/system.xsm
-etc/X11/app-defaults/*
-usr/lib/X11/rstart/*
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
X11R7.2
Hi! Seems that you are uploading x.org R7.2 to experimental as I write, nice :) For some strange reason I started to update the Ubuntu xorg-stuff two nights ago, and I spent most of yesterday merging xserver-xorg. So, in order to avoid duplicate effor I've put xorg-server here for you to take a look: http://users.tkk.fi/~tjaalton/xorg72/ I hope it makes it easy for you to cherry pick what you find useful.. (note that I haven't even built it yet) -- ps. a question about mesa; what makes the diff so big, does it have some extra sources merged? I haven't found any reference as in what it might be.. pps. I should've checked the ml earlier, since git.debian.org isn't exactly realtime :) t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: X11R7.2
On Fri, 9 Feb 2007, Julien Cristau wrote: On Fri, Feb 9, 2007 at 17:02:46 +0200, Timo Aaltonen wrote: Hi! Seems that you are uploading x.org R7.2 to experimental as I write, nice :) For some strange reason I started to update the Ubuntu xorg-stuff two nights ago, and I spent most of yesterday merging xserver-xorg. So, in order to avoid duplicate effor I've put xorg-server here for you to take a look: http://users.tkk.fi/~tjaalton/xorg72/ I hope it makes it easy for you to cherry pick what you find useful.. (note that I haven't even built it yet) Thanks, I'll have a look. Note that xorg-server 1.2.0 is in the debian-experimental branch at git.d.o. Ok, pity that I couldn't find it :) Do you have any time estimate when it might hit experimental? ps. a question about mesa; what makes the diff so big, does it have some extra sources merged? I haven't found any reference as in what it might be.. Apparently there's lots of files in the upstream git repo which aren't in the tarballs, so since we merged our repo with freedesktop.org this stuff got added. I removed some of it, but the rest still shows up in the debian diff. I see, that makes sense. It was just frightening to see a 2.5MB diff at first ;) It's nice that mesa uses quilt now, btw. t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: X11R7.2
On Fri, 9 Feb 2007, Julien Cristau wrote: Ok, pity that I couldn't find it :) Do you have any time estimate when it might hit experimental? I'm in the process of testing it here, I'll hopefully upload it later tonight. Cool! I'm testing 7.2 as well.. I see, that makes sense. It was just frightening to see a 2.5MB diff at first ;) It's nice that mesa uses quilt now, btw. Yeah, the credit for the new mesa packaging is all Thierry's :) hats off to Thierry :) t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xbase-clients split in the works?
Howdy There seem to be three separate bug-reports open about splitting xbase-clients up (*). Do you have plans to do so after etch is released? For historical reasons (which I know nothing about) Ubuntu has had separate packages for most of xbase-clients, with the exception of xfonts-utils (bdftopcf, font-util, mkfontdir, mkfontscale) and xkbutils (setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils). Since xorg is modular now, all those components could be separate packages (most of which are updated very rarely) and then have meta-packages to bundle them up. Meta-packages could use categories like suggested in bug 332521. How does that sound? Sure, that would mean having ~65 more packages to work on, but that would make better use of modular X :) * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=151613 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=199675 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=332521 t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: xbase-clients split in the works?
On Sat, 10 Feb 2007, Timo Aaltonen wrote: For historical reasons (which I know nothing about) Ubuntu has had separate packages for most of xbase-clients, with the exception of xfonts-utils (bdftopcf, font-util, mkfontdir, mkfontscale) and xkbutils (setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils). kfonts-utils is also in Debian since ages, sorry for being ignorant ;) t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: xbase-clients split in the works?
If you want to clone our git repo and do the split yourself, and put the split repo up somewhere that we can look at it, you're welcome to do so. If it's good, we'll pull your version and use it. I tried to clone the repo, but is the url on the Wiki wrong? git clone http://alioth.debian.org/git/pkg-xorg/doc-hackers.git/ Cannot get remote repository information. Perhaps git-update-server-info needs to be run there? t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: xbase-clients split in the works?
On Mon, 12 Feb 2007, Julien Cristau wrote: [I keep cc:ing you because I don't know if you're subscribed to debian-x. Let me know if you are, so I'll stop doing that :)] I subscribed today, so you can stop now ;) On Mon, Feb 12, 2007 at 11:27:36 +, Timo Aaltonen wrote: I tried to clone the repo, but is the url on the Wiki wrong? git clone http://alioth.debian.org/git/pkg-xorg/doc-hackers.git/ Cannot get remote repository information. Perhaps git-update-server-info needs to be run there? I don't think you can get it via http, try git-clone git://git.debian.org/git/pkg-xorg/app/xbase-clients instead. yep, that works much better. Also, you're welcome on #debian-x (on irc.debian.org, alias irc.oftc.net) if you have questions. roger, thanks! t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: packages that need an epoch in Ubuntu
On Fri, 16 Feb 2007, David Nusinow wrote: Hi Timo, Hi David, That's fine by me, please send us patches to the list. Great, I'll send them later! Does this mean that Ubuntu has an actual X maintainance team now? Who's on this team aside from yourself? Also, would you please start sending us bug reports for the patches you make to Xorg that you think are of use to Debian? Dealing with the automated patch system is a pain, and I'd much rather have some contact with real humans working on Ubuntu again. There is a team, members can be seen here: https://launchpad.net/~ubuntu-x-swat but as you know, no one is dedicated working on X at the moment. As for patches, there probably are some for the drivers, I need to check. Mesa/xorg-server has been covered on this list already (I've dropped those that were pointed as broken or otherwise not needed), libx11 has some that you can see here (diff against the libx11 in experimental, patches from the previous version, note that 103 is left for reference): http://users.tkk.fi/~tjaalton/xorg72/new/libx11.diff Also, I don't know if you guys have plans to move to git like your kernel team is doing, but if you do please let us know about it so we can monitor your repositories more easily. That would make sense. I'll ask. t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#412069: patch for beryl support
On Wed, 28 Feb 2007, Robert Millan [ackstorm] wrote: On Tue, Feb 27, 2007 at 06:26:45PM -0500, David Nusinow wrote: On Tue, Feb 27, 2007 at 11:33:12AM +0100, Robert Millan [ackstorm] wrote: On Tue, Feb 27, 2007 at 10:55:55AM +0100, Michel Dänzer wrote: My point is that if we don't figure that out satisfactorily in time, we could just enable the Composite extension, which sounds fairly safe, and seems to be enough for Intel cards. And Intel happens to be the card brand we have the best driver support for (compared to a RE'd driver for ATI and nothing for nVidia), so focusing on it makes sense to me. Yes, that should be mostly safe at this point. The only exception that comes to mind offhand is that fglrx disables the DRI when Composite is enabled. If we have to choose between optimizing for free drivers that work sanely (either intel or radeon) and non-free drivers that are partly broken, I think it's clear what is better. Ok with enabling Composite by default then? Yeah, I'm fine with that, although I think the better method is to enable it directly in the server by default. That sounds more like an upstream solution. IMHO, in Debian we should do it in the conffile because: - It's more transparent. User can tell this is enabled without going through the patchset. - It's easier to disable if it turns out to be a problem (performance?). See the patch below. Messing with xorg.conf is nasty, please do it like Ubuntu (and Fedora) has done since August and enable it in the server code. Users still can disable it with their config. --- xorg-server-1.2.0/os/utils.c.orig 2007-02-26 11:08:08.0 +0100 +++ xorg-server-1.2.0/os/utils.c2007-02-26 11:08:21.0 +0100 @@ -138,7 +138,7 @@ #ifdef COMPOSITE /* COMPOSITE is disabled by default for now until the * interface is stable */ - #define COMPOSITE_DEFAULT FALSE + #define COMPOSITE_DEFAULT TRUE _X_EXPORT Bool noCompositeExtension = !COMPOSITE_DEFAULT; #endif
Bug#388630: xserver-xorg-video-mga: xserver always starts in a wrong resolution - G400 experiences
Hi, etch has had a newer driver for a while now (1.4.4), and that should have fixed this issue (at least it did in the Ubuntu bug, which I just closed). t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
ubuntu xorg patches
Hi I've split the xorg ubuntu diff as patches: http://users.tkk.fi/~tjaalton/xorg72/patches note that they were mostly cut'n'pasted from the debdiff, so they don't necessarily apply as-is, but you get the idea.. Hopefully you'll find many of them useful :) t -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libice: Changes to 'debian-unstable'
debian/changelog |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) New commits: commit f939b2b22f6c1c025f9f602d4e86575b8c9d04c0 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 11:22:33 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index f38826e..28845e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -libice (1:1.0.3-3) UNRELEASED; urgency=low +libice (2:1.0.3-3) UNRELEASED; urgency=low + [ Julien Cristau ] * Fix the name of the XS-Vcs-Browser field. - -- Julien Cristau [EMAIL PROTECTED] Wed, 11 Apr 2007 13:10:19 +0200 + [ Timo Aaltonen ] + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 11:20:36 +0300 libice (1:1.0.3-2) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libsm: Changes to 'debian-unstable'
debian/changelog |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 88718b8d89d7a464ceaaee7572034af9f0531639 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 11:34:04 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 849088d..27a5509 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -libsm (1:1.0.2-3) UNRELEASED; urgency=low +libsm (2:1.0.2-3) UNRELEASED; urgency=low + [ Julien Cristau ] * Move binary packages to the proper sections. - -- Julien Cristau [EMAIL PROTECTED] Wed, 11 Apr 2007 11:25:45 +0200 + [ Timo Aaltonen ] + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 11:33:01 +0300 libsm (1:1.0.2-2) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxaw: Changes to 'debian-unstable'
debian/changelog |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) New commits: commit be3073a763547622b05221bc0fdd7cb7868189bd Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 11:39:12 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index aa71e12..216600f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -libxaw (1:1.0.3-4) UNRELEASED; urgency=low +libxaw (2:1.0.3-4) UNRELEASED; urgency=low + [ Julien Cristau ] * Move binary packages to the proper sections. - -- Julien Cristau [EMAIL PROTECTED] Wed, 11 Apr 2007 11:39:46 +0200 + [ Timo Aaltonen ] + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 11:38:16 +0300 libxaw (1:1.0.3-3) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxext: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit c620fbe0dddf78197ce36808097fb2133d702aad Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 11:45:15 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index b1a46d6..0dc8ad4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxext (2:1.0.3-1) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 11:40:44 +0300 + libxext (1:1.0.3-2) unstable; urgency=low * Put binary packages in the correct sections. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxext: Changes to 'debian-unstable'
debian/changelog |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 6b8645dd366d2e74ea4b9dfc6b8cd2ab59d00696 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 11:49:54 2007 +0300 Correct version, oops. diff --git a/debian/changelog b/debian/changelog index 0dc8ad4..87a6622 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxext (2:1.0.3-1) UNRELEASED; urgency=low +libxext (2:1.0.3-3) UNRELEASED; urgency=low * Bump the epoch so that this can be synced to Ubuntu in the future. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxfontcache: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit 5d9bb28e898cb48fc3ddb45ac271054bc6af597b Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 11:53:07 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 23015cd..78d059c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxfontcache (2:1.0.2-2) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 11:51:25 +0300 + libxfontcache (1.0.2-1) unstable; urgency=low * Initial packaging for X11R7.1. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxi: Changes to 'debian-unstable'
debian/changelog |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 1363a305fafd91f651c1aaeea56d722520ac4857 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 12:01:30 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 0bb40da..beb2f5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -libxi (1:1.0.1-5) UNRELEASED; urgency=low +libxi (2:1.0.1-5) UNRELEASED; urgency=low + [ Julien Cristau ] * Adjust Section values to what the override says. * Update location of upstream repository from CVS to git in the long descriptions. - -- Julien Cristau [EMAIL PROTECTED] Tue, 28 Nov 2006 02:56:01 +0100 + [ Timo Aaltonen ] + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 11:55:45 +0300 libxi (1:1.0.1-4) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxmu: Changes to 'debian-unstable'
debian/changelog |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 5df89d65774e5ddab472192da3efbdf39aca81e6
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Tue Apr 24 12:03:15 2007 +0300
Bump the epoch so that this can be synced to Ubuntu in the future.
diff --git a/debian/changelog b/debian/changelog
index d6ba51f..24dcce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-libxmu (1:1.0.3-2) UNRELEASED; urgency=low
+libxmu (2:1.0.3-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Make libxmu*-dev depend on libxmu-headers (= ${source:Version}). Thanks,
Josh Triplett.
- -- Julien Cristau [EMAIL PROTECTED] Wed, 18 Apr 2007 01:42:29 +0200
+ [ Timo Aaltonen ]
+ * Bump the epoch so that this can be synced to Ubuntu in the future.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 12:02:43 +0300
libxmu (1:1.0.3-1) unstable; urgency=low
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxv: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit a550914169f1b32b3a27ac2069ab312981c91150 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 12:04:24 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 8dcb901..75ea352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxv (2:1.0.3-2) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 12:03:53 +0300 + libxv (1:1.0.3-1) unstable; urgency=low * New upstream release. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libxvmc: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit 146a87cb7030fcf00ee1caa29343c01e588723c1 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 12:06:11 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 9fc5999..bbaa2e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxvmc (2:1.0.4-3) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 12:05:13 +0300 + libxvmc (1:1.0.4-2) unstable; urgency=low * Add XS-Vcs-Browser. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-damage: Changes to 'debian-unstable'
debian/changelog |6 ++ 1 files changed, 6 insertions(+) New commits: commit 68d4344172a508fd2dcd3e41be40a53777306b81 Author: Timo Aaltonen [EMAIL PROTECTED] Date: Tue Apr 24 12:10:09 2007 +0300 Bump the epoch so that this can be synced to Ubuntu in the future. diff --git a/debian/changelog b/debian/changelog index 52bf45f..6fcac67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-damage (1:1.1.0-3) UNRELEASED; urgency=low + + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 12:08:23 +0300 + x11proto-damage (1.1.0-2) unstable; urgency=low * Install damageproto.txt and the upstream ChangeLog. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-apm: Changes to 'debian-unstable'
debian/changelog |6 ++
debian/control |3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 75fd7a13949466d5434a6fe12c91ca4c1273b65e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Tue Apr 24 12:49:59 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-apm.
diff --git a/debian/changelog b/debian/changelog
index 94a1e17..1dae1fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-apm (1:1.1.1-7) UNRELEASED; urgency=low
+
+ * Replaces/Conflicts: xserver-xorg-driver-apm.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 12:46:13 +0300
+
xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 224a1a7..ffc3ba3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-apm
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-apm
+Conflicts: xserver-xorg-driver-apm
Description: X.Org X server -- APM display driver
This package provides the driver for the Alliance Pro Motion family
of video cards; specifically, the 6420, 6422, AT24, AT25, and AT3D
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ark: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3dd117e634c87d865f53bc2992f99152fed66da6
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Tue Apr 24 12:53:00 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-ark.
diff --git a/debian/changelog b/debian/changelog
index 2d664b3..4a961ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ xserver-xorg-video-ark (1:0.6.0-6) UNRELEASED; urgency=low
* Add a link to www.X.org and a reference to the xf86-video-ark
module in the long description.
- -- Brice Goglin [EMAIL PROTECTED] Tue, 24 Apr 2007 01:14:26 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-ark.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Tue, 24 Apr 2007 12:52:17 +0300
xserver-xorg-video-ark (1:0.6.0-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index c61e9e4..ca2b3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-ark
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg ( 6.8.2-35)
+Replaces: xserver-xorg ( 6.8.2-35), xserver-xorg-driver-ark
+Conflicts: xserver-xorg-driver-ark
Description: X.Org X server -- ark display driver
This package provides the driver for the ark family
of chipsets.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
