Author: richard
Date: Wed Feb 11 05:33:45 2009
New Revision: 4155
URL: http://svn.slimdevices.com?rev=4155&root=Jive&view=rev
Log:
r4...@harrypotter (orig r4134): tom | 2009-02-10 19:19:13 +0000
Bug: N/A
Description:
goNowPlayingAction uses pushLeft transition.
r4...@harrypotter (orig r4150): tom | 2009-02-11 03:25:07 +0000
Bug: N/A
Description:
hideOnAllButtonInput was broke, needs to ignore UP and DOWN events, so that
the press and hold based actions can occur.
r4...@harrypotter (orig r4154): richard | 2009-02-11 13:32:27 +0000
r4...@harrypotter (orig r4130): mwise | 2009-02-10 18:35:38 +0000
Bug: 11023, Initial debian packaging info... The makefile does not yet call
this, but I've verified that you can indeed build a .deb with it.
r4...@harrypotter (orig r4131): mwise | 2009-02-10 18:46:42 +0000
Need this file to be a template... then we overwrite it during the build
process.
r4...@harrypotter (orig r4132): mwise | 2009-02-10 18:57:24 +0000
Beginnings of building the _deb package. Its not perfect yet, and its not
automatic.
r4...@harrypotter (orig r4133): mwise | 2009-02-10 18:59:05 +0000
Bug fix. make squeezeplay_deb works now. Doesn't generate the package name in
a typical debian-friendly way though, but its a start.
r4...@harrypotter (orig r4137): mwise | 2009-02-10 22:18:42 +0000
Fix VERSION_TEXT so that any M or S from the svnversion command is ignored.
Additionally I renamed the calls for the tarball, and deb packages to be more
consistant. Lastly, added DEB_VERSION_TEXT for a debian-friendly version string.
r4...@harrypotter (orig r4138): mwise | 2009-02-10 22:30:47 +0000
Adjust the output name for the tarball to include the version and rev #.
Added:
7.4/branches/pango/squeezeplay/src/platforms/
7.4/branches/pango/squeezeplay/src/platforms/debian/
7.4/branches/pango/squeezeplay/src/platforms/debian/README
7.4/branches/pango/squeezeplay/src/platforms/debian/changelog.in
7.4/branches/pango/squeezeplay/src/platforms/debian/compat
7.4/branches/pango/squeezeplay/src/platforms/debian/control
7.4/branches/pango/squeezeplay/src/platforms/debian/dirs
7.4/branches/pango/squeezeplay/src/platforms/debian/rules (with props)
7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postinst
7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postrm
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/Makefile.linux
7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.am
7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.in
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Feb 11 05:33:45 2009
@@ -3,8 +3,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4122
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4124
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4138
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4154
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/branches/pango/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/Makefile.linux?rev=4155&root=Jive&r1=4154&r2=4155&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.linux (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.linux Wed Feb 11 05:33:45 2009
@@ -156,7 +156,7 @@
#
.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib squeezeplay_private freefont freefont-debian axtls
-app: portaudio flac libmad tremor ${SPPRIVATE_TARGETS} squeezeplay
squeezeplay_desktop squeezeplay_contrib
+app: portaudio flac libmad tremor ${SPPRIVATE_TARGETS} squeezeplay
squeezeplay_desktop squeezeplay_contrib squeezeplay_tgz
freefont squeezeplay_tgz
# portaudio
@@ -232,8 +232,21 @@
cp fonts-clock/Digital.ttf ${PREFIX}/share/jive/fonts
cp fonts-clock/DigitalItalic.ttf ${PREFIX}/share/jive/fonts
-squeezeplay_tgz: squeezeplay/Makefile
- cd squeezeplay; make SqueezePlay_tgz
+#
+# This builds the .tarball. It's called by 'all' so no need to run it manually
+#
+squeezeplay-tgz: squeezeplay/Makefile
+ cd squeezeplay; make squeezeplay-tgz
+
+#
+# Allow user to call the -deb build and it runs both the 'all' and then
packages it
+#
+
+.PHONY: squeezeplay-deb
+squeezeplay-deb: all squeezeplay-deb-make
+
+squeezeplay-deb-make: squeezeplay/Makefile
+ cd squeezeplay; make squeezeplay-deb
#
# clean
Added: 7.4/branches/pango/squeezeplay/src/platforms/debian/README
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/platforms/debian/README?rev=4155&root=Jive&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/platforms/debian/README (added)
+++ 7.4/branches/pango/squeezeplay/src/platforms/debian/README Wed Feb 11
05:33:45 2009
@@ -1,0 +1,11 @@
+$Id$
+
+This is SqueezePlay for Debian.
+
+It is a self-contained music player and SqueezeBox controlling application.
+
+Please see http://www.slimdevices.com/ for more information.
+
+- Matt Wise <debian | at | slimdevices.com>
+
+Tue Feb 10 09:39:11 PST 2009
Added: 7.4/branches/pango/squeezeplay/src/platforms/debian/changelog.in
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/platforms/debian/changelog.in?rev=4155&root=Jive&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/platforms/debian/changelog.in (added)
+++ 7.4/branches/pango/squeezeplay/src/platforms/debian/changelog.in Wed Feb 11
05:33:45 2009
@@ -1,0 +1,5 @@
+squeezeplay (_VERSION_) unstable; urgency=low
+
+ * Initial packaging attempt for SqueezePlay. Should put all files into
/opt/squeezeplay/
+
+ -- Matt Wise <[email protected]> Wed, 10 Feb 2008 09:32:33 -0000
Added: 7.4/branches/pango/squeezeplay/src/platforms/debian/compat
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/platforms/debian/compat?rev=4155&root=Jive&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/platforms/debian/compat (added)
+++ 7.4/branches/pango/squeezeplay/src/platforms/debian/compat Wed Feb 11
05:33:45 2009
@@ -1,0 +1,1 @@
+4
Added: 7.4/branches/pango/squeezeplay/src/platforms/debian/control
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/platforms/debian/control?rev=4155&root=Jive&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/platforms/debian/control (added)
+++ 7.4/branches/pango/squeezeplay/src/platforms/debian/control Wed Feb 11
05:33:45 2009
@@ -1,0 +1,13 @@
+Source: squeezeplay
+Section: sound
+Priority: optional
+Maintainer: Logitech/Slim Devices <[email protected]>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.6.2
+
+Package: squeezeplay
+Architecture: all
+Depends:
+Description: Logitech SqueezePlay
+ SqueezePlay is a client for the SqueezeCenter music streaming server.
+ .
Added: 7.4/branches/pango/squeezeplay/src/platforms/debian/dirs
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/platforms/debian/dirs?rev=4155&root=Jive&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/platforms/debian/dirs (added)
+++ 7.4/branches/pango/squeezeplay/src/platforms/debian/dirs Wed Feb 11
05:33:45 2009
@@ -1,0 +1,1 @@
+opt/squeezeplay
Added: 7.4/branches/pango/squeezeplay/src/platforms/debian/rules
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/platforms/debian/rules?rev=4155&root=Jive&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/platforms/debian/rules (added)
+++ 7.4/branches/pango/squeezeplay/src/platforms/debian/rules Wed Feb 11
05:33:45 2009
@@ -1,0 +1,44 @@
+#!/usr/bin/make -f
+
+# $Id$
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+package=squeezeplay
+base=$(CURDIR)/debian/$(package)
+source=$(CURDIR)/../../build/linux/
+squeezeplay=$(base)/opt/$(package)
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -rf ${base}
+ rm -f $(CURDIR)/debian/files
+
+install:
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+
+ # Copy all of the files into the base dir
+ cp -r $(source)/* $(squeezeplay)/
+
+binary-indep: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_install
+ dh_installlogrotate
+ dh_installinit
+ dh_installman
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary install configure
Propchange: 7.4/branches/pango/squeezeplay/src/platforms/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: 7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postinst
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postinst?rev=4155&root=Jive&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postinst
(added)
+++ 7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postinst
Wed Feb 11 05:33:45 2009
@@ -1,0 +1,15 @@
+#!/bin/sh
+
+# $Id$
+
+# postinst script for SqueezePlay
+
+set -e
+. /usr/share/debconf/confmodule
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: 7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postrm
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postrm?rev=4155&root=Jive&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postrm
(added)
+++ 7.4/branches/pango/squeezeplay/src/platforms/debian/squeezeplay.postrm Wed
Feb 11 05:33:45 2009
@@ -1,0 +1,9 @@
+#!/bin/sh -e
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.am?rev=4155&root=Jive&r1=4154&r2=4155&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.am Wed Feb 11
05:33:45 2009
@@ -87,7 +87,9 @@
BUNDLE_CONTENTS = $(BUNDLE_NAME)/Contents
PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist
-VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n ..)
+VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n .. |
sed -e 's/[MS]//g')
+DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell svnversion -n
.. | sed -e 's/[MS]//g')
+TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell svnversion -n
.. | sed -e 's/[MS]//g')
ICNS_NAME = icon.icns
DMG_TEMP_DIR = temp-SqueezePlay_image
DMG_IMAGE_DIR = SqueezePlay_image
@@ -154,8 +156,12 @@
-rm $(DMG_TMP_IMAGE_FILENAME)
cp -p $(DMG_IMAGE_FILENAME)
$(OSX_BUILD_DIR)/SqueezePlay-$(VERSION_TEXT).dmg
-SqueezePlay_tgz:
- cd $(prefix); tar -zcf ../squeezeplay.tgz *; tar -ztvf
../squeezeplay.tgz
+squeezeplay-tgz:
+ cd $(prefix); tar -zcf ../squeezeplay-$(TGZ_VERSION_TEXT).tgz *; tar
-ztvf ../squeezeplay-$(TGZ_VERSION_TEXT).tgz
+
+squeezeplay-deb:
+ sed -e 's/_VERSION_/$(DEB_VERSION_TEXT)/g'
../platforms/debian/changelog.in > ../platforms/debian/changelog
+ cd ../platforms; fakeroot dpkg-buildpackage -b; ls -lah
../squeezeplay*.deb
# Convenience library:
noinst_LTLIBRARIES = libjiveui.la libjiveaudio.la libjivenet.la
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.in?rev=4155&root=Jive&r1=4154&r2=4155&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/Makefile.in Wed Feb 11
05:33:45 2009
@@ -283,7 +283,9 @@
APP_NAME = SqueezePlay Beta
BUNDLE_CONTENTS = $(BUNDLE_NAME)/Contents
PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist
-VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n ..)
+VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n .. |
sed -e 's/[MS]//g')
+DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell svnversion -n
.. | sed -e 's/[MS]//g')
+TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell svnversion -n
.. | sed -e 's/[MS]//g')
ICNS_NAME = icon.icns
DMG_TEMP_DIR = temp-SqueezePlay_image
DMG_IMAGE_DIR = SqueezePlay_image
@@ -1218,8 +1220,12 @@
-rm $(DMG_TMP_IMAGE_FILENAME)
cp -p $(DMG_IMAGE_FILENAME)
$(OSX_BUILD_DIR)/SqueezePlay-$(VERSION_TEXT).dmg
-SqueezePlay_tgz:
- cd $(prefix); tar -zcf ../squeezeplay.tgz *; tar -ztvf
../squeezeplay.tgz
+squeezeplay-tgz:
+ cd $(prefix); tar -zcf ../squeezeplay-$(TGZ_VERSION_TEXT).tgz *; tar
-ztvf ../squeezeplay-$(TGZ_VERSION_TEXT).tgz
+
+squeezeplay-deb:
+ sed -e 's/_VERSION_/$(DEB_VERSION_TEXT)/g'
../platforms/debian/changelog.in > ../platforms/debian/changelog
+ cd ../platforms; fakeroot dpkg-buildpackage -b; ls -lah
../squeezeplay*.deb
src/version.h: FORCE
@echo '/* This file is automatically generated */' > src/version.h
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=4155&root=Jive&r1=4154&r2=4155&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Feb 11 05:33:45 2009
@@ -1347,7 +1347,7 @@
end
function _goNowPlayingAction()
- _goNow('nowPlaying')
+ _goNow('nowPlaying', Window.transitionPushLeft)
return EVENT_CONSUME
end
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua?rev=4155&root=Jive&r1=4154&r2=4155&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua Wed
Feb 11 05:33:45 2009
@@ -67,6 +67,7 @@
local EVENT_ACTION = jive.ui.EVENT_ACTION
local EVENT_SCROLL = jive.ui.EVENT_SCROLL
local EVENT_KEY_PRESS = jive.ui.EVENT_KEY_PRESS
+local EVENT_KEY_HOLD = jive.ui.EVENT_KEY_HOLD
local EVENT_CHAR_PRESS = jive.ui.EVENT_CHAR_PRESS
local EVENT_WINDOW_PUSH = jive.ui.EVENT_WINDOW_PUSH
local EVENT_WINDOW_POP = jive.ui.EVENT_WINDOW_POP
@@ -270,7 +271,7 @@
function hideOnAllButtonInput(self)
if not self.hideOnAllButtonInputHandle then
- self.hideOnAllButtonInputHandle = self:addListener(ACTION |
EVENT_KEY_ALL | EVENT_MOUSE_PRESS | EVENT_MOUSE_HOLD,
+ self.hideOnAllButtonInputHandle = self:addListener(ACTION |
EVENT_KEY_PRESS | EVENT_KEY_HOLD | EVENT_MOUSE_PRESS | EVENT_MOUSE_HOLD,
function(event)
return
hideOnAllButtonInputListener(self, event)
end)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
