Bug 7794 - Removal of Windows specific plugin in debian build
: Removal of Windows specific plugin in debian build
Status: CLOSED FIXED
Product: Logitech Media Server
Classification: Unclassified
Component: Platform Support
: 7.1
: PC Other
: -- normal with 1 vote (vote)
: 7.3.3
Assigned To: Matt Wise
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2008-04-10 13:04 UTC by Keyzer Suze
Modified: 2009-06-17 09:35 UTC (History)
6 users (show)

See Also:
Category: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Keyzer Suze 2008-04-10 13:04:00 UTC
Seem a bit silly to distribute a windows plugin in a linux (debian) distro. This will also stop a error coming up in the log files



Index: platforms/debian/rules
===================================================================
--- platforms/debian/rules	(revision 18641)
+++ platforms/debian/rules	(working copy)
@@ -37,6 +37,8 @@
 	install -m0755 ${source}/scanner.pl ${base}/usr/sbin/squeezecenter-scanner
 
 	cp -r ${source}/Slim ${base}/usr/share/perl5/
+	rm -fr ${base}/usr/share/perl5/PreventStandby
 	
 	# Copy our CPAN directory and locally modified perl modules
 	cp -r ${source}/CPAN ${base}/${share}
Comment 1 Robin Bowes 2008-04-10 13:26:57 UTC
I've not checked if it's actually installed, but this should be removed from *all* linux packages.

Would it also be worth adding code to that plugin so it exits gracefully on linux? (I presume it's a windows-only plugin?)

R.
Comment 2 Keyzer Suze 2008-04-10 17:09:09 UTC
I believe it is a Windows only

it has a
use Win32::API;


A graceful exit would be good as well. But it is never going to be used on any linux box.
Comment 3 Mark Miksis 2008-04-11 15:40:33 UTC
I'll make a similar change to the RPM if no one else gets to it first.
Comment 4 Mark Miksis 2008-04-19 10:42:35 UTC
Change 18946 in 7.0/trunk removes the PreventStandby plugin from the RPM.
Comment 5 Keyzer Suze 2008-04-25 16:39:54 UTC
Hi

I was wondering if the debian patch could also be applied to the 7.1 trunk
Comment 6 Keyzer Suze 2008-04-25 16:55:40 UTC
new patch 

Index: platforms/debian/rules
===================================================================
--- platforms/debian/rules	(revision 19184)
+++ platforms/debian/rules	(working copy)
@@ -95,6 +95,8 @@
 
 	# Copy the revision file
 	cp ${source}/revision.txt ${base}/${share}
+	rm -fr ${base}/usr/share/perl5/Slim/Plugin/PreventStandby
 
 binary-indep: install
 	dh_testdir
Comment 7 Matt Wise 2008-06-19 10:59:23 UTC
It should have been automatically pulled from 7.0 to 7.1, 7.2, etc... but it doesnt look like it did.

Andy, I can manually apply the patch ... but any ideas why it didnt get put into the 7.1,7.2 dirs? 
Comment 8 Andy Grundman 2008-06-19 11:06:47 UTC
That patch was never applied to 7.0.
Comment 9 Mark Miksis 2008-06-19 11:08:44 UTC
Actually Matt, instead of using that patch why don't you just remove it from the tarball in buildme.pl?  I can then undo my patch to the RPM too.
Comment 10 Matt Wise 2008-06-19 11:22:58 UTC
Should be fixed in change 20918... made appropriate changes to buildme.pl and platforms/debian/rules. 
Comment 11 Mark Miksis 2008-06-19 11:47:52 UTC
change 20928 (7.0/trunk) reverts change 18946
Comment 12 Blackketter Dean 2008-06-19 17:20:31 UTC
can we mark this as fixed now?
Comment 13 Chris Owens 2008-07-16 18:09:01 UTC
If there's a reason this shouldn't be marked as fixed, kindly let us know.
Comment 14 Chris Owens 2008-07-30 15:31:40 UTC
This bug has now been fixed in the 7.1 release version of SqueezeCenter!  Please download the new version from http://www.slimdevices.com if you haven't already.  

If you are still experiencing this problem, feel free to reopen the bug with your new comments and we'll have another look.
Comment 15 Mark Miksis 2009-01-08 12:33:15 UTC
Reopening and untargetting because PreventStandby is still included in the deb.  I'll look at this later if Matt doesn't get to it first.  Probably something simple.
Comment 16 James Richardson 2009-01-08 15:31:02 UTC
Matt/Fletch: targeting for 7.3.3 please re target if it can get done sooner :)
Comment 17 KDF 2009-01-16 01:05:47 UTC
the problem is that the PreventStandby plugin isn't located with the rest of the files, so the line used in the rules file won't work:
rm -rf ${base}/${share}/Slim/Plugin/PreventStandby

$share = /usr/share/squeezecenter


instead try (I've tested and it works and matches the original patch):

Index: platforms/debian/rules
===================================================================
--- platforms/debian/rules	(revision 24683)
+++ platforms/debian/rules	(working copy)
@@ -59,7 +59,7 @@
 	rm -rf ${base}/${share}/Bin/darwin
 	rm -rf ${base}/${share}/Bin/MSWin32-x86-multi-thread
 	rm -rf ${base}/${share}/Bin/powerpc-hardhat-linux
-	rm -rf ${base}/${share}/Slim/Plugin/PreventStandby
+	rm -rf ${base}/usr/share/perl5/Slim/Plugin/PreventStandby
 	
 
 	# And aux files needed to run SlimServer
Comment 18 KDF 2009-01-16 01:10:38 UTC
committed to the 7.3 trunk at change 24684.  If you want to have it in the 7.3.2 RC, I'll leave it to you to merge and correct the changelog.

please reopen if there are any issues.
Comment 19 James Richardson 2009-06-17 09:35:06 UTC
This bug has been fixed in the 7.3.3 release version of SqueezeCenter!

If you haven't already. please download the new version from http://www.logitechsqueezebox.com/support/download-squeezecenter.html 

If you are still experiencing this problem, feel free to reopen the bug with your new comments and we'll have another look.