[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/intrepid, updated. debian/1.5.1-1-19-gcf8d8b1

Chow Loong Jin hyperair at gmail.com
Thu Oct 15 02:43:07 UTC 2009


The following commit has been merged in the ppa/intrepid branch:
commit 7f8e6079bf2e7c0fb59fb67bca2b68d23bc5e4b1
Merge: ba1f85ae5eebd9e919fb520c70a39c7c95b62e10 f0c7edd9d26955f3a42d1e1b0994570b232e784b
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Thu Oct 15 10:22:21 2009 +0800

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

diff --combined debian/changelog
index 7c0b064,b9e5c3b..6d96c1f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,239 +1,256 @@@
- banshee (1.4.3-4~hyper1+intrepid1) intrepid; urgency=low
++banshee (1.5.1-1~hyper1~intrepid) intrepid; urgency=low
 +
 +  * Merge from Jaunty, remaining changes:
 +    + debian/control:
-       - GNOME# 2.24
++      - Revert GNOME# 2.24 changes
++      - Revert Mono 2 transition
 +
-  -- Chow Loong Jin <hyperair at gmail.com>  Tue, 21 Apr 2009 19:11:52 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Oct 2009 10:21:18 +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
+     + New Features:
+       - Play Queue Auto DJ keeps the tunes coming
+       - Shuffle by album and artist
+       - Shuffle by weighted rating and score mode
+       - Add tooltips for ellipsized ListView text
+       - Keep the playing song visible in the track list
+       - Add support for WebOS devices
+       - Add support for the Samsung Galaxy Android Phone
+ 
+     + Enhancements:
+       - When user picks new sort column, default to sort ascending
+       - Drop the " Library" suffix on the Music and Video sources
+       - Add thin highlight to ListView selection for 3D effect
+       - Keyboard shortcut (ESC) to clear the search box
+       - Expose LAME's "preset" option
+       - Added a --gconf-base-key for running sandboxed
+       - Trim URL pasted from clipboard to podcast dialog
+       - Allow selection of multiple folders on import
+       - Support playlists on Android G1 devices
+       - Better support for devices running Rockbox
+       - Set video sync folder for Android and WebOS devices
+       - Made the error message label selectable
+       - Save and load the Gtk.AccelMap
+       - Added taglib/oga mimetype to the vorbis audio profile
+       - Auto-completion for composer, conductor, grouping and copyright
+       - Added the 'comment' search filter
+       - Selectable song properties
+       - Show a tooltip in track editor when the property is truncated
+ 
+     + Notable bug fixes:
+       - Fix blank MimeTypes for tracks ripped before 1.4
+       - Fix a Bit Rate column sizing glitch
+       - Fix browser positioning when Banshee is maximised
+       - Fix compilation metadata reading and writing
+       - Work with new notification-daemon
+       - Avoid needlessly syncing iPods twice
+       - Deterministically sort sources to avoid fluttering
+       - Look for Rhythmbox db at both new and old paths
+       - Fix bug with scrobbling after skipping a track
+       - Fix crash in equalizer
+       - Fix an exception on startup when DBus is disabled
+       - Fix off-by-one-day date querying bug
+       - Fix a UI/spacing glitch in the Smart Playlist Editor
+       - Don't hide the track info popup while it has focus
+       - Prevent endless "Searching for CD metadata..."
+       - Fix Last.fm now-playing for non-decimal track lengths
+       - Dispose the SqliteCommand after it's executed
+       - Fix notification area popup positioning on multi-monitor systems
+       - Fix the playing indicator when song in list more than once
+       - Fix crash when opening the profile conf dialog
+       - Fix crash stopping jobs on shutdown
+       - Fix notification area popup flashing
+       - Trim filename dots and spaces to be NTFS compliant
+       - Stop playing from audio CD when it's ejected
+       - Don't update DateUpdated stamp when transient fields change
+       - Fix DAP content page title not changing when device renamed
+       - Set the Podcast flag on import based on genre
+       - Fix hang when slider dragged to track change .
+       - Prevent slider jumping around after seeking in stream
+       - Fix Last.fm logos on dark themes
+       - --query-X option sometimes returned an error
+       - Build and runtime fixes for FreeBSD
+       - Fix editor always prompting to save podcasts
+       - Fix rounding when updating the track score
+       - Fix initial track score calculation
+       - Fix playback buttons' a11y
+       - Fix crasher on PPC
+ 
+   [ Chow Loong Jin ]
+   * debian/control, debian/changelog:
+     + Use mono-csc instead of csc for MCS.
+     + Bump mono-devel version to 2.4.2 for mono-csc
+     + No change bump of Standards-Version to 3.8.3
+   * debian/patches/01_fix-ipod-sharp-ftbfs:
+     + Fix FTBFS when ipod-sharp's debug files are missing (Closes: #549725)
+   * debian/README.source:
+     + Copied from quilt
+ 
+   [ Iain Lane ]
+   * debian/patches/01_dispose-sqlite-cmd.patch, 02_system-equalizer.patch,
+     03_muinshee-booter.patch: Drop, applied upstream.
+   * debian/patches/99_ltmain_as_needed.patch: Refresh
+   * debian/rules: Disable Banshee's builtin equalizer - gstreamer's one is now
+     good enough for us to use.
  
- banshee (1.4.3-4~hyper1+jaunty1) jaunty; urgency=low
+  -- 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,
+     debian/banshee.links,
+     debian/banshee.1:
+     + Patch banshee booter script to autodetect whether to use Banshee or
+       Muinshee interface based on the file name
+     + Make /usr/bin/muinshee a symlink of /usr/bin/banshee-1
+     + Update banshee.1 manpage and link it to muinshee.1
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 19 Jul 2009 00:22:34 +0800
+ 
+ banshee (1.5.0-2) experimental; urgency=low
  
    * debian/control:
-     + Changed libgconf2.0-cil to libgconf2.24-cil, since Ubuntu borked up the
-       transition.
+     + Replace gstreamer0.10-plugins-ffmpeg with gstreamer0.10-ffmpeg
+     + Change of my email address
+     + Bump Standards-Version to 3.8.2
+   * debian/rules:
+     + Drop dh_installchangelogs override. We don't want ChangeLog installed
+       any more.
+   * debian/banshee.links:
+     + Updated to symlink the banshee manpage to banshee-1
+   * debian/patches/01_dispose-sqlite-cmd.patch:
+     + Fix for BGO #586498, where Banshee leaks memory while rescanning library
+   * debian/patches/01_remove-bash-dep.patch:
+     + Delete it for good
+ 
+  -- 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>  Tue, 21 Apr 2009 18:42:23 +0800
+  -- 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 ]
+   * New Upstream Version
+   * debian/control:
+     + Fix grammatical error "an media" to "a media"
+     + Set quilt's version to 0.46-7~ instead of 0.46-7 for backportability
+     + Replace gstreamer0.10-plugins-ffmpeg with gstreamer0.10-ffmpeg
+     + Change of my email address
+     + Bump Standards-Version to 3.8.2
+     + Drop unnecessary build dependencies
+   * debian/watch:
+     + Updated to include changes in directory structure
+   * debian/patches:
+     + 02_system_equalizer.patch: drop a hunk, it'll work without it anyway
+     + 03_fix-lastfm.patch: dropped, applied upstream
+     + 20_check_notification_support.patch: dropped, applied upstream
+ 
+   [ Iain Lane ]
+   * debian/banshee.{1,manpages} Add manpage. This was initially generated by
+     help2man from `banshee --help-all' and then edited a bit to be more
+     readable and standard. (Closes: #384557)
+ 
+   [ Iulian Udrea ]
+   * debian/compat:
+     - Bump to 7.
+ 
+   [ Sebastian Dröge ]
+   * debian/control:
+     + Update/remove some build dependencies for the new version.
+ 
+  -- Sebastian Dröge <slomo at debian.org>  Thu, 04 Jun 2009 20:01:25 +0200
+ 
+ banshee (1.4.3-6) unstable; urgency=low
+ 
+   [ Chow Loong Jin ]
+   * debian/control:
+     + Fix grammatical error "an media" to "a media"
+     + Set quilt's version to 0.46-7~ instead of 0.46-7 for backportability
+     + Replace gstreamer0.10-plugins-ffmpeg with gstreamer0.10-ffmpeg
+     + Change of my email address
+     + Bump Standards-Version to 3.8.2
+     + Drop unnecessary build dependencies
+   * debian/watch:
+     + Updated to include changes in directory structure
+   * debian/banshee.links:
+     + Updated to symlink the banshee manpage to banshee-1
+     + Make /usr/bin/muinshee a symlink to /usr/bin/banshee-1
+     + Make muinshee.1 manpage a symlink to banshee.1
+   * debian/banshee.1:
+     + Update to show muinshee as well
+   * debian/patches/03_muinshee-booter.patch:
+     + Patch banshee booter script to autodetect whether to use Banshee or
+       Muinshee interface based on file name
+ 
+   [ Iain Lane ]
+   * debian/banshee.{1,manpages} Add manpage. This was initially generated by
+     help2man from `banshee --help-all' and then edited a bit to be more
+     readable and standard. (Closes: #384557)
+ 
+   [ Iulian Udrea ]
+   * debian/compat:
+     - Bump to 7.
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 24 Jun 2009 01:57:02 +0800
+ 
+ banshee (1.4.3-5) unstable; urgency=low
+ 
+   * debian/control,
+     debian/rules,
+     debian/patches/series:
+     + Change order of gstreamer0.10-audiosink | gstreamer0.10-alsa
+     + Transition to dh7
+     + Use Quilt
+     + Add banshee-dbg package containing debug symbols
+     + Change Maintainer to pkg-cli-apps
+   * debian/patches/02_system-equalizer.patch,
+     debian/patches/99_ltmain_as-needed.patch:
+     + Prepend all paths with a/ to convert to p1 patch for Quilt
+ 
+  -- Chow Loong Jin <hyperair at gmail.com>  Mon, 25 May 2009 20:02:35 +0800
+ 
++banshee (1.4.3-4~hyper1+intrepid1) intrepid; urgency=low
++
++  * Merge from Jaunty, remaining changes:
++    + debian/control:
++      - GNOME# 2.24
++
++ -- Chow Loong Jin <hyperair at gmail.com>  Tue, 21 Apr 2009 19:11:52 +0800
 +
  banshee (1.4.3-4) unstable; urgency=low
  
    * debian/control:
@@@ -25,12 -245,6 +262,12 @@@
      + Bump Standards-Version
  
   -- Chow Loong Jin <hyperair at gmail.com>  Thu, 16 Apr 2009 18:26:25 +0800
 +banshee (1.4.3-3~hyper1+intrepid1) intrepid; urgency=low
 +
 +  * Merge from Debian, remaining changes:
 +    + Revert Mono 2.0 transition
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Sun, 22 Mar 2009 13:37:56 +0800
  
  banshee (1.4.3-3) unstable; urgency=low
  
diff --combined debian/control
index 6d73f6a,fe803e8..21c8d66
--- a/debian/control
+++ b/debian/control
@@@ -1,35 -1,29 +1,29 @@@
  Source: banshee
  Section: sound
  Priority: optional
- Maintainer: Sebastian Dröge <slomo at debian.org>
- Uploaders: Chow Loong Jin <hyperair at gmail.com>
- Build-Depends: debhelper (>= 5),
-                cdbs,
+ 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),
+                quilt (>= 0.46-7~),
                 autotools-dev,
