Bug#413369: Patch

[Phil Brooke]

Hi Steve,

Thanks for the patch.

I'm very behind on a big (paid) work issue at the moment.  If you're happy 
that the (corrected) patch fixes the problem, you're welcome to NMU it. 
Otherwise, I'll try to deal with it later this week.


Cheers,

Phil.


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

Bug#413369: Patch

[Steve McIntyre]

tags 413369 +patch
thanks

Hi,

Attached is a simple patch for this RC bug. Hope it helps...

-- 
Steve McIntyre, Cambridge, UK.[EMAIL PROTECTED]
Into the distance, a ribbon of black
Stretched to the point of no turning back
diff -u fvwm1-1.24r/debian/preinst fvwm1-1.24r/debian/preinst
--- fvwm1-1.24r/debian/preinst
+++ fvwm1-1.24r/debian/preinst
@@ -34,2 +34,9 @@
 
+# /usr/X11R6/bin has gone away; remove any sym-links in there that we
+# may be responsible for so we don't break an etch uprade.
+if [ -x /usr/X11R6/bin/fvwm1 ]  [ ! -L /usr/X11R6/bin ] ; then
+update-alternatives --remove fvwm /usr/X11R6/bin/fvwm1
+update-alternatives --remove x-window-manager /usr/X11R6/bin/fvwm1
+fi
+
 exit 0
diff -u fvwm1-1.24r/debian/changelog fvwm1-1.24r/debian/changelog
--- fvwm1-1.24r/debian/changelog
+++ fvwm1-1.24r/debian/changelog
@@ -1,3 +1,10 @@
+fvwm1 (1.24r-51.1) unstable; urgency=high
+
+  * NMU to fix RC bug.
+  * Move alternatives from /usr/bin/X11 and /usr/X11R6/bin. Closes: #413369.
+
+ -- Steve McIntyre [EMAIL PROTECTED]  Sun, 04 Mar 2007 20:11:24 +
+
 fvwm1 (1.24r-51) unstable; urgency=low
 
   * Acknowledge NMU 50.1 -- thanks.
diff -u fvwm1-1.24r/debian/postinst fvwm1-1.24r/debian/postinst
--- fvwm1-1.24r/debian/postinst
+++ fvwm1-1.24r/debian/postinst
@@ -3,11 +3,11 @@
 set -e
 
 update-alternatives --install /usr/bin/x-window-manager x-window-manager \
-/usr/bin/X11/fvwm1 50 \
+/usr/bin/fvwm1 50 \
 --slave /usr/share/man/man1/x-window-manager.1.gz \
-x-window-manager.1.gz /usr/X11R6/man/man1/fvwm1.1x.gz
+x-window-manager.1.gz /usr/share/man/man1/fvwm1.1x.gz
 
-update-alternatives --install /usr/bin/X11/fvwm fvwm /usr/bin/X11/fvwm1 100 \
+update-alternatives --install /usr/bin/fvwm fvwm /usr/bin/fvwm1 100 \
 --slave /usr/share/man/man1/fvwm.1.gz fvwm.1.gz \
 /usr/share/man/man1/fvwm1.1x.gz
 
diff -u fvwm1-1.24r/debian/prerm fvwm1-1.24r/debian/prerm
--- fvwm1-1.24r/debian/prerm
+++ fvwm1-1.24r/debian/prerm
@@ -4,8 +4,8 @@
 
 if [ $1 != upgrade ]
 then
-update-alternatives --remove fvwm /usr/bin/X11/fvwm1
-update-alternatives --remove x-window-manager /usr/bin/X11/fvwm1
+update-alternatives --remove fvwm /usr/bin/fvwm1
+update-alternatives --remove x-window-manager /usr/bin/fvwm1
 elif dpkg --compare-versions $2 lt-nl 1.24r-32
 then
 # We're downgrading; avoid dpkg prompting about overwriting


signature.asc
Description: Digital signature

Bug#413369: Patch

[Steve McIntyre]

On Sun, Mar 04, 2007 at 11:06:49PM +0100, Julien Cristau wrote:
On Sun, Mar  4, 2007 at 21:42:54 +, Steve McIntyre wrote:

 Attached is a simple patch for this RC bug. Hope it helps...
 
Hi Steve

 diff -u fvwm1-1.24r/debian/preinst fvwm1-1.24r/debian/preinst
 --- fvwm1-1.24r/debian/preinst
 +++ fvwm1-1.24r/debian/preinst
 @@ -34,2 +34,9 @@
  
 +# /usr/X11R6/bin has gone away; remove any sym-links in there that we
 +# may be responsible for so we don't break an etch uprade.
 +if [ -x /usr/X11R6/bin/fvwm1 ]  [ ! -L /usr/X11R6/bin ] ; then
 +update-alternatives --remove fvwm /usr/X11R6/bin/fvwm1
 +update-alternatives --remove x-window-manager /usr/X11R6/bin/fvwm1
 +fi
 +
The alternative is added as /usr/bin/X11/fvwm1.  Does removing it as
/usr/X11R6/bin/fvwm1 work as intented?

Oops, fuckup in the patch. s?/usr/X11R6/bin?/usr/bin/X11?
throughout... :-(

-- 
Steve McIntyre, Cambridge, UK.[EMAIL PROTECTED]
Is there anybody out there?



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

Bug#413369: Patch

[Julien Cristau]

On Sun, Mar  4, 2007 at 21:42:54 +, Steve McIntyre wrote:

 Attached is a simple patch for this RC bug. Hope it helps...
 
Hi Steve

 diff -u fvwm1-1.24r/debian/preinst fvwm1-1.24r/debian/preinst
 --- fvwm1-1.24r/debian/preinst
 +++ fvwm1-1.24r/debian/preinst
 @@ -34,2 +34,9 @@
  
 +# /usr/X11R6/bin has gone away; remove any sym-links in there that we
 +# may be responsible for so we don't break an etch uprade.
 +if [ -x /usr/X11R6/bin/fvwm1 ]  [ ! -L /usr/X11R6/bin ] ; then
 +update-alternatives --remove fvwm /usr/X11R6/bin/fvwm1
 +update-alternatives --remove x-window-manager /usr/X11R6/bin/fvwm1
 +fi
 +
The alternative is added as /usr/bin/X11/fvwm1.  Does removing it as
/usr/X11R6/bin/fvwm1 work as intented?

Cheers,
Julien


signature.asc
Description: Digital signature