[Pkg-mono-svn-commits] rev 2255 - ipod-sharp/tags/0.5.15-1/debian
ipod-sharp/tags/0.5.15-1/debian/patches
ipod-sharp/trunk/debian ipod-sharp/trunk/debian/patches
non-group/banshee/tags/0.10.6-1/debian
non-group/banshee/trunk/debian
Sebastian Dröge
slomo-guest at costa.debian.org
Tue Feb 14 12:15:21 UTC 2006
Author: slomo-guest
Date: 2006-02-14 12:15:19 +0000 (Tue, 14 Feb 2006)
New Revision: 2255
Added:
ipod-sharp/tags/0.5.15-1/debian/patches/
ipod-sharp/tags/0.5.15-1/debian/patches/01_rebuild-database-fix.diff
ipod-sharp/trunk/debian/patches/
ipod-sharp/trunk/debian/patches/01_rebuild-database-fix.diff
Modified:
ipod-sharp/tags/0.5.15-1/debian/changelog
ipod-sharp/tags/0.5.15-1/debian/rules
ipod-sharp/trunk/debian/changelog
ipod-sharp/trunk/debian/rules
non-group/banshee/tags/0.10.6-1/debian/changelog
non-group/banshee/tags/0.10.6-1/debian/control
non-group/banshee/trunk/debian/changelog
non-group/banshee/trunk/debian/control
Log:
* update banshee and ipod-sharp to the versions that were really uploaded
Modified: ipod-sharp/tags/0.5.15-1/debian/changelog
===================================================================
--- ipod-sharp/tags/0.5.15-1/debian/changelog 2006-02-13 19:54:20 UTC (rev 2254)
+++ ipod-sharp/tags/0.5.15-1/debian/changelog 2006-02-14 12:15:19 UTC (rev 2255)
@@ -2,6 +2,8 @@
* New upstream release
* Update to debhelper compat version 5
+ * 01_rebuild-database-fix.diff:
+ + Small fix from CVS for the new rebuild database feature
-- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Feb 2006 10:56:18 +0100
Added: ipod-sharp/tags/0.5.15-1/debian/patches/01_rebuild-database-fix.diff
===================================================================
--- ipod-sharp/tags/0.5.15-1/debian/patches/01_rebuild-database-fix.diff 2006-02-13 19:54:20 UTC (rev 2254)
+++ ipod-sharp/tags/0.5.15-1/debian/patches/01_rebuild-database-fix.diff 2006-02-14 12:15:19 UTC (rev 2255)
@@ -0,0 +1,83 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog (revision 56832)
++++ ChangeLog (working copy)
+@@ -1,3 +1,11 @@
++2006-02-13 James Willcox <snorp at snorp.net>
++
++ * src/Song.cs: only create a new unique path in the Uri setter
++ if the song isn't already on the device.
++ * src/SongDatabase.cs: s/GetPodPath/GetUniquePodPath/ and
++ add a GetPodPath, which just returns the ipodized path
++ for a file.
++
+ 2006-02-13 Aaron Bockover <aaron at abock.org>
+
+ 0.5.15 Released
+Index: src/SongDatabase.cs
+===================================================================
+--- src/SongDatabase.cs (revision 56832)
++++ src/SongDatabase.cs (working copy)
+@@ -1485,8 +1485,8 @@
+ }
+ }
+
+- private bool IsSongOnDevice(Song song) {
+- return song.FileName.StartsWith (MusicBasePath + Path.DirectorySeparatorChar + "F");
++ internal bool IsSongOnDevice(string path) {
++ return path.StartsWith (MusicBasePath + Path.DirectorySeparatorChar + "F");
+ }
+
+ private string FormatSpace (UInt64 bytes) {
+@@ -1506,7 +1506,7 @@
+ }
+
+ foreach (Song song in songsToAdd) {
+- if (!IsSongOnDevice (song)) {
++ if (!IsSongOnDevice (song.FileName)) {
+ required += (UInt64) song.Size;
+ }
+ }
+@@ -1620,7 +1620,7 @@
+
+ // Copy songs to iPod; if song is already in the Music directory structure, do not copy
+ foreach (Song song in songsToAdd) {
+- if (!IsSongOnDevice (song)) {
++ if (!IsSongOnDevice (song.FileName)) {
+ string dest = GetFilesystemPath (song.Track.GetDetail (DetailType.Location).Value);
+ CopySong (song, dest, completed++, songsToAdd.Count);
+ song.FileName = dest;
+@@ -1685,7 +1685,15 @@
+ return device.MountPoint + ipodPath.Replace (":", "/");
+ }
+
+- internal string GetPodPath (string path) {
++ internal string GetPodPath (string path) {
++ if (path == null || !path.StartsWith (device.MountPoint))
++ return null;
++
++ string ret = path.Replace (device.MountPoint, "");
++ return ret.Replace ("/", ":");
++ }
++
++ internal string GetUniquePodPath (string path) {
+ if (path == null)
+ return null;
+
+Index: src/Song.cs
+===================================================================
+--- src/Song.cs (revision 56832)
++++ src/Song.cs (working copy)
+@@ -61,7 +61,11 @@
+ throw new ArgumentException ("only file scheme is allowed");
+
+ DetailRecord detail = record.GetDetail (DetailType.Location);
+- detail.Value = db.GetPodPath (value.LocalPath);
++
++ if (db.IsSongOnDevice (value.LocalPath))
++ detail.Value = db.GetPodPath (value.LocalPath);
++ else
++ detail.Value = db.GetUniquePodPath (value.LocalPath);
+
+ FileInfo info = new FileInfo (value.LocalPath);
+ record.Size = (int) info.Length;
Modified: ipod-sharp/tags/0.5.15-1/debian/rules
===================================================================
--- ipod-sharp/tags/0.5.15-1/debian/rules 2006-02-13 19:54:20 UTC (rev 2254)
+++ ipod-sharp/tags/0.5.15-1/debian/rules 2006-02-14 12:15:19 UTC (rev 2255)
@@ -2,6 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
common-binary-post-install-indep:: list-missing
Modified: ipod-sharp/trunk/debian/changelog
===================================================================
--- ipod-sharp/trunk/debian/changelog 2006-02-13 19:54:20 UTC (rev 2254)
+++ ipod-sharp/trunk/debian/changelog 2006-02-14 12:15:19 UTC (rev 2255)
@@ -2,6 +2,8 @@
* New upstream release
* Update to debhelper compat version 5
+ * 01_rebuild-database-fix.diff:
+ + Small fix from CVS for the new rebuild database feature
-- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Feb 2006 10:56:18 +0100
Added: ipod-sharp/trunk/debian/patches/01_rebuild-database-fix.diff
===================================================================
--- ipod-sharp/trunk/debian/patches/01_rebuild-database-fix.diff 2006-02-13 19:54:20 UTC (rev 2254)
+++ ipod-sharp/trunk/debian/patches/01_rebuild-database-fix.diff 2006-02-14 12:15:19 UTC (rev 2255)
@@ -0,0 +1,83 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog (revision 56832)
++++ ChangeLog (working copy)
+@@ -1,3 +1,11 @@
++2006-02-13 James Willcox <snorp at snorp.net>
++
++ * src/Song.cs: only create a new unique path in the Uri setter
++ if the song isn't already on the device.
++ * src/SongDatabase.cs: s/GetPodPath/GetUniquePodPath/ and
++ add a GetPodPath, which just returns the ipodized path
++ for a file.
++
+ 2006-02-13 Aaron Bockover <aaron at abock.org>
+
+ 0.5.15 Released
+Index: src/SongDatabase.cs
+===================================================================
+--- src/SongDatabase.cs (revision 56832)
++++ src/SongDatabase.cs (working copy)
+@@ -1485,8 +1485,8 @@
+ }
+ }
+
+- private bool IsSongOnDevice(Song song) {
+- return song.FileName.StartsWith (MusicBasePath + Path.DirectorySeparatorChar + "F");
++ internal bool IsSongOnDevice(string path) {
++ return path.StartsWith (MusicBasePath + Path.DirectorySeparatorChar + "F");
+ }
+
+ private string FormatSpace (UInt64 bytes) {
+@@ -1506,7 +1506,7 @@
+ }
+
+ foreach (Song song in songsToAdd) {
+- if (!IsSongOnDevice (song)) {
++ if (!IsSongOnDevice (song.FileName)) {
+ required += (UInt64) song.Size;
+ }
+ }
+@@ -1620,7 +1620,7 @@
+
+ // Copy songs to iPod; if song is already in the Music directory structure, do not copy
+ foreach (Song song in songsToAdd) {
+- if (!IsSongOnDevice (song)) {
++ if (!IsSongOnDevice (song.FileName)) {
+ string dest = GetFilesystemPath (song.Track.GetDetail (DetailType.Location).Value);
+ CopySong (song, dest, completed++, songsToAdd.Count);
+ song.FileName = dest;
+@@ -1685,7 +1685,15 @@
+ return device.MountPoint + ipodPath.Replace (":", "/");
+ }
+
+- internal string GetPodPath (string path) {
++ internal string GetPodPath (string path) {
++ if (path == null || !path.StartsWith (device.MountPoint))
++ return null;
++
++ string ret = path.Replace (device.MountPoint, "");
++ return ret.Replace ("/", ":");
++ }
++
++ internal string GetUniquePodPath (string path) {
+ if (path == null)
+ return null;
+
+Index: src/Song.cs
+===================================================================
+--- src/Song.cs (revision 56832)
++++ src/Song.cs (working copy)
+@@ -61,7 +61,11 @@
+ throw new ArgumentException ("only file scheme is allowed");
+
+ DetailRecord detail = record.GetDetail (DetailType.Location);
+- detail.Value = db.GetPodPath (value.LocalPath);
++
++ if (db.IsSongOnDevice (value.LocalPath))
++ detail.Value = db.GetPodPath (value.LocalPath);
++ else
++ detail.Value = db.GetUniquePodPath (value.LocalPath);
+
+ FileInfo info = new FileInfo (value.LocalPath);
+ record.Size = (int) info.Length;
Modified: ipod-sharp/trunk/debian/rules
===================================================================
--- ipod-sharp/trunk/debian/rules 2006-02-13 19:54:20 UTC (rev 2254)
+++ ipod-sharp/trunk/debian/rules 2006-02-14 12:15:19 UTC (rev 2255)
@@ -2,6 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
common-binary-post-install-indep:: list-missing
Modified: non-group/banshee/tags/0.10.6-1/debian/changelog
===================================================================
--- non-group/banshee/tags/0.10.6-1/debian/changelog 2006-02-13 19:54:20 UTC (rev 2254)
+++ non-group/banshee/tags/0.10.6-1/debian/changelog 2006-02-14 12:15:19 UTC (rev 2255)
@@ -10,6 +10,7 @@
+ mono-mcs and libmono-dev (>= 1.1.10)
+ libsqlite3-dev (>= 3.2)
+ libgtk2-dev (>= 2.8)
+ * Suggest banshee-daap
-- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Feb 2006 11:03:30 +0100
Modified: non-group/banshee/tags/0.10.6-1/debian/control
===================================================================
--- non-group/banshee/tags/0.10.6-1/debian/control 2006-02-13 19:54:20 UTC (rev 2254)
+++ non-group/banshee/tags/0.10.6-1/debian/control 2006-02-14 12:15:19 UTC (rev 2255)
@@ -9,6 +9,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, libsqlite3-0 (>= 3.2), libmono0
Recommends: gstreamer0.8-lame, gstreamer0.8-flac, gstreamer0.8-faad, gstreamer0.8-faac, gstreamer0.8-vorbis, gstreamer0.8-mad
+Suggests: banshee-daap
Description: Audio Managment and Playback application
Banshee is an audio management and playback application for the GNOME
Desktop, allowing users to import audio from CDs, search their library,
Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2006-02-13 19:54:20 UTC (rev 2254)
+++ non-group/banshee/trunk/debian/changelog 2006-02-14 12:15:19 UTC (rev 2255)
@@ -10,6 +10,7 @@
+ mono-mcs and libmono-dev (>= 1.1.10)
+ libsqlite3-dev (>= 3.2)
+ libgtk2-dev (>= 2.8)
+ * Suggest banshee-daap
-- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Feb 2006 11:03:30 +0100
Modified: non-group/banshee/trunk/debian/control
===================================================================
--- non-group/banshee/trunk/debian/control 2006-02-13 19:54:20 UTC (rev 2254)
+++ non-group/banshee/trunk/debian/control 2006-02-14 12:15:19 UTC (rev 2255)
@@ -9,6 +9,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, libsqlite3-0 (>= 3.2), libmono0
Recommends: gstreamer0.8-lame, gstreamer0.8-flac, gstreamer0.8-faad, gstreamer0.8-faac, gstreamer0.8-vorbis, gstreamer0.8-mad
+Suggests: banshee-daap
Description: Audio Managment and Playback application
Banshee is an audio management and playback application for the GNOME
Desktop, allowing users to import audio from CDs, search their library,
More information about the Pkg-mono-svn-commits
mailing list