-                cli-common-dev (>= 0.4.4),
+                cli-common-dev (>= 0.5.7),
                 intltool (>= 0.35),
                 lsb-release,
 -               mono-devel (>= 2.0.1),
 +               mono-gmcs | c-sharp-2.0-compiler,
                 boo (>= 0.8.1),
-                libmono-dev (>= 1.2.4),
-                libmono-system-data2.0-cil,
-                libmono-system-web2.0-cil,
                 libmono-cairo2.0-cil,
                 libmono-sqlite2.0-cil,
-                libmono2.0-cil,
-                libmono-sharpzip2.84-cil,
                 libndesk-dbus1.0-cil (>= 0.5),
                 libndesk-dbus-glib1.0-cil (>= 0.3),
-                libmono-addins0.2-cil (>= 0.3),
                 libmono-addins-gui0.2-cil (>= 0.3),
                 libtaglib2.0-cil (>= 2.0.3.2),
                 libmono-zeroconf1.0-cil (>= 0.7.3),
                 libnotify0.4-cil,
                 libglib2.0-cil (>= 2.10),
-                libgtk2.0-cil (>= 2.10),
+                libgtk2.0-cil (>= 2.12),
                 libglade2.0-cil (>= 2.10),
 -               libgconf2.24-cil,
 -               libgnome2.24-cil,
 +               libgconf2.0-cil (>= 2.10),
 +               libgnome2.0-cil (>= 2.10),
                 libipod-cil (>= 0.8.2),
                 libipodui-cil (>= 0.8.2),
                 libkarma-cil (>= 0.0.5),
