[Pkg-mono-svn-commits] rev 2678 - in
non-group/banshee/trunk/debian: . patches
Sebastian Dröge
slomo-guest at costa.debian.org
Wed Aug 23 23:22:17 UTC 2006
Author: slomo-guest
Date: 2006-08-23 23:22:16 +0000 (Wed, 23 Aug 2006)
New Revision: 2678
Modified:
non-group/banshee/trunk/debian/banshee.install
non-group/banshee/trunk/debian/changelog
non-group/banshee/trunk/debian/patches/03_cvs-backports.diff
Log:
* updated to banshee 0.10.11
Modified: non-group/banshee/trunk/debian/banshee.install
===================================================================
--- non-group/banshee/trunk/debian/banshee.install 2006-08-23 23:11:07 UTC (rev 2677)
+++ non-group/banshee/trunk/debian/banshee.install 2006-08-23 23:22:16 UTC (rev 2678)
@@ -11,8 +11,6 @@
debian/tmp/usr/lib/banshee/Banshee.Dap/
debian/tmp/usr/lib/banshee/Banshee.Plugins/Audioscrobbler.dll*
debian/tmp/etc/gconf/schemas/audioscrobbler.schemas
-debian/tmp/usr/lib/banshee/Banshee.Plugins/FileSystemMonitor.dll*
-debian/tmp/etc/gconf/schemas/filesystemmonitor.schemas
debian/tmp/usr/lib/banshee/Banshee.Plugins/MetadataSearch.dll*
debian/tmp/etc/gconf/schemas/metadatasearch.schemas
debian/tmp/usr/lib/banshee/Banshee.Plugins/MMKeys.dll*
Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2006-08-23 23:11:07 UTC (rev 2677)
+++ non-group/banshee/trunk/debian/changelog 2006-08-23 23:22:16 UTC (rev 2678)
@@ -1,3 +1,9 @@
+banshee (0.10.11-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Tue, 1 Aug 2006 07:54:34 +0200
+
banshee (0.10.10-3) unstable; urgency=low
* Remove libmono-cairo1.0-cil from Build-Depends again. The FTBFS was only
Modified: non-group/banshee/trunk/debian/patches/03_cvs-backports.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/03_cvs-backports.diff 2006-08-23 23:11:07 UTC (rev 2677)
+++ non-group/banshee/trunk/debian/patches/03_cvs-backports.diff 2006-08-23 23:22:16 UTC (rev 2678)
@@ -115,402 +115,8 @@
- return str == null ? String.Empty : Regex.Replace(str, "'", @"''");
+ return str == null ? String.Empty : str.Replace("'", "''");
}
-
- public static Statement Empty
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/FileTrackInfo.cs,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- src/Banshee.Base/FileTrackInfo.cs 2006/04/09 21:30:23 1.4
-+++ src/Banshee.Base/FileTrackInfo.cs 2006/05/07 17:00:45 1.5
-@@ -105,8 +105,8 @@
- }
-
- while(path != null && path != String.Empty) {
-- path = Path.GetDirectoryName(path);
- fileName = Path.GetFileName (path);
-+ path = Path.GetDirectoryName(path);
- if(album == String.Empty) {
- album = fileName;
- continue;
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Widgets/HigMessageDialog.cs,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- src/Banshee.Widgets/HigMessageDialog.cs 2006/02/13 22:18:14 1.2
-+++ src/Banshee.Widgets/HigMessageDialog.cs 2006/05/07 17:00:45 1.3
-@@ -159,7 +159,7 @@
- DefaultResponse = response;
- button.AddAccelerator ("activate",
- accel_group,
-- (uint) Gdk.Key.Escape,
-+ (uint) Gdk.Key.Return,
- 0,
- Gtk.AccelFlags.Visible);
- }
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/LibraryTrackInfo.cs,v
-retrieving revision 1.10
-retrieving revision 1.11
-diff -u -r1.10 -r1.11
---- src/Banshee.Base/LibraryTrackInfo.cs 2006/05/01 23:44:50 1.10
-+++ src/Banshee.Base/LibraryTrackInfo.cs 2006/05/07 17:00:45 1.11
-@@ -86,7 +86,7 @@
-
- private string MoveToPlace(string old_filename, bool initial_import)
- {
-- bool in_library = old_filename.StartsWith (Globals.Library.Location);
-+ bool in_library = old_filename.StartsWith (Globals.Library.Location + Path.DirectorySeparatorChar);
- // Console.WriteLine ("\"{0}\" in \"{1}\": {2}", old_filename, Core.Library.Location, in_library);
-
- if (initial_import && !in_library) {
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/PlayerInterface.cs,v
-retrieving revision 1.167.2.4
-retrieving revision 1.167.2.5
-diff -u -r1.167.2.4 -r1.167.2.5
---- src/PlayerInterface.cs 2006/05/01 16:33:17 1.167.2.4
-+++ src/PlayerInterface.cs 2006/05/16 17:08:41 1.167.2.5
-@@ -404,6 +404,7 @@
- playlistView.DragDataGet += OnPlaylistViewDragDataGet;
- playlistView.DragDrop += OnPlaylistViewDragDrop;
- playlistView.Selection.Changed += OnPlaylistViewSelectionChanged;
-+ playlistView.Vadjustment.Changed += OnPlaylistViewVadjustmentChanged;
-
- playlistView.EnableModelDragSource(
- Gdk.ModifierType.Button1Mask | Gdk.ModifierType.Button3Mask,
-@@ -922,6 +923,15 @@
- !(source is AudioCdSource || source is DapSource);
- }
-
-+ private void OnPlaylistViewVadjustmentChanged(object o, EventArgs args)
-+ {
-+ double max_offset = playlistView.Vadjustment.Upper - playlistView.Vadjustment.PageSize;
-+
-+ if(playlistView.Vadjustment.Value > max_offset) {
-+ playlistView.Vadjustment.Value = max_offset;
-+ }
-+ }
-+
- private void OnSourceManagerActiveSourceChanged(SourceEventArgs args)
- {
- ThreadAssist.ProxyToMain(HandleSourceChanged);
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Main.cs,v
-retrieving revision 1.29
-retrieving revision 1.29.2.1
-diff -u -r1.29 -r1.29.2.1
---- src/Main.cs 2006/02/13 22:18:07 1.29
-+++ src/Main.cs 2006/05/19 20:34:43 1.29.2.1
-@@ -56,6 +56,9 @@
- #endif
- }
-
-+ [System.Runtime.InteropServices.DllImport("libdbus-glib-1")]
-+ private static extern void dbus_g_thread_init();
-+
- private static void Startup(string [] args)
- {
- try {
-@@ -63,6 +66,7 @@
- } catch {}
-
- Gtk.Application.Init();
-+ dbus_g_thread_init();
-
- Globals.ArgumentQueue = new ArgumentQueue(new ArgumentLayout [] {
- new ArgumentLayout("enqueue <files>","Files to enqueue, must be last argument specified"),
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/PlaylistView.cs,v
-retrieving revision 1.45.2.1
-retrieving revision 1.45.2.2
-diff -u -r1.45.2.1 -r1.45.2.2
---- src/PlaylistView.cs 2006/04/05 20:26:22 1.45.2.1
-+++ src/PlaylistView.cs 2006/05/19 18:24:23 1.45.2.2
-@@ -77,6 +77,14 @@
- public PlaylistColumn PlaysColumn;
- public PlaylistColumn LastPlayedColumn;
-
-+ private class ColumnSorter : IComparer
-+ {
-+ public int Compare(object a, object b)
-+ {
-+ return (a as PlaylistColumn).Order.CompareTo((b as PlaylistColumn).Order);
-+ }
-+ }
-+
- public PlaylistView(PlaylistModel model)
- {
- // set up columns
-@@ -121,8 +129,10 @@
- 8, (int)ColumnId.LastPlayed);
- columns.Add(LastPlayedColumn);
-
-+ columns.Sort(new ColumnSorter());
-+
- foreach(PlaylistColumn plcol in columns) {
-- InsertColumn(plcol.Column, plcol.Order);
-+ AppendColumn(plcol.Column);
- }
-
- // FIXME: would be nice to have these as PlaylistColumns too...
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/Database.cs,v
-retrieving revision 1.6
-retrieving revision 1.6.2.1
-diff -u -r1.6 -r1.6.2.1
---- src/Banshee.Base/Database.cs 2006/02/13 22:18:07 1.6
-+++ src/Banshee.Base/Database.cs 2006/05/19 18:24:23 1.6.2.1
-@@ -1,4 +1,3 @@
--
- /***************************************************************************
- * Database.cs
- *
-@@ -94,7 +93,8 @@
- CREATE TABLE PlaylistEntries (
- EntryID INTEGER PRIMARY KEY,
- PlaylistID INTEGER NOT NULL,
-- TrackID INTEGER NOT NULL
-+ TrackID INTEGER NOT NULL,
-+ ViewOrder INTEGER NOT NULL DEFAULT 0
- )");
- }
- }
-@@ -120,6 +120,13 @@
- } catch(ApplicationException) {
- LogCore.Instance.PushDebug("Adding new database column", "RemoteLookupStatus INTEGER");
- Execute("ALTER TABLE Tracks ADD RemoteLookupStatus INTEGER");
-+ }
-+
-+ try {
-+ QuerySingle("SELECT ViewOrder FROM PlaylistEntries LIMIT 1");
-+ } catch(ApplicationException) {
-+ LogCore.Instance.PushDebug("Adding new database column", "ViewOrder INTEGER");
-+ Execute("ALTER TABLE PlaylistEntries ADD ViewOrder INTEGER NOT NULL DEFAULT 0");
- }
- }
- }
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/Sources/PlaylistSource.cs,v
-retrieving revision 1.5.2.1
-retrieving revision 1.5.2.2
-diff -u -r1.5.2.1 -r1.5.2.2
---- src/Banshee.Base/Sources/PlaylistSource.cs 2006/05/01 16:33:19 1.5.2.1
-+++ src/Banshee.Base/Sources/PlaylistSource.cs 2006/05/19 18:24:24 1.5.2.2
-@@ -1,9 +1,8 @@
--
- /***************************************************************************
- * PlaylistSource.cs
- *
-- * Copyright (C) 2005 Novell
-- * Written by Aaron Bockover (aaron at aaronbock.net)
-+ * Copyright (C) 2005-2006 Novell, Inc.
-+ * Written by Aaron Bockover <aaron at abock.org>
- ****************************************************************************/
-
- /* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
-@@ -52,6 +51,8 @@
- }
-
- private ArrayList tracks = new ArrayList();
-+ private Queue remove_queue = new Queue();
-+ private Queue append_queue = new Queue();
- private int id;
-
- public PlaylistSource() : this(0)
-@@ -84,18 +85,39 @@
- }
-
- private void LoadFromDatabase()
-- {
-+ {
- Name = (string)Globals.Library.Db.QuerySingle(String.Format(
- @"SELECT Name
- FROM Playlists
- WHERE PlaylistID = '{0}'",
- id
- ));
--
-+
-+ // check to see if ViewOrder has ever been set, if not, perform
-+ // a default ordering as a compatibility update
-+ if(Convert.ToInt32(Globals.Library.Db.QuerySingle(String.Format(
-+ @"SELECT COUNT(*)
-+ FROM PlaylistEntries
-+ WHERE PlaylistID = '{0}'
-+ AND ViewOrder > 0",
-+ id))) <= 0) {
-+ Console.WriteLine("Performing compatibility update on playlist '{0}'", Name);
-+ Globals.Library.Db.Execute(String.Format(
-+ @"UPDATE PlaylistEntries
-+ SET ViewOrder = (ROWID -
-+ (SELECT COUNT(*)
-+ FROM PlaylistEntries
-+ WHERE PlaylistID < '{0}'))
-+ WHERE PlaylistID = '{0}'",
-+ id
-+ ));
-+ }
-+
- IDataReader reader = Globals.Library.Db.Query(String.Format(
- @"SELECT TrackID
- FROM PlaylistEntries
-- WHERE PlaylistID = '{0}'",
-+ WHERE PlaylistID = '{0}'
-+ ORDER BY ViewOrder",
- id
- ));
-
-@@ -143,6 +165,7 @@
- if(track is LibraryTrackInfo) {
- lock(TracksMutex) {
- tracks.Add(track);
-+ append_queue.Enqueue(track);
- }
- OnUpdated();
- }
-@@ -152,6 +175,7 @@
- {
- lock(TracksMutex) {
- tracks.Remove(track);
-+ remove_queue.Enqueue(track);
- }
- }
-
-@@ -169,36 +193,88 @@
- id
- ));
-
-+ tracks.Clear();
-+ append_queue.Clear();
-+ remove_queue.Clear();
-+
- SourceManager.RemoveSource(this);
- playlists.Remove(this);
- }
-
- public override void Commit()
- {
-- Globals.Library.Db.Execute(String.Format(
-- @"DELETE FROM PlaylistEntries
-- WHERE PlaylistID = '{0}'",
-- id
-- ));
-+ if(remove_queue.Count > 0) {
-+ lock(TracksMutex) {
-+ while(remove_queue.Count > 0) {
-+ TrackInfo track = remove_queue.Dequeue() as TrackInfo;
-+ Globals.Library.Db.Execute(String.Format(
-+ @"DELETE FROM PlaylistEntries
-+ WHERE PlaylistID = '{0}'
-+ AND TrackID = '{1}'",
-+ id, track.TrackId
-+ ));
-+ }
-+ }
-+ }
-
-- lock(TracksMutex) {
-- foreach(TrackInfo track in Tracks) {
-- if(track.TrackId <= 0)
-- continue;
--
-- Globals.Library.Db.Execute(String.Format(
-- @"INSERT INTO PlaylistEntries
-- VALUES (NULL, '{0}', '{1}')",
-- id, track.TrackId
-- ));
-+ if(append_queue.Count > 0) {
-+ lock(TracksMutex) {
-+ while(append_queue.Count > 0) {
-+ TrackInfo track = append_queue.Dequeue() as TrackInfo;
-+ Globals.Library.Db.Execute(String.Format(
-+ @"INSERT INTO PlaylistEntries
-+ VALUES (NULL, '{0}', '{1}', (
-+ SELECT CASE WHEN MAX(ViewOrder)
-+ THEN MAX(ViewOrder) + 1
-+ ELSE 1 END
-+ FROM PlaylistEntries
-+ WHERE PlaylistID = '{0}')
-+ )", id, track.TrackId
-+ ));
-+ }
- }
- }
- }
-
- public override void Reorder(TrackInfo track, int position)
- {
-- RemoveTrack(track);
- lock(TracksMutex) {
-+ int sql_position = 1;
-+
-+ if(position > 0) {
-+ TrackInfo sibling = tracks[position] as TrackInfo;
-+ if(sibling == track || sibling == null) {
-+ return;
-+ }
-+
-+ sql_position = Convert.ToInt32(Globals.Library.Db.QuerySingle(String.Format(
-+ @"SELECT ViewOrder
-+ FROM PlaylistEntries
-+ WHERE PlaylistID = '{0}'
-+ AND TrackID = '{1}'
-+ LIMIT 1", id, sibling.TrackId)
-+ ));
-+ } else if(tracks[position] == track) {
-+ return;
-+ }
-+
-+ Globals.Library.Db.Execute(String.Format(
-+ @"UPDATE PlaylistEntries
-+ SET ViewOrder = ViewOrder + 1
-+ WHERE PlaylistID = '{0}'
-+ AND ViewOrder >= '{1}'",
-+ id, sql_position
-+ ));
-+
-+ Globals.Library.Db.Execute(String.Format(
-+ @"UPDATE PlaylistEntries
-+ SET ViewOrder = '{1}'
-+ WHERE PlaylistID = '{0}'
-+ AND TrackID = '{2}'",
-+ id, sql_position, track.TrackId
-+ ));
-+
-+ tracks.Remove(track);
- tracks.Insert(position, track);
- }
- }
-@@ -223,10 +299,13 @@
-
- int removed_count = 0;
-
-- foreach(TrackInfo track in args.Tracks) {
-- if(tracks.Contains(track)) {
-- tracks.Remove(track);
-- removed_count++;
-+ lock(TracksMutex) {
-+ foreach(TrackInfo track in args.Tracks) {
-+ if(tracks.Contains(track)) {
-+ tracks.Remove(track);
-+ remove_queue.Enqueue(track);
-+ removed_count++;
-+ }
- }
- }
-
-
--- src/banshee.exe.config.in.old 2006-05-22 21:13:16.504959272 +0200
+++ src/banshee.exe.config.in 2006-05-22 21:13:59.524419320 +0200
@@ -6,4 +6,5 @@
@@ -520,148 +126,3 @@
+ <dllmap dll="libdbus-glib-1" target="libdbus-glib-1.so.2" />
</configuration>
-===================================================================
-RCS file: /cvs/gnome/banshee/libbanshee/gst-cd-rip-0.10.c,v
-retrieving revision 1.4.2.1
-retrieving revision 1.4.2.2
-diff -u -r1.4.2.1 -r1.4.2.2
---- libbanshee/gst-cd-rip-0.10.c 2006/04/03 21:33:27 1.4.2.1
-+++ libbanshee/gst-cd-rip-0.10.c 2006/05/29 19:05:12 1.4.2.2
-@@ -197,8 +197,8 @@
- g_warning("vorbisenc added without oggmux, attempting to insert oggmux element in pipeline");
- pipeline = g_strdup_printf("audioconvert ! %s ! oggmux", encoder_pipeline);
- } else if((strstr(encoder_pipeline, "lame") != NULL || strstr(encoder_pipeline, "xingenc") != NULL) &&
-- strstr(encoder_pipeline, "id3mux") == NULL) {
-- const gchar *muxer_names [] = { "taglibid3mux", "id3mux", NULL};
-+ strstr(encoder_pipeline, "mux") == NULL) {
-+ const gchar *muxer_names [] = { "id3v2mux", "taglibid3mux", "id3mux", NULL};
- gint i;
-
- for(i = 0; muxer_names[i] != NULL; i++) {
-
-===================================================================
-RCS file: /cvs/gnome/banshee/src/BurnCore.cs,v
-retrieving revision 1.28.2.3
-retrieving revision 1.28.2.4
-diff -u -r1.28.2.3 -r1.28.2.4
---- src/BurnCore.cs 2006/04/07 21:33:55 1.28.2.3
-+++ src/BurnCore.cs 2006/05/29 20:03:03 1.28.2.4
-@@ -1,8 +1,8 @@
- /***************************************************************************
- * BurnCore.cs
- *
-- * Copyright (C) 2005 Novell
-- * Written by Aaron Bockover (aaron at aaronbock.net)
-+ * Copyright (C) 2005-2006 Novell, Inc.
-+ * Written by Aaron Bockover <aaron at abock.org>
- ****************************************************************************/
-
- /* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
-@@ -72,10 +72,18 @@
-
- canceled = false;
-
-+ double total_seconds = 0;
-+
- foreach(TrackInfo track in encodeQueue) {
-- // 44.1 kHz sample rate * 16 bit channel resolution * 2 channels (stereo)
-- estimated_encoded_bytes += track.Duration.TotalSeconds * 176400.0;
-+ total_seconds += track.Duration.TotalSeconds;
-+ }
-+
-+ if(!HaveRequiredSpace(total_seconds)) {
-+ return;
- }
-+
-+ // 44.1 kHz sample rate * 16 bit channel resolution * 2 channels (stereo)
-+ estimated_encoded_bytes = total_seconds * 176400.0;
-
- long free_space = PathUtil.GetDirectoryAvailableSpace(Paths.TempDir);
- if(free_space >= 0 && estimated_encoded_bytes >= free_space) {
-@@ -159,6 +167,49 @@
- Catalog.GetString("None of the songs selected for this CD could be found."));
- }
- }
-+
-+ private bool HaveRequiredSpace(double totalduration)
-+ {
-+ string selected_burner_id = null;
-+ try {
-+ selected_burner_id = (string)Globals.Configuration.Get(GConfKeys.CDBurnerId);
-+ } catch {
-+ }
-+
-+ BurnDrive drive = BurnUtil.GetDriveByIdOrDefault(selected_burner_id);
-+
-+ if(drive == null) {
-+ LogCore.Instance.PushWarning(
-+ Catalog.GetString("Problem creating CD"),
-+ Catalog.GetString("No CD writers were found on your system."));
-+ return false;
-+ }
-+
-+ if(drive.MediaSize <= 0) {
-+ LogCore.Instance.PushWarning(
-+ Catalog.GetString("Insert Blank CD"),
-+ Catalog.GetString("Please insert a blank CD disk for the write process."));
-+ return false;
-+ }
-+
-+ long available = (long)(((drive.MediaSize / 1024 / 1024) - 1) * 48 / 7);
-+ long remaining = (long)(available - totalduration);
-+
-+ if(remaining < 0) {
-+ int minutes = (int)(-remaining / 60);
-+ string msg = String.Format(
-+ Catalog.GetString("The inserted media is not large enough to hold your selected music.") + " " +
-+ Catalog.GetPluralString(
-+ "{0} more minute is needed on the media.",
-+ "{0} more minutes are needed on the media.",
-+ minutes), minutes);
-+
-+ LogCore.Instance.PushWarning(Catalog.GetString("Not Enough Space on Disc"), msg);
-+ return false;
-+ }
-+
-+ return true;
-+ }
-
- private void OnFileEncodeComplete(object o, FileCompleteArgs args)
- {
-@@ -301,7 +352,6 @@
- private BurnDrive drive;
- private BurnRecorder recorder;
- private BurnRecorderActions currentAction;
-- private long TotalDuration;
- private ActiveUserEvent user_event;
-
- public Burner(BurnCore.DiskType diskType, Queue burnQueue)
-@@ -333,27 +383,6 @@
- }
- }
-
-- private bool HaveRequiredSpace()
-- {
-- long available = (long)(((drive.MediaSize / 1024 / 1024) - 1) * 48 / 7);
-- long remaining = (long)(available - TotalDuration);
--
-- if(remaining < 0) {
-- int minutes = (int)(-remaining / 60);
-- string msg =
-- Catalog.GetString("The inserted media is not large enough to hold your selected music.") + " " +
-- Catalog.GetPluralString(
-- "{0} more minute is needed on the media.",
-- "{0} more minutes are needed on the media.",
-- minutes);
--
-- LogCore.Instance.PushWarning(Catalog.GetString("Not Enough Space on Disc"), msg);
-- return false;
-- }
--
-- return true;
-- }
--
- private void BurnThread()
- {
- ArrayList tracks = new ArrayList();
-
More information about the Pkg-mono-svn-commits
mailing list