← Back to branch summary

~ubuntu-branches/ubuntu/lucid/lastfm/lucid

~ubuntu-branches/ubuntu/lucid/lastfm/lucid

« back to all changes in this revision

Viewing changes to debian/patches/alsa-uses-qdebug.diff

Committer: Bazaar Package Importer
Author(s): Devid Filoni
Date: 2008-07-14 16:46:20 UTC
mfrom: (1.1.7 upstream) (3.1.1 lenny)
Revision ID: james.westby@ubuntu.com-20080714164620-67hoz9fs177wpgmr

Tags: 1:1.5.1.31879.dfsg-1ubuntu1

https://launchpad.net/bugs/248100

* Merge from Debian unstable (LP: #248100), remaining changes:
  - debian/rules: add dh_icons call
  + debian/control:
    - switch iceweasel to firefox in Recommends field
    - modify debhelper version to >= 5.0.51~
    - modify Maintainer to Ubuntu MOTU Developers

files added:
bin/LastFM.exe.config

debian/README.source

debian/lastfm.sh

debian/patches/alsa-uses-qdebug.diff

debian/patches/build-fixes.diff

debian/patches/cheaper-save-geometry.diff

debian/patches/dirpaths.diff

debian/patches/hide-crashreport-option.diff

debian/patches/hide-scrobbledir-option.diff

debian/patches/no-fingerprint-lib.diff

debian/patches/reduce-linkage.diff

debian/patches/set-firstrun-status.diff

debian/patches/set-locale.diff

debian/patches/tray-icon-size.diff

debian/patches/tray-volume.diff

res/mac

src/Bootstrapper/ITunesDevice

src/Bootstrapper/ITunesDevice/ITunesParser.cpp

src/Bootstrapper/ITunesDevice/itunesdevice.cpp

src/Bootstrapper/ITunesDevice/itunesdevice.h

src/Bootstrapper/ITunesDevice/itunesdevice.vcproj

src/CrashReporter/BinaryFilename.h

src/ITunesPluginInstaller.cpp

src/ITunesPluginInstaller.h

src/MediaDeviceScrobbler.cpp

src/MediaDeviceScrobbler.h

src/Twiddly

src/Twiddly/IPod.cpp

src/Twiddly/IPod.h

src/Twiddly/ITunesLibrary.h

src/Twiddly/ITunesLibraryTrack.h

src/Twiddly/ITunesLibrary_mac.cpp

src/Twiddly/ITunesLibrary_win.cpp

src/Twiddly/PlayCountsDatabase.cpp

src/Twiddly/PlayCountsDatabase.h

src/Twiddly/README

src/Twiddly/Twiddly.pro

src/Twiddly/Twiddly.rc

src/Twiddly/Twiddly.vcproj

src/Twiddly/common

src/Twiddly/common/EncodingUtils.cpp

src/Twiddly/common/EncodingUtils.h

src/Twiddly/common/ITunesComWrapper.cpp

src/Twiddly/common/ITunesComWrapper.h

src/Twiddly/common/ITunesEventInterface.h

src/Twiddly/common/ITunesExceptions.h

src/Twiddly/common/ITunesTrack.cpp

src/Twiddly/common/ITunesTrack.h

src/Twiddly/common/fileCreationTime.cpp

src/Twiddly/common/logger.cpp

src/Twiddly/common/logger.h

src/Twiddly/main.cpp

src/Twiddly/trash

src/Twiddly/trash/Log.cpp

src/Twiddly/trash/Log.h

src/Twiddly/trustInfo.manifest

src/WizardTwiddlyBootstrapPage.cpp

src/WizardTwiddlyBootstrapPage.h

src/libMoose/QtOverrides

src/libMoose/QtOverrides/QSystemTrayIcon

src/libMoose/QtOverrides/README

src/libMoose/QtOverrides/SystemTrayIcon.cpp

src/libMoose/README

src/libUnicorn/AppleScript.cpp

src/libUnicorn/AppleScript.h

src/libUnicorn/crtdep.manifest

src/libUnicorn/crtdepd.manifest

files removed:
bin/updater-autorestart.sh

debian/README.Debian-source

debian/lastfm.lintian

debian/patches/00_build-fixes.diff

debian/patches/01_translations.diff

debian/patches/02_tray-icon-size.diff

debian/patches/03_no-scrobble-directories.diff

debian/patches/05_tray-volume.diff

debian/patches/09_set-locale.diff

debian/patches/10_save-window-states.diff

debian/patches/20_dirpaths.diff

debian/patches/alsa-qdebug.diff

debian/patches/no-fingerprint.diff

src/Helper

src/Helper/Helper.pro

src/Helper/Helper.rc

src/Helper/Helper.vcproj

src/Helper/common.h

src/Helper/controlinterface.cpp

src/Helper/controlinterface.h

src/Helper/main.cpp

src/Helper/mediadevicewatcher.cpp

src/Helper/mediadevicewatcher.h

src/Helper/trustInfo.manifest

src/MediaDeviceConfirmDialog.cpp

src/MediaDeviceConfirmDialog.h

src/extensions/growl/icons.qrc

src/extensions/growl/options_growl.png

src/extensions/growl/settingsdialog_growl.ui

src/mediadevices/gpod

src/mediadevices/gpod/gpod.pro

src/mediadevices/gpod/gpoddevice.cpp

src/mediadevices/gpod/gpoddevice.h

src/mediadevices/itunes

src/mediadevices/itunes/itunes.pro

src/mediadevices/itunes/itunesdevice.cpp

src/mediadevices/itunes/itunesdevice.h

src/mediadevices/itunes/itunesdevice.vcproj

tests/bin/build

files modified:
ChangeLog

LastFM.pro

bin/data/about_mac.png

debian/changelog

debian/lastfm.docs

debian/lastfm.install

debian/patches/check-soundcard-errors.diff

debian/patches/gcc-4.3.patch

debian/patches/series

debian/rules

definitions.pro.inc

i18n/lastfm_cn.ts

i18n/lastfm_de.ts

i18n/lastfm_en.ts

i18n/lastfm_es.ts

i18n/lastfm_fr.ts

i18n/lastfm_it.ts

i18n/lastfm_jp.ts

i18n/lastfm_pl.ts

i18n/lastfm_pt.ts

i18n/lastfm_ru.ts

i18n/lastfm_sv.ts

i18n/lastfm_tr.ts

src/AudioController.cpp

src/Bootstrapper/iTunesBootstrapper.cpp

src/Bootstrapper/iTunesBootstrapper.h

src/Cleaner/Cleaner.pro

src/CrashReporter/CrashReporter.cpp

src/CrashReporter/CrashReporter.pro

src/CrashReporter/main.cpp

src/DiagnosticsDialog.cpp

src/DiagnosticsDialog.h

src/DiagnosticsDialog.ui

src/Killer/Killer.pro

src/MediaDeviceConfirmDialog.ui

src/MetaDataWidget.cpp

src/MetaDataWidget.h

src/ProxyOutput.cpp

src/ProxyOutput.h

src/RestStateWidget.cpp

src/Scrobbler-1.1.cpp

src/Scrobbler-1.2.cpp

src/Scrobbler-1.2.h

src/ShareDialog.cpp

src/ShareDialog.ui

src/SideBarModel.cpp

src/SideBarTreeStyle.cpp

src/SideBarTreeStyle.h

src/SideBarView.cpp

src/SideBarView.h

src/TagListWidget.cpp

src/TagListWidget.h

src/TrackProgressFrame.cpp

src/Updater/Updater.pro

src/User.cpp

src/User.h

src/aboutdialog.cpp

src/aboutdialog.h

src/addplayerdialog.cpp

src/autoupdater.cpp

src/breakpad/BreakPad.cpp

src/breakpad/BreakPad.h

src/breakpad/breakpad.pro

src/componentinfo.cpp

src/componentinfo.h

src/configwizard.cpp

src/configwizard.h

src/container.cpp

src/container.h

src/container.ui

src/container.vcproj

src/deleteuserdialog.cpp

src/deleteuserdialog.ui

src/dialogshell.ui

src/extensions/growl/growl.pro

src/extensions/growl/growlextension.cpp

src/extensions/growl/growlextension.h

src/extensions/messenger/messenger.pro

src/extensions/messenger/messengernotifyextension.cpp

src/extensions/messenger/messengernotifyextension.h

src/extensions/skype/skype.pro

src/extensions/skype/skypenotifyextension.cpp

src/extensions/skype/skypenotifyextension.h

src/httpinput/httpinput.pro

src/iconshack.cpp

src/iconshack.h

src/itunesscript.cpp

src/itunesscript.h

src/lastfmapplication.cpp

src/lastfmapplication.h

src/libFingerprint/FingerprintCollector.cpp

src/libFingerprint/FingerprintQueryer.cpp

src/libFingerprint/FingerprintQueryer.h

src/libFingerprint/Fingerprinter2.cpp

src/libFingerprint/MP3_Source_Qt.cpp

src/libFingerprint/fplib/fplib.pro

src/libFingerprint/fplib/src/FingerprintExtractor.cpp

src/libFingerprint/fplib/src/OptFFT.cpp

src/libFingerprint/libFingerprint.pro

src/libMoose/LastFmSettings.cpp

src/libMoose/LastFmSettings.h

src/libMoose/MooseCommon.cpp

src/libMoose/MooseCommon.h

src/libMoose/confirmdialog.cpp

src/libMoose/confirmdialog.ui

src/libMoose/libMoose.pro

src/libUnicorn/CachedHttp.cpp

src/libUnicorn/CachedHttpJanitor.cpp

src/libUnicorn/CocoaWatcher.h

src/libUnicorn/CocoaWatcher.mm

src/libUnicorn/Collection.cpp

src/libUnicorn/LastMessageBox.cpp

src/libUnicorn/LastMessageBox.h

src/libUnicorn/Settings.h

src/libUnicorn/StopWatch.cpp

src/libUnicorn/TrackInfo.cpp

src/libUnicorn/TrackInfo.h

src/libUnicorn/URLLabel.cpp

src/libUnicorn/URLLabel.h

src/libUnicorn/UnicornCommon.cpp

src/libUnicorn/UnicornCommon.h

src/libUnicorn/UnicornCommonMac.cpp

src/libUnicorn/UnicornCommonMac.h

src/libUnicorn/UnicornCommonWin.cpp

src/libUnicorn/UnicornCommonWin.h

src/libUnicorn/WebService.cpp

src/libUnicorn/WebService.h

src/libUnicorn/WebService/ChangeStationRequest.cpp

src/libUnicorn/WebService/FingerprintQueryRequest.cpp

src/libUnicorn/WebService/FingerprintQueryRequest.h

src/libUnicorn/WebService/RadioMetaDataRequest.cpp

src/libUnicorn/WebService/Request.h

src/libUnicorn/WebService/SetTagRequest.cpp

src/libUnicorn/WebService/fwd.h

src/libUnicorn/WeightedString.h

src/libUnicorn/draglabel.cpp

src/libUnicorn/draglabel.h

src/libUnicorn/imagebutton.cpp

src/libUnicorn/imagebutton.h

src/libUnicorn/libUnicorn.pro

src/libUnicorn/libUnicorn.vcproj

src/libUnicorn/logger.cpp

src/libUnicorn/logger.h

src/libUnicorn/tests/TestSettings.cpp

src/libUnicorn/unicorn.pro.inc

src/loginwidget.cpp

src/loginwidget.h

src/main.cpp

src/output/RtAudio/RtAudio.pro

src/output/RtAudio/rtaudioplayback.cpp

src/playerlistener.cpp

src/playerlistener.h

src/progressframe.cpp

src/settingsdialog.cpp

src/settingsdialog.h

src/settingsdialog.ui

src/settingsdialog_account.ui

src/settingsdialog_connection.ui

src/settingsdialog_mediadevices.ui

src/settingsdialog_scrobbling.ui

src/simplewizard.cpp

src/src.pro

src/systray.cpp

src/systray.h

src/tagdialog.cpp

src/tagdialog.ui

src/transcode/mad/RingBuffer.cpp

src/transcode/mad/RingBuffer.h

src/transcode/mad/mad.pro

src/transcode/mad/mad.vcproj

src/updateinfogetter.cpp

src/version.h

src/wizardbootstrappage.cpp

Show diffs side-by-side

added added

removed removed

debian/patches/alsa-uses-qdebug.diff

1

--- a/src/output/alsa-playback/alsaaudio.cpp

2

+++ b/src/output/alsa-playback/alsaaudio.cpp

3

@@ -27,7 +27,12 @@

4

***************************************************************************/

5

6

#include "alsaaudio.h"

7

+#ifdef QT_NO_DEBUG

8

+#include <QDebug>

9

+#define Q_DEBUG_BLOCK qDebug()

10

+#else

11

#include "logger.h"

12

+#endif

13

#include <qendian.h>

14

15

//no debug

Older »