[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/natty, updated. debian/2.6.0-6ubuntu1-144-g945a968

Chow Loong Jin hyperair at debian.org
Tue Apr 23 17:30:38 UTC 2013


The following commit has been merged in the ppa/natty branch:
commit 4f878a166430c71b00cb95bb4fb256c8bc20480b
Merge: 6fc94691e9e6563dd0f3bd3f941f1db5d709d615 36bd4935b0b2075cbdd507e37453d99cfd7d47a3
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Apr 23 23:51:09 2013 +0800

    Merge branch 'ppa/oneiric' into ppa/natty

diff --combined debian/changelog
index 1f5a09d,f214d12..81bc5a8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,172 +1,178 @@@
+ banshee (2.6.1-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
+ 
+   * Backport to oneiric, remaining changes:
+     - [3a43003] Revert "Revert "Lower mono-addins build-dep to 0.6-1-2~
+       (0.6.2 not packaged yet)""
+       This reverts commit 2ccd32314aac46bc98fb5400be6595063ad1c7c1.
+     - [bd2131b] Revert "Bump debhelper compat to 9 for buildflags"
+       This reverts commit a46c8f0c0a7ce68694a74beadd28f7289f752784.
+     - [e567ddf] Revert "Drop downstream dll.config files"
+       This reverts commit 437c092ed4a983e765fc6dcaceae54dee158f464.
+   * [d24fca1] Revert "Change gst binary depends and suggests to gst-1.0"
+     This reverts commit 4675854d8a55e7ae811f6c657b438fa2c85fdd7c.
+     Conflicts:
+     	debian/control
+   * [28f076d] Revert "Build-dep on libdbus-glib-1-dev"
+     This reverts commit 8f18f50da9105f76266ef5c5d697427539b2653d.
+   * [e38b64f] Drop gst1.0 patch
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Tue, 23 Apr 2013 22:53:56 +0800
+ 
+ banshee (2.6.1-1ubuntu1~hyper1+precise) precise; urgency=low
+ 
+   * [b523d71] Merge from quantal, remaining changes:
+     - Re-enable boo and karma
+     - Drop amazon URL patch
+     - [96ea0c6] Undo use dh_translations in PPA
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Tue, 23 Apr 2013 22:42:21 +0800
+ 
+ banshee (2.6.1-1ubuntu1~hyper1+quantal) quantal; urgency=low
+ 
+   * Backport to quantal
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Tue, 23 Apr 2013 22:27:15 +0800
+ 
+ banshee (2.6.1-1ubuntu1~hyper1+raring) raring; urgency=low
+ 
+   * [6287cbd] Set debian-branch to ppa/raring
+   * [022fdb9] Drop amazon-redirect-url patch
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Tue, 23 Apr 2013 21:20:08 +0800
+ 
+ banshee (2.6.1-1ubuntu1) raring; urgency=low
+ 
+   * [2b2c50d] Merge from experimental (LP: #1171179), remaining changes:
+     - Enable and recommend SoundMenu and Disable NotificationArea by default
+     - Disable boo and karma extensions
+     - Move desktop file for Meego UI to /usr/share/une/applications
+     - Change the url for the Amazon store redirector
+     - [9b356d6] Add workaround for set_Height exception.
+     - [ccbcbbd] Make Banshee translatable in Launchpad
+     - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
+     - [03c8cad] Set debian-branch to ubuntu/raring
+   * Additional Launchpad bugs fixed:
+     - Incorrect selected playlist from dropdown list in Sync UI (LP: #685119)
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Sun, 21 Apr 2013 23:28:07 +0800
+ 
+ banshee (2.6.1-1) experimental; urgency=low
+ 
+   * [ef5f04d] Imported Upstream version 2.6.1
+   * [8f18f50] Build-dep on libdbus-glib-1-dev
+   * [609a7e2] Drop upstreamed patches and refresh others
+     - Dropped: Mtp-Fix-file-type-in-sync-with-libmtp-1.1.0-bgo-6885.patch
+     - Refreshed: Remove-build-time-enable-gapless-playback-option.patch
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Sun, 21 Apr 2013 17:43:37 +0800
+ 
+ banshee (2.6.0-6ubuntu1) raring; urgency=low
+ 
+   * [6e1f0dd] Merge from Debian Experimental, remaining changes:
+     - Enable and recommend SoundMenu and Disable NotificationArea by default
+     - Disable boo and karma extensions
+     - Move desktop file for Meego UI to /usr/share/une/applications
+     - Change the url for the Amazon store redirector
+     - [9b356d6] Add workaround for set_Height exception.
+     - [ccbcbbd] Make Banshee translatable in Launchpad
+     - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
+     - [03c8cad] Set debian-branch to ubuntu/raring
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Fri, 15 Feb 2013 13:32:06 +0800
+ 
+ banshee (2.6.0-6) experimental; urgency=low
+ 
+   * [f745fd0] Cherry-pick patch to re-sync an MTP enum
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Mon, 04 Feb 2013 23:36:46 +0800
+ 
+ banshee (2.6.0-5ubuntu1) UNRELEASED; urgency=low
+ 
+   * [7ecb125] Merge from Debian Experimental, remaining changes:
+     - Enable and recommend SoundMenu and Disable NotificationArea by default
+     - Disable boo and karma extensions
+     - Move desktop file for Meego UI to /usr/share/une/applications
+     - Change the url for the Amazon store redirector
+     - [9b356d6] Add workaround for set_Height exception.
+     - [ccbcbbd] Make Banshee translatable in Launchpad
+     - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
+     - [03c8cad] Set debian-branch to ubuntu/raring
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Thu, 03 Jan 2013 04:01:01 +0800
+ 
+ banshee (2.6.0-5) experimental; urgency=low
+ 
+   * [1de9672] Swap out Remove-check-for-….patch for upstream patch.
+     This fixes the issue where gapless playback is disabled with no option for
+     enabling it in the UI.
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Thu, 03 Jan 2013 01:45:55 +0800
+ 
+ banshee (2.6.0-4) experimental; urgency=low
+ 
+   * [598f5d9] Change gst1.0-alsa in depends to gst1.0-pulseaudio.
+     GNOME now uses -pulseaudio, so we can just use this as the default. Users
+     can still remove pulseaudio and gst1.0-pulseaudio by having another
+     -audiosink installed.
+   * [25459ca] Recommend gst1.0-pulseaudio (without alternatives)
+     This forces a standard audio sink to be installed by default, thus avoiding
+     the issue of the jack audiosink taking precedence and preventing -pulseaudio
+     or -alsa from getting installed. (Closes: #694786)
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Fri, 30 Nov 2012 21:11:49 +0800
+ 
+ banshee (2.6.0-3ubuntu1) raring-proposed; urgency=low
+ 
+   * [8bf15b5] Merge from Debian Experimental, remaining changes:
+     - Enable and recommend SoundMenu and Disable NotificationArea by default
+     - Disable boo and karma extensions
+     - Move desktop file for Meego UI to /usr/share/une/applications
+     - Change the url for the Amazon store redirector
+     - [9b356d6] Add workaround for set_Height exception.
+     - [ccbcbbd] Make Banshee translatable in Launchpad
+     - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
+       This is to pick up the arch-specific libgpod.dll binary (LP: #1070631)
+     - [03c8cad] Set debian-branch to ubuntu/raring
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Fri, 30 Nov 2012 18:17:37 +0800
+ 
+ banshee (2.6.0-3) experimental; urgency=low
+ 
+   * [4675854] Change gst binary depends and suggests to gst-1.0
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Mon, 26 Nov 2012 00:57:01 +0800
+ 
+ banshee (2.6.0-2) experimental; urgency=low
+ 
+   * [081cca7] Refresh patches
+   * [300a62f] Add patch to port Banshee to Gstreamer 1.0
+   * [bfe72c5] Build-dep on gstreamer-1.0 things
+   * [25ee1ef] Patch to remove playbin version check for gapless
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Sun, 25 Nov 2012 14:31:53 +0800
+ 
+ banshee (2.6.0-1ubuntu3) raring-proposed; urgency=low
+ 
+   * [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
+     This is to pick up the arch-specific libgpod.dll binary (LP: #1070631)
+   * [03c8cad] Set debian-branch to ubuntu/raring
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Sat, 03 Nov 2012 18:02:05 +0800
+ 
+ banshee (2.6.0-1ubuntu2) quantal-proposed; urgency=low
+ 
+   * debian/control: Drop X-Ubuntu-Use-Langpack:. This does not currently
+     work due to LP #1048556, so let's include the upstream translations into
+     the packages again.
+ 
+  -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 11 Oct 2012 08:01:03 +0200
+ 
 +banshee (2.6.0-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to Natty
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Fri, 05 Oct 2012 22:21:08 +0800
 +
  banshee (2.6.0-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
  
    * [0ad8b8d] Merge from Precise PPA, remaining changes:
@@@ -98,12 -261,6 +267,12 @@@ banshee (2.5.0-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at debian.org>  Fri, 24 Aug 2012 02:25:28 +0800
  
 +banshee (2.4.1-3ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to natty
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Fri, 06 Jul 2012 01:41:38 +0800
 +
  banshee (2.4.1-3ubuntu1~hyper1+oneiric) oneiric; urgency=low
  
    * [fe67ec4] Merge from Precise PPA, remaining changes:
@@@ -275,12 -432,6 +444,12 @@@ banshee (2.4.0-1ubuntu2) precise; urgen
  
   -- Chow Loong Jin <hyperair at debian.org>  Fri, 23 Mar 2012 01:47:11 +0800
  
 +banshee (2.4.0-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to natty
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Thu, 22 Mar 2012 15:17:36 +0800
 +
  banshee (2.4.0-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
  
    * Merge from Precise PPA, remaining changes:
@@@ -344,12 -495,6 +513,12 @@@ banshee (2.3.6-1ubuntu1~hyper1+precise
  
   -- Chow Loong Jin <hyperair at debian.org>  Tue, 13 Mar 2012 15:35:12 +0800
  
 +banshee (2.3.6-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to Natty
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Tue, 13 Mar 2012 16:13:36 +0800
 +
  banshee (2.3.6-1ubuntu1) precise; urgency=low
  
    * Merge from Debian Experimental, remaining changes:
@@@ -390,12 -535,6 +559,12 @@@ banshee (2.3.5-1ubuntu1) precise; urgen
  
   -- Chow Loong Jin <hyperair at debian.org>  Sat, 18 Feb 2012 22:17:24 +0800
  
 +banshee (2.3.5-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to natty
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Sun, 19 Feb 2012 13:43:37 +0800
 +
  banshee (2.3.5-1ubuntu1~hyper1+precise) precise; urgency=low
  
    * Merge from Ubuntu Precise, remaining changes:
@@@ -449,12 -588,6 +618,12 @@@ banshee (2.3.4.ds-1ubuntu2) precise; ur
  
   -- Rodney Dawes <rodney.dawes at ubuntu.com>  Wed, 08 Feb 2012 03:14:09 +0800
  
 +banshee (2.3.4.ds-1ubuntu2~hyper1+natty) natty; urgency=low
 +
 +  * Backport to Natty
 +
 + -- Chow Loong Jin <hyperair at debian.org>  Sun, 12 Feb 2012 01:09:16 +0800
 +
  banshee (2.3.4.ds-1ubuntu2~hyper1+precise) precise; urgency=low
  
    * Merge from Ubuntu Precise, remaining changes:
@@@ -632,12 -765,6 +801,12 @@@ banshee (2.2.1-2) unstable; urgency=lo
  
   -- Iain Lane <laney at debian.org>  Sat, 24 Dec 2011 11:35:25 +0000
  
 +banshee (2.2.1-1ubuntu2~hyper1+natty) natty; urgency=low
 +
 +  * Backport to natty
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 18 Nov 2011 19:20:10 +0800
 +
  banshee (2.2.1-1ubuntu2~hyper1+oneiric) oneiric; urgency=low
  
    * Merge from Ubuntu Oneiric, remaining changes:
@@@ -691,12 -818,6 +860,12 @@@ banshee (2.2.1-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Nov 2011 10:00:57 +0800
  
 +banshee (2.2.0-1ubuntu2~hyper1+natty) natty; urgency=low
 +
 +  * Backport to natty
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 27 Sep 2011 05:35:02 +0800
 +
  banshee (2.2.0-1ubuntu2~hyper1+oneiric) oneiric; urgency=low
  
    * Merge from Ubuntu Oneiric, remaining changes:
@@@ -768,12 -889,6 +937,12 @@@ banshee (2.1.4-1) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 08 Sep 2011 10:02:04 +0800
  
 +banshee (2.1.3-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to natty
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 30 Aug 2011 02:07:42 +0800
 +
  banshee (2.1.3-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
  
    * Merge from Ubuntu Oneiric, remaining changes:
@@@ -884,12 -999,6 +1053,12 @@@ banshee (2.1.0-1ubuntu1~hyper1+oneiric
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:29:16 +0800
  
 +banshee (2.1.0-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to Natty
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:34:56 +0800
 +
  banshee (2.1.0-1) experimental; urgency=low
  
    * [6b1b0d2] New upstream release:
@@@ -964,18 -1073,6 +1133,18 @@@ banshee (2.0.1-2) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 10 Jul 2011 09:57:33 +0100
  
 +banshee (2.0.1-1ubuntu1~hyper1+natty1) natty; urgency=low
 +
 +  * Rebuild against new libgpod
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 04 Jul 2011 04:26:57 +0800
 +
 +banshee (2.0.1-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * No change backport to Natty
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 06 May 2011 18:45:28 +0800
 +
  banshee (2.0.1-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
  
    * [b0e67d0] Merge from Ubuntu Oneiric:
diff --combined debian/gbp.conf
index ecce030,d0595c2..f5f0af9
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,3 -1,4 +1,4 @@@
  [DEFAULT]
 -debian-branch = ppa/oneiric
 +debian-branch = ppa/natty
  upstream-branch = upstream-experimental
+ debian-tag = ppa/%(version)s

-- 
banshee



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