[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/natty, updated. debian/1.9.0+git20101121.r1.b13266e-0ubuntu5-18-g05f047b

Iain Lane laney at ubuntu.com
Mon Dec 20 00:39:49 UTC 2010


The following commit has been merged in the ubuntu/natty branch:
commit d43f31f386bc186e59ca338ae904b8eee8a14a89
Merge: e0b966c95d9fa9683c6d4d4c7a6a4a12ec03bf90 93a69ad1067fc96bf5d1f309b084c426b36e2545
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Dec 19 20:57:42 2010 +0000

    Merge commit '06e753e2b8585af7fe71c6fe91e8225dd812072c'; branch 'experimental' into ubuntu/natty
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

diff --combined debian/changelog
index a07cee6,4c01195..8b24f2f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,54 +1,99 @@@
+ banshee (1.9.1-1) experimental; urgency=low
+ 
+   [ Chow Loong Jin ]
+   * [06e753e] Imported Upstream version 1.9.0+git20101121.r1.b13266e
+   * [b2cc56d] debian/patches/06_add-meego-desktop-file.patch: Refresh
+   * [b99b384] Revert performance patch that caused artwork to not
+     display
+   * [5f89945] debian/rules: Fix gettext domain (LP: #677173)
+ 
+   [ Iain Lane ]
+   * [1daf2e6] Imported Upstream version 1.9.1
+     + New Features
+       - Ubuntu One Music Store and SoundMenu Extensions - Not enabled in
+         Debian (yet)
+       - Subtitles
+     + Enhancements
+       - Massively rework the podcast edit dialog
+       - Let line wrap in properties table
+       - Add 'Podcast Properties' to episode menu
+       - Show context menu even for 'All' filters
+       - Only show tabs if there is more than one
+       - Make Play/Pause action tooltip only show play or pause
+       - Add support for the LG Ally phone
+       - Add dbus method to clear the play queue
+       - Allow to clear the play queue while in Populate mode
+       - Add back podcast browser
+       - Add a new 'Recently Played' default smart playlist
+       - Remember sources' column configuration
+       - Blank track editor spin buttons when 0
+       - Remove Home and Photo folder import sources
+    + Notable Bugs Fixed (79 fixed since 1.9.0)
+       - bgo#637202: Initialize the ipod each time we load
+       - bgo#630209: Fix podcast flag for video podcasts
+       - bgo#635780: Prevent GroupSources from being selected
+       - bgo#540394: Don't overwrite existing files when ripping
+       - bgo#635776: Ensure karma-sharp's DLLmap is copied in the build
+       - bgo#634662: Make search entry in MeeGo panel correctly show query
+       - bgo#634686: Fix streaming broken after first play
+       - bgo#635426: Ensure track filter actions updated
+       - bgo#635453: Fix regression with importing mkv
+       - bgo#608778: 'Random by' skips user-selected artist/album 
+   * [d50b927] Don't build the sound menu or u1ms extensions
+   * [c881367] Enable the Mpris extension by default
+   * [d7e9689] Cherry-pick upstream commit to fix issue with YOptions in
+     SimpleTable
+ 
+   [ Alex Launi ]
+   * [7d1f43c] Add recommends on media-player-info (Closes: #607410)
+ 
+  -- Iain Lane <laney at ubuntu.com>  Sun, 19 Dec 2010 18:13:07 +0000
+ 
 +banshee (1.9.0+git20101121.r1.b13266e-0ubuntu5) natty; urgency=low
 +
 +  * [e0db4ba] Disable the notification area and enable MPRIS by default
 +
 + -- Iain Lane <laney at ubuntu.com>  Fri, 26 Nov 2010 18:35:59 +0000
 +
 +banshee (1.9.0+git20101121.r1.b13266e-0ubuntu4) natty; urgency=low
 +
 +  * debian/rules: Fix gettext domain (LP: #677173)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 25 Nov 2010 11:30:48 +0800
 +
 +banshee (1.9.0+git20101121.r1.b13266e-0ubuntu3) natty; urgency=low
 +
 +  * debian/control:
 +    + Recommend banshee-extension-u1ms
 +    + Demote gst-plugins-bad from recommends to suggests
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 23 Nov 2010 04:27:24 +0800
 +
 +banshee (1.9.0+git20101121.r1.b13266e-0ubuntu2) natty; urgency=low
 +
 +  * debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch:
 +    + Revert a recent performance related patch that caused artwork to not
 +      display at all
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 22 Nov 2010 05:11:45 +0800
 +
 +banshee (1.9.0+git20101121.r1.b13266e-0ubuntu1) natty; urgency=low
 +
 +  * New upstream snapshot: Drop binary dep on libmono-system-data*-cil
 +  * debian/patches/06_add-meego-desktop-file.patch: Refresh
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 21 Nov 2010 12:21:02 +0800
 +
 +banshee (1.9.0-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + debian/banshee-meego.install: Install netbook banshee.desktop to UNE
 +      location
 +    + Disable boo support
 +    + Recommend soundmenu extension
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 18 Nov 2010 02:31:18 +0800
 +
  banshee (1.9.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -94,16 -100,6 +145,16 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 11 Nov 2010 22:45:14 +0800
  
 +banshee (1.8.0-2ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + debian/banshee-meego.install: Install netbook banshee.desktop to UNE
 +      location
 +    + Disable boo support
 +    + Recommend soundmenu extension
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 22 Oct 2010 01:53:21 +0800
 +
  banshee (1.8.0-2) experimental; urgency=low
  
    * Fix duplicates on import (BGO #623441)
@@@ -125,7 -121,7 +176,7 @@@ banshee (1.8.0-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 02:41:41 +0800
  
 -banshee (1.7.6-1) UNRELEASED; urgency=low
 +banshee (1.7.6-0ubuntu1) maverick; urgency=low
  
    * New upstream release
      + Enhancements:
@@@ -201,101 -197,6 +252,101 @@@ banshee (1.7.5-1) UNRELEASED; urgency=l
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 18 Sep 2010 01:47:47 +0800
  
 +banshee (1.7.5-0ubuntu2) maverick; urgency=low
 +
 +  * Fix casing of variable in patch, resolving missing dllmap issue
 +  * Ensure that gpod-sharp's DLLmap is copied
 +
 + -- Iain Lane <laney at ubuntu.com>  Wed, 08 Sep 2010 01:21:22 +0800
 +
 +banshee (1.7.5-0ubuntu1) maverick; urgency=low
 +
 +  [ Chow Loong Jin ]
 +  * New upstream release
 +    + New Features:
 +      - GIO/udev-based hardware backend
 +      - Apple Devices backend with support for iPod/iOS devices (LP: #554141)
 +      - MPRIS v2 support (Ubuntu Sound Menu, etc)
 +      - Audiobooks and Miro Guide extensions enabled by default
 +    + Enhancements/API Additions:
 +      - Play menu item in track context menu
 +      - Amazon affiliate codes for all supported countries
 +      - "Amazon MP3s" Music smart playlist
 +      - Miro Guide teaser in Podcasts
 +      - Zoom support in Amazon MP3 Store and Miro Guide
 +      - Now Playing simplify mode that declutters the UI
 +      - Play Queue shuffle action
 +      - Podcast errors shown to user
 +      - Better MTP device detection
 +      - Default smart playlists hidden when empty, for new users
 +      - New and improved user documentation
 +    + Notable Bugs Fixed
 +      - bgo#626786: Prevent crash in search-for-artist when blank
 +      - bgo#628388: Fix overflow bug with MTP playlists
 +      - bgo#625683: Fixup checkboxes now clickable
 +      - bgo#626928: Fetch podcast artwork asap
 +      - bgo#626791: Catch crashes caused by missing extensions
 +      - bgo#528383: Re-enable writing video metadata to file
 +      - bgo#626803, LP: #617017: Fix Ogg rating parsing in non-English locales
 +  * debian/(control, rules):
 +    + Update configure flags:
 +      - --disable-hal
 +      - --disable-ipod
 +      - --enable-appledevice
 +      - --enable-gio
 +      - --enable-gio-hardware
 +    + Add new build depends:
 +      - libgudev1.0-cil-dev
 +      - libgkeyfile-cil-dev
 +      - libgio2.0-cil-dev
 +      - libgtk-sharp-beans2.0-cil-dev
 +      - libgpod-cil-dev
 +    + Update version of libmtp-dev build-dep to 0.3.0
 +    + Drop hal, podsleuth and ipod-sharp dependencies
 +  * debian/patches:
 +    + 0001-Don-t-copy-duplicate-libraries.patch: Don't copy duplicate
 +      libraries
 +    + 0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch:
 +      Copy debugging libraries if they exist
 +
 +  [ Iain Lane ]
 +  * Upload to Ubuntu from Debian git, as the dependencies are not all
 +    ready in Debian.
 +  * [fe5e8fb] Refresh and update patches to apply cleanly
 +  * [a688fa9] Disable Boo support and remove build dependency
 +  * [df01b1e] Generate translation template and set gettext domain in
 +    the Ubuntu build
 +  * [9c3402b] Make sure mimeinfo.cache is removed
 +  * [d54fedc] Update changelog version for Ubuntu
 +
 + -- Iain Lane <laney at ubuntu.com>  Mon, 06 Sep 2010 20:05:45 +0100
 +
 +banshee (1.7.4-1ubuntu1) maverick; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + debian/patches:
 +      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
 +      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
 +        interface on --client=Meego and start traditional interface
 +        otherwise
 +      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
 +        shutdown request only
 +      - 04_enable-switching-between-the-2-interfaces.patch: Enable
 +        switching between netbook and traditional interfaces.
 +      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
 +        when starting for the first time with an empty library.
 +      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
 +      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
 +      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
 +        interface as this is irrelevant on non-Meego interfaces
 +    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
 +  * Ubuntu-specific changes from previous merge:
 +    + Refresh patches:
 +      - 04_enable-switching-between-the-2-interfaces.patch
 +      - 06_add-meego-desktop-file.patch
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:37:19 +0800
 +
  banshee (1.7.4-1) experimental; urgency=low
  
    * New upstream release
@@@ -328,37 -229,6 +379,37 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:30:24 +0800
  
 +banshee (1.7.3-2ubuntu2) maverick; urgency=low
 +
 +  * banshee shipped a generated MIME database (/usr/share/mime/*) breaking the
 +    system one.  Change debian/rules to delete everything below
 +    debian/tmp/usr/share/mime/ except "packages" before dh_install.
 +  * Minor syntax tweaks to rules.
 +
 + -- Loïc Minier <loic.minier at ubuntu.com>  Thu, 05 Aug 2010 00:49:55 -0400
 +
 +banshee (1.7.3-2ubuntu1) maverick; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + debian/patches:
 +      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
 +      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
 +        interface on --client=Meego and start traditional interface
 +        otherwise
 +      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
 +        shutdown request only
 +      - 04_enable-switching-between-the-2-interfaces.patch: Enable
 +        switching between netbook and traditional interfaces.
 +      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
 +        when starting for the first time with an empty library.
 +      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
 +      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
 +      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
 +        interface as this is irrelevant on non-Meego interfaces
 +    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 26 Jul 2010 00:32:41 +0800
 +
  banshee (1.7.3-2) experimental; urgency=low
  
    * debian/control: Add libsoup{,-gnome}2.4-dev build-deps which were
@@@ -366,28 -236,6 +417,28 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 24 Jul 2010 04:44:30 +0800
  
 +banshee (1.7.3-1ubuntu1) maverick; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + debian/patches:
 +      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
 +      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
 +        interface on --client=Meego and start traditional interface
 +        otherwise
 +      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
 +        shutdown request only
 +      - 04_enable-switching-between-the-2-interfaces.patch: Enable
 +        switching between netbook and traditional interfaces.
 +      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
 +        when starting for the first time with an empty library.
 +      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
 +      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
 +      - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
 +        interface as this is irrelevant on non-Meego interfaces
 +    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 23 Jul 2010 19:16:11 +0800
 +
  banshee (1.7.3-1) experimental; urgency=low
  
    * New upstream release:
@@@ -439,44 -287,6 +490,44 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 22 Jul 2010 19:07:31 +0800
  
 +banshee (1.7.2-1ubuntu3) maverick; urgency=low
 +
 +  * debian/patches/06_add-meego-desktop-file.patch,
 +    debian/banshee-meego.install:
 +    - desktop file is now called banshee-1 and installed
 +    in usr/share/une/applications/ to show the une desktop file in UNE
 +    session only
 +
 + -- Didier Roche <didrocks at ubuntu.com>  Tue, 20 Jul 2010 12:23:28 +0200
 +
 +banshee (1.7.2-1ubuntu2) maverick; urgency=low
 +
 +  * add debian/patches/08_remove_unrelevant_media.patch:
 +    Don't show "media" in netbook interface as this is unrelevant on non
 +    meego interface (LP: #602759)
 +
 + -- Didier Roche <didrocks at ubuntu.com>  Mon, 12 Jul 2010 18:39:36 +0200
 +
 +banshee (1.7.2-1ubuntu1) maverick; urgency=low
 +
 +  * Merge from Debian Experimental, remaining changes:
 +    + debian/patches:
 +      - 01_Debranch-netbook-interface.patch: Debrand the netbook interface
 +      - 02_only-show-netbook-panel-on-request.patch: Only show netbook
 +        interface on --client=Meego and start traditional interface
 +        otherwise
 +      - 03_quit-only-on-explicit-shutdown-request.patch: Quit on explicit
 +        shutdown request only
 +      - 04_enable-switching-between-the-2-interfaces.patch: Enable
 +        switching between netbook and traditional interfaces.
 +      - 05_show-a-empty-library-message-in-banshee.patch: Show empty hint
 +        when starting for the first time with an empty library.
 +      - 06_add-meego-desktop-file.patch: Add desktop file to start netbook interface
 +      - 07_enable-library-watch-by-default.patch: Enable Library Watcher by default
 +    + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 07 Jul 2010 15:54:29 +0800
 +
  banshee (1.7.2-1) experimental; urgency=low
  
    [ Iain Lane ]
@@@ -527,30 -337,6 +578,30 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 02 Jul 2010 02:21:03 +0800
  
 +banshee (1.7.1-1ubuntu1) maverick; urgency=low
 +
 +  * Enhance netbook interface:
 +    - debian/patches/01_Debranch-netbook-interface.patch
 +      debrand the netbook interface to "Netbook"
 +    - debian/patches/02_only-show-netbook-panel-on-request.patch:
 +      only show netbook inteface on --client=Meego and start traditional
 +      interface otherwise
 +    - debian/patches/03_quit-only-on-explicit-shutdown-request.patch:
 +      quit on explicit shutdown request only
 +    - debian/patches/04_enable-switching-between-the-2-interfaces.patch:
 +      switch back and forth beetween the 2 interfaces, even if traditional
 +      interface started. Also, have only one interface shown at a time
 +    - debian/patches/05_show-a-empty-library-message-in-banshee.patch:
 +      show an empty hint when starting the first time and having no library
 +      imported (Bertrand Lorentz and Alex Launi)
 +    - debian/patches/06_add-meego-desktop-file.patch:
 +      add desktop file to start the netbook interface
 +  * debian/patches/07_enable-library-watch-by-default.patch:
 +    enable library watcher
 +  * debian/banshee-meego.install: install the new deskop file
 +
 + -- Didier Roche <didrocks at ubuntu.com>  Mon, 05 Jul 2010 15:19:53 +0200
 +
  banshee (1.7.1-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
diff --combined debian/control
index 36318e8,1b9103f..66f4781
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
  Source: banshee
  Section: sound
  Priority: optional
 -Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
  Uploaders: Sebastian Dröge <slomo at debian.org>, Chow Loong Jin <hyperair at ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50),
                 autotools-dev,
@@@ -10,6 -9,7 +10,6 @@@
                 intltool (>= 0.35),
                 lsb-release,
                 mono-devel (>= 2.4.3),
 -               libboo-cil-dev (>= 0.8.1),
                 libndesk-dbus1.0-cil-dev (>= 0.5),
                 libndesk-dbus-glib1.0-cil-dev (>= 0.3),
                 libmono-addins-cil-dev (>= 0.3.1),
@@@ -56,12 -56,11 +56,13 @@@ Depends: ${shlibs:Depends}
           gstreamer0.10-plugins-good (>= 0.10.8-4),
           gstreamer0.10-alsa | gstreamer0.10-audiosink,
           gnome-icon-theme (>= 2.16)
 -Recommends: gstreamer0.10-plugins-bad,
 -            brasero,
 +Recommends: brasero,
              avahi-daemon,
 -            media-player-info
 -Suggests: gstreamer0.10-plugins-ugly,
++            media-player-info,
 +            banshee-extension-soundmenu,
 +            banshee-extension-ubuntuonemusicstore
 +Suggests: gstreamer0.10-plugins-bad,
 +          gstreamer0.10-plugins-ugly,
            gstreamer0.10-ffmpeg,
            banshee-dbg (=${binary:Version})
  Breaks: banshee-extensions-common (<< 1.6.1-2.)
diff --combined debian/patches/series
index 51d109e,c12efba..87242ba
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -6,8 -6,8 +6,9 @@@
  06_add-meego-desktop-file.patch
  07_enable-library-watch-by-default.patch
  07_enable-mpris-by-default.patch
 +07_disable-notification-area-by-default.patch
  08_remove_unrelevant_media.patch
+ 09_Fix-issue-with-YOptions-in-SimpleTable.patch
  0001-Don-t-copy-duplicate-libraries.patch
  0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
  99_ltmain_as-needed.patch
diff --combined debian/rules
index 2adccb3,6fe3574..9738d0c
--- a/debian/rules
+++ b/debian/rules
@@@ -12,7 -12,7 +12,7 @@@ override_dh_auto_configure
  	                     --disable-builtin-equalizer \
  	                     --disable-gst-sharp \
  	                     --enable-user-help \
 -	                     --enable-boo \
 +	                     --disable-boo \
  	                     --enable-docs \
  	                     --enable-youtube \
  	                     --disable-hal \
@@@ -28,6 -28,8 +28,8 @@@
  	                     --enable-daap \
  	                     --disable-remote-audio \
  	                     --disable-torrent \
+ 			     --disable-soundmenu \
+ 			     --disable-ubuntuonemusicstore \
  	                     --enable-meego \
  	                     --enable-gapless-playback \
  	                     --enable-podcast \

-- 
banshee



More information about the Pkg-cli-apps-commits mailing list