@@@ -42,10 -36,9 +36,9 @@@
                 libx11-dev,
                 libxrandr-dev (>= 2:1.1.1),
                 libxxf86vm-dev (>= 1:1.0.1),
-                libgnomevfs2-dev,
                 libgstreamer0.10-dev (>= 0.10.3),
                 libgstreamer-plugins-base0.10-dev (>= 0.10.12)
- Standards-Version: 3.8.1
+ Standards-Version: 3.8.3
  Homepage: http://www.banshee-project.org
  Vcs-Git:  git://git.debian.org/git/pkg-cli-apps/packages/banshee.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee.git
@@@ -57,7 -50,7 +50,7 @@@ Depends: ${shlibs:Depends}
           ${misc:Depends},
           gstreamer0.10-plugins-base,
           gstreamer0.10-plugins-good (>= 0.10.8-4),
-          gstreamer0.10-audiosink | gstreamer0.10-alsa,
+          gstreamer0.10-alsa | gstreamer0.10-audiosink,
           hal,
           gnome-icon-theme (>= 2.16)
  Recommends: gstreamer0.10-plugins-bad,
@@@ -65,21 -58,39 +58,39 @@@
              brasero,
              avahi-daemon
  Suggests: gstreamer0.10-plugins-ugly,
-           gstreamer0.10-plugins-ffmpeg
+           gstreamer0.10-ffmpeg,
+           banshee-dbg (=${binary:Version})
  Description: Media Management and Playback application
