Merge lp:~teemu-heinamaki/ubuntu/maverick/tuxguitar/merge-from-debian into lp:ubuntu/maverick/tuxguitar
Status: | Work in progress |
---|---|
Proposed branch: | lp:~teemu-heinamaki/ubuntu/maverick/tuxguitar/merge-from-debian |
Merge into: | lp:ubuntu/maverick/tuxguitar |
Diff against target: |
36447 lines (+20271/-4937) 422 files modified
.pc/.version (+1/-0) .pc/01-tuxguitar-rzr.patch/misc/tuxguitar.sh (+161/-0) .pc/applied-patches (+1/-0) AUTHORS (+10/-2) ChangeLog (+16/-10) Makefile (+18/-18) TuxGuitar-AudioUnit/How to Install.txt (+33/-0) TuxGuitar-AudioUnit/build.properties (+7/-0) TuxGuitar-AudioUnit/build.xml (+66/-0) TuxGuitar-AudioUnit/jni/Makefile (+26/-0) TuxGuitar-AudioUnit/jni/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp (+335/-0) TuxGuitar-AudioUnit/jni/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.h (+85/-0) TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/JNILibraryLoader.java (+65/-0) TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortImpl.java (+44/-0) TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderAudioUnit.java (+27/-0) TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderPlugin.java (+28/-0) TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverImpl.java (+107/-0) TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverJNI.java (+37/-0) TuxGuitar-CoreAudio/How to Install.txt (+33/-0) TuxGuitar-CoreAudio/build.properties (+1/-1) TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortImpl.java (+14/-3) TuxGuitar-alsa/GNUmakefile (+41/-42) TuxGuitar-alsa/build.properties (+1/-1) TuxGuitar-alsa/jni/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c (+5/-5) TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortImpl.java (+14/-13) TuxGuitar-ascii/GNUmakefile (+27/-27) TuxGuitar-ascii/build.properties (+1/-1) TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIIPluginExporter.java (+2/-2) TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIISongExporter.java (+13/-4) TuxGuitar-browser-ftp/GNUmakefile (+72/-0) TuxGuitar-browser-ftp/build.properties (+1/-1) TuxGuitar-browser-ftp/src/org/herac/tuxguitar/gui/tools/browser/ftp/TGBrowserElementComparator.java (+36/-0) TuxGuitar-browser-ftp/src/org/herac/tuxguitar/gui/tools/browser/ftp/TGBrowserImpl.java (+4/-0) TuxGuitar-carbon-integration/build.properties (+1/-1) TuxGuitar-cocoa-integration/build.properties (+8/-0) TuxGuitar-cocoa-integration/build.xml (+53/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/TGCocoa.java (+142/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/TGCocoaIntegrationPlugin.java (+44/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/menu/MacMenu.java (+98/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/menu/MacMenuPlugin.java (+31/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarker.java (+44/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarkerPlugin.java (+31/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocAction.java (+69/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocListener.java (+59/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocPlugin.java (+31/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbar.java (+103/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarAction.java (+19/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarDelegate.java (+10/-0) TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarPlugin.java (+38/-0) TuxGuitar-community/GNUmakefile (+84/-0) TuxGuitar-community/build.properties (+23/-0) TuxGuitar-community/build.xml (+63/-0) TuxGuitar-community/share/lang/messages.properties (+25/-0) TuxGuitar-community/share/lang/messages_ca.properties (+23/-0) TuxGuitar-community/share/lang/messages_en.properties (+25/-0) TuxGuitar-community/share/lang/messages_es.properties (+23/-0) TuxGuitar-community/share/lang/messages_eu.properties (+23/-0) TuxGuitar-community/share/lang/messages_ja.properties (+23/-0) TuxGuitar-community/share/lang/messages_pl.properties (+23/-0) TuxGuitar-community/share/lang/messages_pt.properties (+23/-0) TuxGuitar-community/share/lang/messages_sv.properties (+29/-0) TuxGuitar-community/share/lang/messages_zh_GB.properties (+23/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/TGCommunityPluginImpl.java (+49/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/TGCommunitySingleton.java (+49/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/auth/TGCommunityAuth.java (+82/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/auth/TGCommunityAuthDialog.java (+176/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/auth/utils/Base64Decoder.java (+96/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/auth/utils/Base64Encoder.java (+132/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserAuthDialog.java (+128/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserConnection.java (+45/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserDataImpl.java (+18/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserElementImpl.java (+69/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserFactoryImpl.java (+41/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserImpl.java (+51/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserPluginImpl.java (+13/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserRequest.java (+57/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserResponse.java (+130/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareFile.java (+51/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareFileDialog.java (+195/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSong.java (+131/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongConnection.java (+29/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongExporter.java (+26/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongPlugin.java (+12/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongRequest.java (+78/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongResponse.java (+90/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/startup/TGCommunityStartupPlugin.java (+30/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/startup/TGCommunityStartupScreen.java (+171/-0) TuxGuitar-community/src/org/herac/tuxguitar/community/utils/TGCommunityWeb.java (+80/-0) TuxGuitar-compat/GNUmakefile (+27/-27) TuxGuitar-compat/build.properties (+1/-1) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/TGPluginListImpl.java (+12/-2) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v07/TGInputStream.java (+6/-6) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v08/TGInputStream.java (+6/-6) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v09/TGInputStream.java (+7/-7) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v09/TGStream.java (+1/-1) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGInputStream.java (+8/-8) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGOutputStream.java (+15/-12) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGStream.java (+1/-1) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGInputStream.java (+748/-0) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGOutputStream.java (+705/-0) TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGStream.java (+203/-0) TuxGuitar-converter/GNUmakefile (+34/-27) TuxGuitar-converter/build.properties (+1/-1) TuxGuitar-converter/share/lang/messages_sv.properties (+23/-0) TuxGuitar-converter/src/org/herac/tuxguitar/gui/tools/custom/converter/DestinationFileTypeCombo.java (+0/-66) TuxGuitar-converter/src/org/herac/tuxguitar/gui/tools/custom/converter/TGConverter.java (+30/-48) TuxGuitar-converter/src/org/herac/tuxguitar/gui/tools/custom/converter/TGConverterDialog.java (+25/-16) TuxGuitar-converter/src/org/herac/tuxguitar/gui/tools/custom/converter/TGConverterFormat.java (+20/-0) TuxGuitar-converter/src/org/herac/tuxguitar/gui/tools/custom/converter/TGConverterProcess.java (+8/-8) TuxGuitar-fluidsynth/GNUmakefile (+48/-42) TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c (+266/-47) TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h (+110/-6) TuxGuitar-fluidsynth/share/lang/messages.properties (+17/-4) TuxGuitar-fluidsynth/share/lang/messages_sv.properties (+23/-0) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortImpl.java (+15/-4) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderImpl.java (+1/-1) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortSettings.java (+395/-125) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSettings.java (+156/-0) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSynth.java (+140/-20) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/BooleanRef.java (+18/-0) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/DoubleRef.java (+18/-0) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/IntegerRef.java (+18/-0) TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/StringRef.java (+18/-0) TuxGuitar-gervill/build.properties (+1/-1) TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioExporter.java (+17/-9) TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioPlugin.java (+29/-8) TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSynth.java (+2/-3) TuxGuitar-gtp/GNUmakefile (+45/-28) TuxGuitar-gtp/build.properties (+1/-1) TuxGuitar-gtp/share/lang/messages_sv.properties (+9/-0) TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP1InputStream.java (+21/-9) TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP2InputStream.java (+21/-10) TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP3InputStream.java (+39/-25) TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP3OutputStream.java (+27/-7) TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP4InputStream.java (+39/-25) TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP4OutputStream.java (+27/-7) TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP5InputStream.java (+41/-26) TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP5OutputStream.java (+25/-7) TuxGuitar-jack/GNUmakefile (+94/-0) TuxGuitar-jack/build.properties (+8/-0) TuxGuitar-jack/build.xml (+51/-0) TuxGuitar-jack/jni/GNUmakefile (+24/-0) TuxGuitar-jack/jni/org_herac_tuxguitar_jack_JackClient.c (+430/-0) TuxGuitar-jack/jni/org_herac_tuxguitar_jack_JackClient.h (+133/-0) TuxGuitar-jack/share/META-INF/services/org.herac.tuxguitar.gui.system.plugins.TGPlugin (+1/-0) TuxGuitar-jack/share/lang/messages.properties (+31/-0) TuxGuitar-jack/share/lang/messages_sv.properties (+38/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/JackClient.java (+190/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/JackPluginImpl.java (+59/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEvent.java (+73/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEventController.java (+94/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEventDispacher.java (+35/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequenceHandler.java (+47/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencer.java (+277/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencerProvider.java (+37/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencerProviderPlugin.java (+23/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTickController.java (+126/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTrack.java (+28/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTrackController.java (+85/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettings.java (+50/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettingsDialog.java (+554/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettingsListener.java (+9/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPort.java (+75/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProvider.java (+35/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProviderPlugin.java (+23/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortRouter.java (+185/-0) TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackReceiver.java (+66/-0) TuxGuitar-jsa/share/lang/messages_ja.properties (+1/-1) TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java (+13/-2) TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java (+13/-2) TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java (+3/-1) TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java (+45/-14) TuxGuitar-jws/build.properties (+15/-90) TuxGuitar-jws/build.xml (+144/-53) TuxGuitar-jws/jws/tuxguitar.jnlp (+25/-15) TuxGuitar-lilypond/GNUmakefile (+34/-27) TuxGuitar-lilypond/build.properties (+1/-1) TuxGuitar-lilypond/share/lang/messages_sv.properties (+23/-0) TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondOutputStream.java (+383/-231) TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondPluginExporter.java (+2/-2) TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSongExporter.java (+11/-5) TuxGuitar-midi/GNUmakefile (+27/-27) TuxGuitar-midi/build.properties (+1/-1) TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginExporter.java (+2/-2) TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginImporter.java (+2/-2) TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSongExporter.java (+16/-8) TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSongImporter.java (+12/-8) TuxGuitar-musicxml/GNUmakefile (+27/-27) TuxGuitar-musicxml/build.properties (+1/-1) TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLPluginExporter.java (+2/-2) TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLSongExporter.java (+13/-4) TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLWriter.java (+6/-6) TuxGuitar-oss/GNUmakefile (+42/-42) TuxGuitar-oss/build.properties (+1/-1) TuxGuitar-oss/jni/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c (+5/-5) TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortImpl.java (+11/-14) TuxGuitar-pdf/build.properties (+1/-1) TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFPluginExporter.java (+2/-2) TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFSongExporter.java (+18/-9) TuxGuitar-ptb/GNUmakefile (+27/-27) TuxGuitar-ptb/build.properties (+1/-1) TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTInputStream.java (+1/-1) TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTSongParser.java (+45/-3) TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTSongSynchronizerUtil.java (+7/-1) TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSection.java (+5/-5) TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSongInfo.java (+25/-0) TuxGuitar-tef/GNUmakefile (+27/-27) TuxGuitar-tef/build.properties (+1/-1) TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TEPluginImporter.java (+2/-2) TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TESongImporter.java (+17/-10) TuxGuitar-tray/GNUmakefile (+27/-27) TuxGuitar-tray/build.properties (+1/-1) TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayMenu.java (+6/-17) TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayPlugin.java (+5/-5) TuxGuitar-winmm/build.properties (+1/-1) TuxGuitar-winmm/jni/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.c (+8/-14) TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortImpl.java (+13/-4) TuxGuitar/GNUmakefile (+12/-8) TuxGuitar/build.properties (+5/-5) TuxGuitar/dist/about_authors.dist (+10/-2) TuxGuitar/dist/about_description.dist (+2/-1) TuxGuitar/dist/config.dist (+1/-1) TuxGuitar/dist/shortcuts-default.xml (+1/-1) TuxGuitar/doc/AUTHORS (+10/-2) TuxGuitar/doc/CHANGES (+16/-10) TuxGuitar/share/help/about.html (+14/-2) TuxGuitar/share/help/start_toolbars.html (+1/-1) TuxGuitar/share/help/whatsnew.html (+33/-1) TuxGuitar/share/lang/messages.properties (+53/-3) TuxGuitar/share/lang/messages_ca.properties (+66/-2) TuxGuitar/share/lang/messages_cs.properties (+2/-2) TuxGuitar/share/lang/messages_de.properties (+2/-2) TuxGuitar/share/lang/messages_en.properties (+75/-5) TuxGuitar/share/lang/messages_es.properties (+68/-3) TuxGuitar/share/lang/messages_eu.properties (+1103/-0) TuxGuitar/share/lang/messages_fr.properties (+2/-2) TuxGuitar/share/lang/messages_hu.properties (+2/-2) TuxGuitar/share/lang/messages_it.properties (+2/-2) TuxGuitar/share/lang/messages_ja.properties (+685/-621) TuxGuitar/share/lang/messages_nl.properties (+2/-2) TuxGuitar/share/lang/messages_pl.properties (+66/-5) TuxGuitar/share/lang/messages_pt.properties (+67/-3) TuxGuitar/share/lang/messages_ru.properties (+2/-2) TuxGuitar/share/lang/messages_sr.properties (+2/-2) TuxGuitar/share/lang/messages_sv.properties (+84/-11) TuxGuitar/share/lang/messages_uk.properties (+2/-2) TuxGuitar/share/lang/messages_vi.properties (+2/-2) TuxGuitar/share/lang/messages_zh_GB.properties (+95/-5) TuxGuitar/share/lang/messages_zh_TW.properties (+2/-2) TuxGuitar/share/scales/scales.xml (+278/-93) TuxGuitar/src/org/herac/tuxguitar/gui/TuxGuitar.java (+43/-33) TuxGuitar/src/org/herac/tuxguitar/gui/actions/ActionManager.java (+14/-2) TuxGuitar/src/org/herac/tuxguitar/gui/actions/composition/ChangeInfoAction.java (+60/-7) TuxGuitar/src/org/herac/tuxguitar/gui/actions/duration/ChangeDivisionTypeAction.java (+95/-0) TuxGuitar/src/org/herac/tuxguitar/gui/actions/duration/ChangeTupletoDurationAction.java (+0/-95) TuxGuitar/src/org/herac/tuxguitar/gui/actions/file/ExportSongAction.java (+66/-20) TuxGuitar/src/org/herac/tuxguitar/gui/actions/file/FileActionUtils.java (+32/-9) TuxGuitar/src/org/herac/tuxguitar/gui/actions/file/ImportSongAction.java (+37/-6) TuxGuitar/src/org/herac/tuxguitar/gui/actions/file/OpenFileAction.java (+3/-1) TuxGuitar/src/org/herac/tuxguitar/gui/actions/insert/InsertChordAction.java (+1/-1) TuxGuitar/src/org/herac/tuxguitar/gui/actions/measure/AddMeasureAction.java (+75/-42) TuxGuitar/src/org/herac/tuxguitar/gui/actions/measure/CleanMeasureAction.java (+147/-13) TuxGuitar/src/org/herac/tuxguitar/gui/actions/measure/PasteMeasureAction.java (+50/-31) TuxGuitar/src/org/herac/tuxguitar/gui/actions/note/MoveBeatsCustomAction.java (+335/-0) TuxGuitar/src/org/herac/tuxguitar/gui/actions/note/MoveBeatsLeftAction.java (+53/-0) TuxGuitar/src/org/herac/tuxguitar/gui/actions/note/MoveBeatsRightAction.java (+53/-0) TuxGuitar/src/org/herac/tuxguitar/gui/actions/system/DisposeAction.java (+15/-12) TuxGuitar/src/org/herac/tuxguitar/gui/actions/tools/TransposeAction.java (+230/-0) TuxGuitar/src/org/herac/tuxguitar/gui/actions/track/TrackPropertiesAction.java (+103/-20) TuxGuitar/src/org/herac/tuxguitar/gui/actions/transport/TransportModeAction.java (+221/-31) TuxGuitar/src/org/herac/tuxguitar/gui/actions/transport/TransportPlayAction.java (+1/-62) TuxGuitar/src/org/herac/tuxguitar/gui/actions/transport/TransportSetLoopEHeaderAction.java (+27/-0) TuxGuitar/src/org/herac/tuxguitar/gui/actions/transport/TransportSetLoopSHeaderAction.java (+27/-0) TuxGuitar/src/org/herac/tuxguitar/gui/actions/transport/TransportStopAction.java (+1/-14) TuxGuitar/src/org/herac/tuxguitar/gui/clipboard/MeasureTransferable.java (+25/-18) TuxGuitar/src/org/herac/tuxguitar/gui/editors/EditorCache.java (+0/-2) TuxGuitar/src/org/herac/tuxguitar/gui/editors/TGPainter.java (+51/-40) TuxGuitar/src/org/herac/tuxguitar/gui/editors/TGPainterUtils.java (+1/-24) TuxGuitar/src/org/herac/tuxguitar/gui/editors/TGUpdateListener.java (+1/-0) TuxGuitar/src/org/herac/tuxguitar/gui/editors/TablatureEditor.java (+1/-1) TuxGuitar/src/org/herac/tuxguitar/gui/editors/chord/ChordCreatorUtil.java (+19/-32) TuxGuitar/src/org/herac/tuxguitar/gui/editors/chord/ChordDialog.java (+3/-2) TuxGuitar/src/org/herac/tuxguitar/gui/editors/chord/ChordEditor.java (+14/-11) TuxGuitar/src/org/herac/tuxguitar/gui/editors/chord/ChordSettingsDialog.java (+2/-2) TuxGuitar/src/org/herac/tuxguitar/gui/editors/effects/BendEditor.java (+3/-1) TuxGuitar/src/org/herac/tuxguitar/gui/editors/effects/GraceEditor.java (+0/-1) TuxGuitar/src/org/herac/tuxguitar/gui/editors/effects/StrokeEditor.java (+1/-1) TuxGuitar/src/org/herac/tuxguitar/gui/editors/effects/TremoloBarEditor.java (+3/-1) TuxGuitar/src/org/herac/tuxguitar/gui/editors/effects/TrillEditor.java (+0/-2) TuxGuitar/src/org/herac/tuxguitar/gui/editors/fretboard/FretBoard.java (+27/-19) TuxGuitar/src/org/herac/tuxguitar/gui/editors/fretboard/FretBoardConfig.java (+44/-9) TuxGuitar/src/org/herac/tuxguitar/gui/editors/matrix/MatrixConfig.java (+7/-7) TuxGuitar/src/org/herac/tuxguitar/gui/editors/matrix/MatrixEditor.java (+186/-151) TuxGuitar/src/org/herac/tuxguitar/gui/editors/piano/Piano.java (+6/-0) TuxGuitar/src/org/herac/tuxguitar/gui/editors/piano/PianoConfig.java (+6/-6) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/Caret.java (+15/-18) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGBeatGroup.java (+0/-1) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGBeatImpl.java (+111/-362) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGBeatSpacing.java (+44/-0) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGChordImpl.java (+22/-9) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGLyricImpl.java (+1/-2) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGMeasureBuffer.java (+26/-12) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGMeasureImpl.java (+149/-216) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGNoteImpl.java (+23/-19) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGResources.java (+17/-5) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGSpacing.java (+53/-0) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGTextImpl.java (+1/-2) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGTrackSpacing.java (+90/-0) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/TGVoiceImpl.java (+26/-59) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/Tablature.java (+3/-2) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/edit/EditorKit.java (+2/-2) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/edit/MouseKit.java (+9/-7) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/layout/LinearViewLayout.java (+9/-10) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/layout/PageViewLayout.java (+10/-15) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/layout/PrinterViewLayout.java (+58/-41) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/layout/TrackSpacing.java (+0/-132) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/layout/ViewLayout.java (+58/-26) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/painters/TGTempoPainter.java (+1/-0) TuxGuitar/src/org/herac/tuxguitar/gui/editors/tab/painters/TGTripletFeelPainter.java (+5/-0) TuxGuitar/src/org/herac/tuxguitar/gui/help/about/AboutDialog.java (+1/-1) TuxGuitar/src/org/herac/tuxguitar/gui/items/ItemManager.java (+94/-12) TuxGuitar/src/org/herac/tuxguitar/gui/items/menu/BeatMenuItem.java (+29/-2) TuxGuitar/src/org/herac/tuxguitar/gui/items/menu/DurationMenuItem.java (+8/-8) TuxGuitar/src/org/herac/tuxguitar/gui/items/menu/FileMenuItem.java (+132/-51) TuxGuitar/src/org/herac/tuxguitar/gui/items/menu/ToolMenuItem.java (+8/-1) TuxGuitar/src/org/herac/tuxguitar/gui/items/menu/TrackMenuItem.java (+1/-1) TuxGuitar/src/org/herac/tuxguitar/gui/items/menu/TransportMenuItem.java (+24/-1) TuxGuitar/src/org/herac/tuxguitar/gui/items/tool/BeatToolItems.java (+4/-1) TuxGuitar/src/org/herac/tuxguitar/gui/items/tool/CompositionToolItems.java (+8/-3) TuxGuitar/src/org/herac/tuxguitar/gui/items/tool/DurationToolItems.java (+48/-57) TuxGuitar/src/org/herac/tuxguitar/gui/marker/MarkerEditor.java (+8/-8) TuxGuitar/src/org/herac/tuxguitar/gui/mixer/TGMixerTrack.java (+13/-18) TuxGuitar/src/org/herac/tuxguitar/gui/printer/PrintStyles.java (+13/-2) TuxGuitar/src/org/herac/tuxguitar/gui/printer/PrintStylesDialog.java (+5/-0) TuxGuitar/src/org/herac/tuxguitar/gui/system/config/TGConfigDefaults.java (+16/-13) TuxGuitar/src/org/herac/tuxguitar/gui/system/config/TGConfigKeys.java (+3/-0) TuxGuitar/src/org/herac/tuxguitar/gui/system/config/TGConfigManager.java (+36/-0) TuxGuitar/src/org/herac/tuxguitar/gui/system/icons/IconManager.java (+4/-4) TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginConfigManager.java (+1/-5) TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginManager.java (+3/-3) TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/base/TGExporterPlugin.java (+3/-3) TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/base/TGImporterPlugin.java (+3/-3) TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/base/TGMidiOutputPortProviderPlugin.java (+0/-1) TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/base/TGMidiSequencerProviderPlugin.java (+0/-2) TuxGuitar/src/org/herac/tuxguitar/gui/table/TGTableCanvasPainter.java (+4/-0) TuxGuitar/src/org/herac/tuxguitar/gui/table/TGTableViewer.java (+16/-6) TuxGuitar/src/org/herac/tuxguitar/gui/tools/browser/TGBrowserManager.java (+24/-7) TuxGuitar/src/org/herac/tuxguitar/gui/tools/browser/dialog/TGBrowserBar.java (+1/-1) TuxGuitar/src/org/herac/tuxguitar/gui/tools/browser/dialog/TGBrowserDialog.java (+0/-4) TuxGuitar/src/org/herac/tuxguitar/gui/tools/browser/dialog/TGBrowserElementComparator.java (+0/-36) TuxGuitar/src/org/herac/tuxguitar/gui/tools/browser/dialog/TGBrowserMenuBar.java (+2/-0) TuxGuitar/src/org/herac/tuxguitar/gui/tools/browser/dialog/TGBrowserToolBar.java (+2/-0) TuxGuitar/src/org/herac/tuxguitar/gui/tools/browser/filesystem/TGBrowserElementComparator.java (+36/-0) TuxGuitar/src/org/herac/tuxguitar/gui/tools/browser/filesystem/TGBrowserImpl.java (+4/-0) TuxGuitar/src/org/herac/tuxguitar/gui/tools/scale/ScaleEditor.java (+1/-1) TuxGuitar/src/org/herac/tuxguitar/gui/transport/TGTransport.java (+44/-15) TuxGuitar/src/org/herac/tuxguitar/gui/transport/TGTransportListener.java (+69/-0) TuxGuitar/src/org/herac/tuxguitar/gui/undo/undoables/UndoableJoined.java (+4/-0) TuxGuitar/src/org/herac/tuxguitar/gui/undo/undoables/custom/UndoableChangeInfo.java (+22/-2) TuxGuitar/src/org/herac/tuxguitar/gui/undo/undoables/measure/UndoableMeasureGeneric.java (+21/-0) TuxGuitar/src/org/herac/tuxguitar/gui/undo/undoables/track/UndoableTrackGeneric.java (+12/-1) TuxGuitar/src/org/herac/tuxguitar/gui/undo/undoables/track/UndoableTrackInstrument.java (+6/-6) TuxGuitar/src/org/herac/tuxguitar/gui/undo/undoables/track/UndoableTrackSoloMute.java (+94/-0) TuxGuitar/src/org/herac/tuxguitar/gui/util/FileChooser.java (+9/-5) TuxGuitar/src/org/herac/tuxguitar/gui/util/MidiTickUtil.java (+29/-9) TuxGuitar/src/org/herac/tuxguitar/gui/util/TGSplash.java (+2/-0) TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormatManager.java (+22/-6) TuxGuitar/src/org/herac/tuxguitar/io/base/TGLocalFileExporter.java (+15/-0) TuxGuitar/src/org/herac/tuxguitar/io/base/TGLocalFileImporter.java (+15/-0) TuxGuitar/src/org/herac/tuxguitar/io/base/TGRawExporter.java (+10/-0) TuxGuitar/src/org/herac/tuxguitar/io/base/TGRawImporter.java (+11/-0) TuxGuitar/src/org/herac/tuxguitar/io/base/TGSongExporter.java (+0/-16) TuxGuitar/src/org/herac/tuxguitar/io/base/TGSongImporter.java (+0/-18) TuxGuitar/src/org/herac/tuxguitar/io/tg/TGInputStream.java (+23/-8) TuxGuitar/src/org/herac/tuxguitar/io/tg/TGOutputStream.java (+23/-8) TuxGuitar/src/org/herac/tuxguitar/io/tg/TGStream.java (+1/-1) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiDevice.java (+14/-0) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiOutputPort.java (+5/-11) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayer.java (+108/-14) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerListener.java (+10/-0) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerMode.java (+45/-19) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPort.java (+0/-23) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiReceiver.java (+2/-0) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiRepeatController.java (+19/-1) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequenceHandler.java (+0/-12) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequenceParser.java (+87/-58) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencer.java (+1/-9) TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java (+4/-0) TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java (+9/-1) TuxGuitar/src/org/herac/tuxguitar/song/factory/TGFactory.java (+7/-7) TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java (+34/-2) TuxGuitar/src/org/herac/tuxguitar/song/managers/TGMeasureManager.java (+464/-106) TuxGuitar/src/org/herac/tuxguitar/song/managers/TGSongManager.java (+13/-8) TuxGuitar/src/org/herac/tuxguitar/song/managers/TGTrackManager.java (+45/-4) TuxGuitar/src/org/herac/tuxguitar/song/models/TGChannel.java (+3/-3) TuxGuitar/src/org/herac/tuxguitar/song/models/TGChord.java (+0/-4) TuxGuitar/src/org/herac/tuxguitar/song/models/TGDivisionType.java (+76/-0) TuxGuitar/src/org/herac/tuxguitar/song/models/TGDuration.java (+15/-15) TuxGuitar/src/org/herac/tuxguitar/song/models/TGSong.java (+55/-0) TuxGuitar/src/org/herac/tuxguitar/song/models/TGTupleto.java (+0/-76) TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java (+2/-2) TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java (+2/-2) TuxGuitar/src/org/herac/tuxguitar/util/TGLock.java (+17/-21) TuxGuitar/src/org/herac/tuxguitar/util/TGSynchronizer.java (+4/-4) TuxGuitar/src/org/herac/tuxguitar/util/TGVersion.java (+1/-1) TuxGuitar/xml/build-freebsd.xml (+2/-2) TuxGuitar/xml/build-linux.xml (+12/-8) TuxGuitar/xml/build-mac.xml (+3/-3) TuxGuitar/xml/build-ubuntu.xml (+12/-8) TuxGuitar/xml/build-windows.xml (+17/-8) build_gcj.sh (+33/-2) debian/changelog (+81/-9) debian/compat (+1/-1) debian/control (+19/-10) debian/patches/01-tuxguitar-rzr.patch (+394/-0) debian/patches/series (+1/-0) debian/rules (+13/-14) debian/source/format (+1/-0) debian/tuxguitar-jack.install (+3/-0) debian/tuxguitar.manpages (+1/-1) misc/swt-3.3-gtk-linux-x86.patch (+0/-84) misc/tuxguitar.sh (+38/-22) |
To merge this branch: | bzr merge lp:~teemu-heinamaki/ubuntu/maverick/tuxguitar/merge-from-debian |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Needs Fixing | ||
Ubuntu branches | Pending | ||
Review via email: mp+25794@code.launchpad.net |
This proposal supersedes a proposal from 2010-05-17.
Description of the change
Merge from Debian Unstable. Remaining changes are: Use Java Sound API by default and Change Maintainer to Ubuntu-MOTU.
Unmerged revisions
- 10. By Hippu
-
* Merge from Debian, remaining changes (LP: 523196):
- debian/control
+ Use xulrunner 1.9.2
+ Use jsa-plugin by default
+ Change maintainer to Ubuntu MOTU
- misc/tuxguitar.sh
+ Search for xulrunner 1.9.2 instead of 1.9.1
* Address bashism in /usr/bin/tuxguitar (Closes: #581142)
(Thank you to Raphael Geissert)
* Switch to dpkg-source 3.0 (quilt) format
- remove debian/README. source
- remove patch-related targets in debian/rules
- remove build-dep on quilt
* debian/compat - upgrade to debhelper 7
* Remove extraneous LICENSE file.
* Modify tuxguitar.sh to find swt-gtk-3.5.1.jar (Closes: #575898)
* Unbuild tuxguitar-gervill (Closes: #570556) :
- since it depends on unpackaged component
* Added jack plugin (Closes: #569999)
* Merged upstream files in patch (Closes: #569910)
* Non-maintainer upload.
* debian/control:
- Update swt-gtk dependency to 3.5 to fix FTBFS. (Closes: #564347)
- Change XS-Vcs-* fields to Vcs-*.
- Add ${misc:Depends}.
- Bump Standards-Version to 3.8.4.
* debian/rules: Don't install redundant LICENSE doc.
* New upstream release (Closes: #510742)
* Merged patch : tuxguitar_1.1-1ubuntu1. patch
* Added Makefile : from upstream repo
* debian/* :
- Migrated to quilt
- Updated standards
* Non-maintainer upload for transition to xulrunner 1.9.1.
(Closes: #548683)
* debian/control: Depend on a xulrunner-1.9.1.
* misc/tuxguitar.sh: Detect xulrunner 1.9.1.
* New upstream release (closes: #405295 , #398972)
This needs to have my changes from 1.1-1ubuntu4
Thanks.