I've uploaded moblin-media and gstreamer-dbus-media-service to gutsy. I
made the following changes to moblin-media:
* Removed the installation of the sample content for now
* Changed the name of the source and binary package to moblin-media and
altered debian/rules to match
* Fudged MusicManag slightly so that fileInfo is always populated -
otherwise it falls over on anything that isn't an mp3.
The diff to current git is attached.
--
Matthew Garrett | [EMAIL PROTECTED]
diff --git a/Makefile b/Makefile
index 3ee177c..e293a54 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,6 @@ install:
@mkdir -p ${MEDIASTREAMDIR}/plugins
@mkdir -p ${THEME_DIR}
@mkdir -p ${MEDIAAPPDIR}/config
- @install -m 644 -D content/internetRadioList.m3u
${MEDIASTREAMDIR}/.playlist/internetRadioList.m3u
- @install -m 644 -D content/photo/alps.jpg ${MEDIASTREAMDIR}/photo
- @install -m 644 -D content/photo/alps_train.bmp ${MEDIASTREAMDIR}/photo
- @install -m 644 -D content/photo/colleseum.jpg ${MEDIASTREAMDIR}/photo
- @install -m 644 -D content/photo/eiffel_tower.png
${MEDIASTREAMDIR}/photo
- @install -m 644 -D content/photo/neuschwanstein_castle.jpg
${MEDIASTREAMDIR}/photo
@install -m 644 -D images/rewind.png ${IMAGE_DIR}/rewind.png
@install -m 644 -D images/previous.png ${IMAGE_DIR}/previous.png
@install -m 644 -D images/play.png ${IMAGE_DIR}/play.png
diff --git a/debian/changelog b/debian/changelog
index 3c25b0e..867b249 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-mobile-player (0.5) UNRELEASED; urgency=low
+moblin-media (0.5) gutsy; urgency=low
+ [ Rusty Lynch ]
* Changed the name of the gstreamer media service
* Removed the gstreamer specific config file
* Changed the name of the directory where the media service config
@@ -9,7 +10,11 @@ mobile-player (0.5) UNRELEASED; urgency=low
* Fixed a bug where the namespace was not added to a constant ref
* Fixed the way that the home directory is found
- -- Rusty Lynch <[EMAIL PROTECTED]> Mon, 08 Oct 2007 19:35:52 -0700
+ [ Matthew Garrett ]
+ * Remove sample content from the binary package
+ * Upload to Ubuntu
+
+ -- Matthew Garrett <[EMAIL PROTECTED]> Tue, 09 Oct 2007 13:30:29 +0100
mobile-player (0.4ubuntu22) feisty; urgency=low
diff --git a/debian/control b/debian/control
index 70b7a62..33dc001 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
-Source: mobile-player
+Source: moblin-media
Section: graphics
Priority: optional
Maintainer: Shen Cathy <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), debootstrap, python-support (>= 0.3)
+Build-Depends: debhelper (>= 5), python-support (>= 0.3)
Standards-Version: 0.3
-Package: mobile-player
+Package: moblin-media
Architecture: all
-Depends: ${python:Depends}, python-gst0.10, python-dbus, python-glade2,
python-gtk2, python-gtk2-dev, gstreamer0.10-alsa, gstreamer0.10-plugins-base,
gstreamer0.10-plugins-good, python2.5-hildon, python-imaging, libgnomevfs2-0,
python-gnome2, python-mutagen, gstreamer-dbus-media-service
+Depends: ${python:Depends}, python-gst0.10, python-dbus, python-glade2,
python-gtk2, python-gtk2-dev, gstreamer0.10-alsa, gstreamer0.10-plugins-base,
gstreamer0.10-plugins-good, python-hildon, python-imaging, libgnomevfs2-0,
python-gnome2, python-mutagen, gstreamer-dbus-media-service (>= 0.1.7)
Recommends: gstreamer0.10-plugins-bad | gstreamer0.10-plugins-ugly |
gstreamer0.10-ffmpeg
Description: Media player for Ubuntu Mobile and Embedded
This is the media player used by default in Ubuntu Mobile.
diff --git a/debian/rules b/debian/rules
index 5382635..fe46206 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ install: build
dh_clean -k
dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/mobile-player install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/moblin-media install
# Build architecture-independent files here.
diff --git a/src/MusicManag.py b/src/MusicManag.py
index e326295..e80082f 100755
--- a/src/MusicManag.py
+++ b/src/MusicManag.py
@@ -338,13 +338,13 @@ class MusicManag:
fileInfo=self.getMp3Info(fileDir)
if len(fileInfo) != 0:
return fileInfo
- fileInfo['title'] = 'Unknown'
- fileInfo['artist'] = 'Unknown'
- fileInfo['album'] = 'Unknown'
- fileInfo['tracknum']='Unknown'
- fileInfo['date'] ='Unknown'
- fileInfo['length']='Unknown'
- fileInfo['albumcover']='Unknown'
+ fileInfo['title'] = 'Unknown'
+ fileInfo['artist'] = 'Unknown'
+ fileInfo['album'] = 'Unknown'
+ fileInfo['tracknum']='Unknown'
+ fileInfo['date'] ='Unknown'
+ fileInfo['length']='Unknown'
+ fileInfo['albumcover']='Unknown'
#elif fileName == ".wav" or fileName==".wma" or fileName==".aac" or
fileName==".ogg" or fileName==".rm"
#set default value for these streams
if fileInfo['title'] == 'Unknown':
--
Ubuntu-mobile mailing list
Ubuntu-mobile@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/ubuntu-mobile