-  Banshee is an media management and playback application for the GNOME
+  Banshee is a media management and playback application for the GNOME
   desktop, allowing users to import audio from CDs, search their library,
   create playlists of selections of their library, sync music to/from iPods
   and other media devices, play and manage video files and burn selections
   to a CD.
  
+ Package: banshee-dbg
+ Section: debug
+ Priority: extra
+ Architecture: any
+ Depends: banshee (= ${binary:Version}),
+          ${shlibs:Depends},
+          ${cli:Depends},
+          ${misc:Depends}
+ Description: Media Management and Playback application (debug symbols)
+  Banshee is a media management and playback application for the GNOME
+  desktop, allowing users to import audio from CDs, search their library,
+  create playlists of selections of their library, sync music to/from iPods
+  and other media devices, play and manage video files and burn selections
+  to a CD.
+  .
+  This package contains the debugging symbols for Banshee.
+ 
  Package: monodoc-banshee-manual
  Section: doc
  Architecture: all
  Depends: monodoc-manual,
           ${misc:Depends}
  Description: Media Management and Playback application (developer documentation)
-  Banshee is an media management and playback application for the GNOME
+  Banshee is a media management and playback application for the GNOME
   desktop, allowing users to import audio from CDs, search their library,
   create playlists of selections of their library, sync music to/from iPods
   and other media devices, play and manage video files and burn selections
diff --combined debian/rules
index f0782b3,fc0d9f3..4ad9cd5
--- a/debian/rules
+++ b/debian/rules
@@@ -1,23 -1,25 +1,25 @@@
  #!/usr/bin/make -f
  
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/rules/simple-patchsys.mk
- include /usr/share/cdbs/1/class/gnome.mk
- include /usr/share/cdbs/1/rules/utils.mk
- 
- common-binary-post-install-arch:: list-missing
- 
- export MONO_SHARED_DIR=$(CURDIR)
+ include /usr/share/quilt/quilt.make
+ include /usr/share/cli-common/cli.make
  
  LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
  
- DEB_CONFIGURE_EXTRA_FLAGS += --disable-static --enable-release \
-                              --with-vendor-build-id="`lsb_release -ds`"
+ override_dh_auto_configure:
+ 	dh_auto_configure -- --disable-static --enable-release \
+ 	                     --with-vendor-build-id="`lsb_release -ds`" \
+ 			     --disable-builtin-equalizer \
 -	                     MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
++	                     LDFLAGS="$(LDFLAGS)"
+ 
+ # disable tests
+ override_dh_auto_test:
  
- common-binary-predeb-arch::
- 	dh_clifixperms
- 	dh_clideps -d
+ # dump debugging symbols in banshee-dbg
+ override_dh_strip:
+ 	dh_strip --dbg-package=banshee-dbg
  
- clean::
- 	rm -rf $(MONO_SHARED_DIR)/.wapi
+ override_dh_clistrip:
+ 	dh_clistrip --dbg-package=banshee-dbg
  
+ %:
+ 	dh --with=quilt $@

-- 
banshee



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