[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/jaunty, updated. debian/1.5.2-1-35-ga42a36a

Chow Loong Jin hyperair at gmail.com
Thu Jan 28 17:27:48 UTC 2010


The following commit has been merged in the ppa/jaunty branch:
commit a42a36a6e8515919c4cea244868b8174a50f0421
Merge: 1bf4779de6005abc95a2b8c2d4ab308b7ded5394 ba66d00f21105f173357b7ce93f3042ce69e8595
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Fri Jan 29 01:22:22 2010 +0800

    Merge branch 'ppa/karmic' into ppa/jaunty
    
    Conflicts:
    	debian/changelog
    	debian/rules

diff --combined debian/changelog
index 3215db0,549d4a0..23a4c01
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,69 +1,82 @@@
- banshee (1.5.2-1~hyper1~jaunty) jaunty; urgency=low
++banshee (1.5.3-0ubuntu1~hyper1~jaunty) jaunty; urgency=low
 +
 +  * Merge from Karmic, remaining changes:
 +    + debian/control:
 +      - libgconf2.0-cil -> libgconf2.24-cil
 +      - Lower mono-devel version
 +      - Disable clutter support (dependencies not satisfiable)
 +    + debian/rules:
 +      - Revert to using csc instead of mono-csc
++      - --disable-clutter
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 04 Dec 2009 15:01:20 +0800
 +
- banshee (1.5.2-1~hyper1~karmic) karmic; urgency=low
+ banshee (1.5.4~really1.5.3-0ubuntu1~hyper1~karmic) karmic; urgency=low
  
-   * No change upload to PPA
+   * Merge from unstable, remaining changes:
+     + debian/control:
+       - Revert -cil-dev transition
+       - Use mono-devel 2.4.2.3
+     + debian/patches/03_bundle-inotifywatcher.patch:
+       - Revert the InotifyWatcher removal commit from upstream, and
+         force-enable LibraryWatcher
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 29 Jan 2010 00:23:27 +0800
  
-  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Dec 2009 23:16:11 +0800
+ banshee (1.5.3-1) UNRELEASED; urgency=low
  
- banshee (1.5.2-1) UNRELEASED; urgency=low
+   * New upstream release
+     + New features:
+       - Sync device from playlist option
+       - Type-ahead find in track, artist, and album lists
+       - Optional cover art in lower-left corner
+       - Editable cover art via drag-and-drop and right-click
+       - Audiobooks library extension
+       - Library-folder watcher extension
+       - eMusic importer/downloader extension
+     + Enhancements:
+       - Improved Podcast filtering/browsing
+       - Extension preferences tab reworked
+       - Extension names/descriptions translated
+       - Improved sqlite performance
+       - Added --set-rating=RATING command line option
+       - Support for Nexus One devices
+     + Bug-fixes:
+       - DAPs now works with DeviceKit (LP: #382941)
+       - Fix issue with DAAP authenticating (LP: #308233)
+       - Podcast renaming should work well now
+       - Podcast download cancelling is now fast
+       - Internet Archive results paging off-by-one fixed
+       - Fix for MTP devices on 64-bit distros
+       - Fix import error for files with '\0' characters (LP: #499698)
+       - Support syncing playlists to iPods (LP: #75571)
+       - Fix syncing podcasts to iPods (LP: #140489)
+   * debian/control:
+     + Bump mono-devel version to 2.4.3 for LibraryWatcher
+     + Re-enable libkarma-cil, use libkarma-cil-dev
+     + Bump mono-addins version to 0.3.1
+     + Bump libgstreamer0.10-dev version to 0.10.12
+   * debian/rules:
+     + Add configure flags for explicitly enabling all wanted
+       features, countering Banshee's automagic silently disabling features
+   * debian/patches/01_devkit-fix.patch:
+     + Dropped, applied upstream
+   * debian/patches/:
+     + 01_fix-remoteaudio.patch: Add a "using Hyena" to let
+       Banshee.RemoteAudio compile
+     + 02_monodoc-fix-enable.patch: Fix usage of AC_ARG_ENABLE for --enable-docs
  
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 28 Jan 2010 23:52:53 +0800
+ 
+ banshee (1.5.2-1) unstable; urgency=low
+ 
+   [ Chow Loong Jin ]
    * New upstream release (Closes: #558611)
      + New Features:
        - The Internet Archive extension
        - The iTunes importer
        - Metadata ratings and playcount import and export
-       - Add support for Pulse and Droid phones
+       - Add support for Pulse and Droid phones (LP: #501515)
        - Use new Last.fm API (Closes: #548029, LP: #415937)
  
      + Enhancements:
@@@ -60,24 -100,22 +113,34 @@@
  
    * debian/control:
      + Bump libipod{,ui}-cil dependency versions to 0.8.5
-     + Build-depend on -dev packages for libipod{,ui}-cil
+     + Build depend on -cil-dev packages instead of -cil
+     + Add libmono-addins-cil-dev to Build Dep
+     + Build depend on libboo-cil-dev instead of just boo
    * debian/patches/01_fix-ipod-sharp-ftbfs:
      + Dropped, applied upstream
+   * debian/patches/01_devkit-fix.patch:
+     + Backport fix from upstream for DAP support with Devkit
+ 
+   [ Jo Shields ]
+   * debian/control:
+     + Disable Rio Karma support for now; it's broken due to bug #551049
+   * debian/monodoc-banshee-manual.postinst:
+     + Delete - we use DPKG triggers to handle manual installs now
  
-  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Dec 2009 00:40:41 +0800
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 21 Jan 2010 13:19:04 +0800
  
 +banshee (1.5.1-1~hyper1~jaunty) jaunty; urgency=low
 +
 +  * Merge from Karmic, remaining changes:
 +    + debian/control:
 +      - libgconf2.0-cil -> libgconf2.24-cil
 +      - Lower mono-devel version
 +      - Disable clutter support (dependencies not satisfiable)
 +    + debian/rules:
 +      - Revert to using csc instead of mono-csc
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Oct 2009 09:36:34 +0800
 +
  banshee (1.5.1-1) unstable; urgency=low
  
    * New upstream release
@@@ -168,21 -206,6 +231,21 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 14 Oct 2009 19:21:51 +0800
  
 +banshee (1.5.0-3~hyper1~jaunty1) jaunty; urgency=low
 +
 +  * Merge from Karmic unstable PPA, remaining changes:
 +    + Revert bad GNOME# 2.24 transition
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Aug 2009 02:21:05 +0800
 +
 +banshee (1.5.0-3~hyper1~karmic1) karmic; urgency=low
 +
 +  * Upload to PPA
 +  * debian/gbp.conf:
 +    + Add a gbp.conf to ease git buildpackage work
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Aug 2009 02:10:33 +0800
 +
  banshee (1.5.0-3) experimental; urgency=low
  
    * debian/patches/03_muinshee-booter.patch,
@@@ -213,13 -236,6 +276,13 @@@ banshee (1.5.0-2) experimental; urgency
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 08 Jul 2009 22:10:27 +0800
  
 +banshee (1.5.0-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
 +
 +  * Backport to jaunty
 +  * debian/control: Revert bad GNOME# 2.24 transition
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Thu, 04 Jun 2009 01:03:53 +0800
 +
  banshee (1.5.0-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
diff --combined debian/control
index c246426,9391bdc..95e5b45
--- a/debian/control
+++ b/debian/control
@@@ -9,7 -9,7 +9,7 @@@ Build-Depends: debhelper (>= 7.0.50)
                 cli-common-dev (>= 0.5.7),
                 intltool (>= 0.35),
                 lsb-release,
 -               mono-devel (>= 2.4.2.3),
 +               mono-devel (>= 2.0.1),
                 boo (>= 0.8.1),
                 libmono-cairo2.0-cil,
                 libmono-sqlite2.0-cil,
@@@ -22,7 -22,7 +22,7 @@@
                 libglib2.0-cil (>= 2.10),
                 libgtk2.0-cil (>= 2.12),
                 libglade2.0-cil (>= 2.10),
 -               libgconf2.0-cil,
 +               libgconf2.24-cil,
                 libgnome2.24-cil,
                 libipod-cil-dev (>= 0.8.5),
                 libipodui-cil-dev (>= 0.8.5),
@@@ -33,10 -33,11 +33,10 @@@
                 gconf2,
                 libglib2.0-dev,
                 libgtk2.0-dev (>= 2.8),
                 libx11-dev,
                 libxrandr-dev (>= 2:1.1.1),
                 libxxf86vm-dev (>= 1:1.0.1),
-                libgstreamer0.10-dev (>= 0.10.3),
+                libgstreamer0.10-dev (>= 0.10.12),
                 libgstreamer-plugins-base0.10-dev (>= 0.10.12)
  Standards-Version: 3.8.3
  Homepage: http://www.banshee-project.org
@@@ -54,7 -55,7 +54,7 @@@ Depends: ${shlibs:Depends}
           hal,
           gnome-icon-theme (>= 2.16)
  Recommends: gstreamer0.10-plugins-bad,
-             podsleuth (>= 0.6.0),
+             podsleuth (>= 0.6.5-2~),
              brasero,
              avahi-daemon
  Suggests: gstreamer0.10-plugins-ugly,
diff --combined debian/rules
index fc0d9f3,53118dd..a8da50f
--- a/debian/rules
+++ b/debian/rules
@@@ -6,10 -6,24 +6,24 @@@ include /usr/share/cli-common/cli.mak
  LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
  
  override_dh_auto_configure:
- 	dh_auto_configure -- --disable-static --enable-release \
+ 	dh_auto_configure -- --disable-static \
+ 	                     --enable-release \
+ 	                     --disable-tests \
+ 	                     --disable-shave \
  	                     --with-vendor-build-id="`lsb_release -ds`" \
- 			     --disable-builtin-equalizer \
 -	                     --enable-clutter \
++	                     --disable-clutter \
+ 	                     --enable-boo \
+ 	                     --enable-docs \
+ 	                     --enable-gnome \
+ 	                     --enable-schemas-install \
+ 	                     --enable-mtp \
+ 	                     --enable-ipod \
+ 	                     --enable-karma \
+ 	                     --enable-daap \
+ 	                     --enable-podcast \
+ 	                     --enable-remote-audio \
+ 	                     --disable-builtin-equalizer \
 -	                     MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
 +	                     MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
  
  # disable tests
  override_dh_auto_test:

-- 
banshee



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