Re: X Strike Force X.Org X11 SVN commit: r2001 - trunk/debian/xorg/debian

2006-05-03 Thread Aaron M. Ucko
David Nusinow <[EMAIL PROTECTED]> writes:

> No, because we really just want to get rid of these things. They're
> functionally replicated in x11-common anyway now.

Sure, but in that case you shouldn't be testing "$1" for purge, as the
postinst will never be invoked that way.

-- 
Aaron M. Ucko, KB1CJC (amu at alum.mit.edu, ucko at debian.org)
Finger [EMAIL PROTECTED] (NOT a valid e-mail address) for more info.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: X Strike Force X.Org X11 SVN commit: r2001 - trunk/debian/xorg/debian

2006-05-01 Thread David Nusinow
On Mon, May 01, 2006 at 04:25:04PM -0400, Aaron M. Ucko wrote:
> X Strike Force SVN Repository Admin <[EMAIL PROTECTED]>
> writes:
> 
> > Added:
> >trunk/debian/xorg/debian/xfree86-common.postinst.in
> > Modified:
> >trunk/debian/xorg/debian/changelog
> >trunk/debian/xorg/debian/control
> > Log:
> [...]
> >   * Remove xfree86-common stuff from /etc/X11/Xsession.d when the new
> > xfree86-common package is purged. Thanks Joe Drew. (closes: #318294)
> 
> Shouldn't that logic go in the post*rm*?

No, because we really just want to get rid of these things. They're
functionally replicated in x11-common anyway now.

 - David Nusinow


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: X Strike Force X.Org X11 SVN commit: r2001 - trunk/debian/xorg/debian

2006-05-01 Thread Aaron M. Ucko
X Strike Force SVN Repository Admin <[EMAIL PROTECTED]>
writes:

> Added:
>trunk/debian/xorg/debian/xfree86-common.postinst.in
> Modified:
>trunk/debian/xorg/debian/changelog
>trunk/debian/xorg/debian/control
> Log:
[...]
>   * Remove xfree86-common stuff from /etc/X11/Xsession.d when the new
> xfree86-common package is purged. Thanks Joe Drew. (closes: #318294)

Shouldn't that logic go in the post*rm*?

-- 
Aaron M. Ucko, KB1CJC (amu at alum.mit.edu, ucko at debian.org)
Finger [EMAIL PROTECTED] (NOT a valid e-mail address) for more info.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



X Strike Force X.Org X11 SVN commit: r2001 - trunk/debian/xorg/debian

2006-04-29 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-04-29 18:06:16 -0400 (Sat, 29 Apr 2006)
New Revision: 2001

Added:
   trunk/debian/xorg/debian/xfree86-common.postinst.in
Modified:
   trunk/debian/xorg/debian/changelog
   trunk/debian/xorg/debian/control
Log:
  Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix.
* Add xfree86-common transitional package. This package is meant to remove
  files that were moved to x11-common, like Xsession. Thanks Frank Kuster.
  Thanks to Daniel Stone for the fix. (closes: #354146)
  * Remove xfree86-common stuff from /etc/X11/Xsession.d when the new
xfree86-common package is purged. Thanks Joe Drew. (closes: #318294)

Modified: trunk/debian/xorg/debian/changelog
===
--- trunk/debian/xorg/debian/changelog  2006-04-29 19:48:09 UTC (rev 2000)
+++ trunk/debian/xorg/debian/changelog  2006-04-29 22:06:16 UTC (rev 2001)
@@ -4,10 +4,15 @@
 backing up :-) Thanks Frans Pop and Flavio Stanchin. (closes: 365278)
   * Prevent the xserver-xorg config from failing during migration of
 zaxismapping and emulate3buttons questions when they don't exist. Thanks
-Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix. 
+Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix.
 (closes: #365282)
+  * Add xfree86-common transitional package. This package is meant to remove
+files that were moved to x11-common, like Xsession. Thanks Frank Kuster.
+Thanks to Daniel Stone for the fix. (closes: #354146)
+* Remove xfree86-common stuff from /etc/X11/Xsession.d when the new
+  xfree86-common package is purged. Thanks Joe Drew. (closes: #318294)
 
- -- David Nusinow <[EMAIL PROTECTED]>  Sat, 29 Apr 2006 15:44:42 -0400
+ -- David Nusinow <[EMAIL PROTECTED]>  Sat, 29 Apr 2006 17:05:48 -0400
 
 xorg (1:7.0.15) unstable; urgency=low
   

Modified: trunk/debian/xorg/debian/control
===
--- trunk/debian/xorg/debian/control2006-04-29 19:48:09 UTC (rev 2000)
+++ trunk/debian/xorg/debian/control2006-04-29 22:06:16 UTC (rev 2001)
@@ -9,9 +9,9 @@
 Package: x11-common
 Architecture: any
 Depends: ${misc:Depends}, debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2)
-Pre-Depends: debconf | debconf-2.0
-Conflicts: xfree86-common, xorg-common, xserver-common, x-common, xserver-xorg 
(<< 1:7.0.12), xserver-xfree86 (<= 6.9.0.dfsg.1-6), libxft-dev (<= 2.1.8.2-5),  
aee (<= 2.2.15b-1), ascd (<= 0.13.2-3), bibview (<= 2.2-8), fvwm1 (<= 
1.24r-46), grace (<= 1:5.1.18-1), groff (<= 1.18.1.1-7), hfsutils-tcltk (<= 
3.2.6-7), login.app (<= 1.2.1-18), oneko (<= 1.2.sakura.6-1), procmeter (<= 
2.5.1-11), propsel (<= 971130-5.3), regexplorer (<= 0.1.6-12), tkseti (<= 
3.06-1), wdm (<= 1.28-1), wily (<= 0.13.41-6), wmnetselect (<= 0.85-5.5), 
wmsensors (<= 1.0.4-3.4), wmtv (<= 0.6.5-15), xbanner (<= 1.31-23), xcolors (<= 
1.5a-2), xcolorsel (<= 1.1a-11), xezmlm (<= 1.0.3-11), xfs-xtt (<= 
1:1.4.1.xf430-6), xgdipc (<= 1.2-0.3), xgmod (<= 3.1-9), xgraph (<= 12.1-3), 
xlogmaster (<= 1.6.0-8), xmailbox (<= 2.5-9), xmem (<= 1.20-19), xnecview (<= 
1.34-2), xodo (<= 1.2-9.2), xturqstat (<= 2.2.2sarge1), xwit (<= 3.4-6), 
lbxproxy (<= 6.9.0.dfsg.1-6), proxymngr (<= 6.9.0.dfsg.1-6), twm (<= 
6.9.0.dfsg.1-6), xbase-clients (<= 6.9.0.dfsg.1-6), xdm (<= 6.9.0.dfsg.1-6), 
xfs (<= 6.9.0.dfsg.1-6), xfwp (<= 6.9.0.dfsg.1-6), xutils (<= 6.9.0.dfsg.1-6), 
xvfb (<= 6.9.0.dfsg.1-6), qcam (<= 0.91-11.1), twlog (<= 1.3-4), xdmx (<= 
6.9.0.dfsg.1-6), bugsx (<= 1.08-8), buici-clock (<= 0.4.5+b1), ctwm (<= 3.7-2), 
emelfm (<= 0.9.2-7), fte-xwindow (<= 0.50.0-1.3), fvwm95 (<= 2.0.43ba-23+b1), 
gerstensaft (<= 0.2-5.1), gipsc (<= 0.4.3-2), gradio (<= 1.0.1-6), 
hanterm-classic (<= 3.1.6.0-4), hanterm-xf (<= 1:3.3.1p18-9.2), ibp (<= 
0.21-4), isdnutils-xtools (<= 1:3.8.2005-12-06-4), ivtools-bin (<= 1.1.3-5), 
kdrill (<= 6.4-2.1), kinput2-canna (<= 3.1-7), kinput2-canna-wnn (<= 3.1-7), 
kinput2-wnn (<= 3.1-7), kterm (<= 6.2.0-45), lm-batmon (<= 0.96-3), lwm (<= 
1.2.1-1), mctools-lite (<= 970129-16), mgp (<= 1.11b-6), olvwm (<= 
4.4.3.2p1.4-21), olwm (<= 3.2p1.4-21), pixmap (<= 2.6pl4-14.1), plotmtv (<= 
1.4.4t-8.1), ppxp-x11 (<= 0.2001080415-14), seyon (<= 2.20c-20), skkinput (<= 
1:2.06.4-4), tkdesk (<= 2.0-5), videogen (<= 0.32-1), vtwm (<= 5.4.7-2), w9wm 
(<= 0.4.2-4), wmavgload (<= 0.7.0-6.1), wmcpu (<= 1.3-4.1), wmdate (<= 
0.5-7.1), wmnet (<= 1.05-12), wmscope (<= 3.0-9.1), xautolock (<= 1:2.1-6), 
xbatt (<= 1.2.1-4), xbattbar (<= 1.4.2-3.1), xcal (<= 4.1-18.2), xcalendar-i18n 
(<= 4.0.0.i18p1-13.1), xcb (<= 2.4-4), xclip (<= 0.08-5), xclips (<= 6.21-6), 
xdkcal (<= 0.9d-2.1), xdu (<= 3.0-14), xengine (<= 1.11-9), xfaces (<= 3.3-25), 
xfishtank (<= 2.2-23.1), xfm (<= 1.4.3-8), xinput (<= 1.2-5.2), xipmsg (<= 
0.8088-1.1), xlbiff (<= 4.1-1.1), xli (<= 1.17.0-21), xlockmore (<= 1:5.21-1), 
xlockmore-gl (<= 1:5.21-1), xmeter (<= 1.15-6), xmix (<= 2.1-5), xmon (<= 
1.5.6