[Demudi-commits] r895 - in rosegarden/trunk: . debian debian/patches
Mike O'Connor
stew-guest at costa.debian.org
Tue Aug 8 06:50:48 UTC 2006
Author: stew-guest
Date: 2006-08-08 06:50:33 +0000 (Tue, 08 Aug 2006)
New Revision: 895
Removed:
rosegarden/trunk/.cvsignore
rosegarden/trunk/debian/patches/10_install-list.dpatch
rosegarden/trunk/debian/patches/30_fix-missing-snd-seq.dpatch
rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch
Modified:
rosegarden/trunk/debian/changelog
rosegarden/trunk/debian/patches/00list
rosegarden/trunk/debian/patches/20_env.dpatch
Log:
syncing to upstream's 1.2.4 release
Deleted: rosegarden/trunk/.cvsignore
===================================================================
--- rosegarden/trunk/.cvsignore 2006-08-08 06:23:32 UTC (rev 894)
+++ rosegarden/trunk/.cvsignore 2006-08-08 06:50:33 UTC (rev 895)
@@ -1,25 +0,0 @@
-Makefile
-Makefile.in
-config.cache
-config.h
-config.h.in
-config.log
-config.status
-configure.files
-subdirs
-libtool
-stamp-h
-stamp-h.in
-acinclude.m4
-aclocal.m4
-configure
-configure.in
-autom4te.cache
-stamp-h1
-config.py
-*.pyc
-.sconf_temp
-scons_signatures.dblite
-cache
-*.cache.py
-version.txt
Modified: rosegarden/trunk/debian/changelog
===================================================================
--- rosegarden/trunk/debian/changelog 2006-08-08 06:23:32 UTC (rev 894)
+++ rosegarden/trunk/debian/changelog 2006-08-08 06:50:33 UTC (rev 895)
@@ -1,3 +1,10 @@
+rosegarden (1:1.2.4-1) UNRELEASED; urgency=low
+
+ * New upstream release (Closes: #374814)
+ * Got rid of patches which have been applied upstream
+
+ -- Mike O'Connor <stew at vireo.org> Tue, 8 Aug 2006 02:47:45 -0400
+
rosegarden (1:1.2.3-3) unstable; urgency=low
* Startup cleanly when lirc is installed without a valid config
Modified: rosegarden/trunk/debian/patches/00list
===================================================================
--- rosegarden/trunk/debian/patches/00list 2006-08-08 06:23:32 UTC (rev 894)
+++ rosegarden/trunk/debian/patches/00list 2006-08-08 06:50:33 UTC (rev 895)
@@ -1,4 +1 @@
-10_install-list
20_env
-30_fix-missing-snd-seq
-40_fix_missing_lirc_config.dpatch
Deleted: rosegarden/trunk/debian/patches/10_install-list.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/10_install-list.dpatch 2006-08-08 06:23:32 UTC (rev 894)
+++ rosegarden/trunk/debian/patches/10_install-list.dpatch 2006-08-08 06:50:33 UTC (rev 895)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_install-list.dpatch by Free Ekanayaka <free at 64studio.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad rosegarden-1.2.3.orig~/scons_admin/kde.py rosegarden-1.2.3.orig/scons_admin/kde.py
---- rosegarden-1.2.3.orig~/scons_admin/kde.py 2005-08-26 22:37:44.000000000 +0200
-+++ rosegarden-1.2.3.orig/scons_admin/kde.py 2006-06-07 11:12:24.000000000 +0200
-@@ -533,7 +533,7 @@
- def KDEinstallas(lenv, restype, destfile, file):
- if not env['_INSTALL']: return
- dir = getInstDirForResType(lenv, restype)
-- install_list = lenv.InstallAs(lenv.join(dir, destfile), file)
-+ install_list = lenv.bksys_install(dir, [file], destfile)
- env.Alias('install', install_list)
- return install_list
-
Modified: rosegarden/trunk/debian/patches/20_env.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/20_env.dpatch 2006-08-08 06:23:32 UTC (rev 894)
+++ rosegarden/trunk/debian/patches/20_env.dpatch 2006-08-08 06:50:33 UTC (rev 895)
@@ -17,12 +17,3 @@
# Export 'env' so that sconscripts in subdirectories can use it
Export( "env" )
-@@ -143,7 +143,7 @@
-
- # icons
- env.KDEinstallas('KDEICONS','/locolor/16x16/apps/x-rosegarden.xpm', "gui/pixmaps/icons/cc-hi16-rosegarden.xpm")
-- env.KDEinstallas('KDEICONS','/hicolor/16x16/apps/x-rosegarden.xpm', "gui/pixmaps/icons/rg-rwb-rose3-16x16.png")
-+ env.KDEinstallas('KDEICONS','/hicolor/16x16/apps/x-rosegarden.png', "gui/pixmaps/icons/rg-rwb-rose3-16x16.png")
-
- env.KDEinstallas('KDEICONS','/hicolor/48x48/apps/rosegarden.png', "gui/pixmaps/icons/rg-rwb-rose3-48x48.png")
- env.KDEinstallas('KDEICONS','/hicolor/64x64/apps/rosegarden.png', "gui/pixmaps/icons/rg-rwb-rose3-64x64.png")
Deleted: rosegarden/trunk/debian/patches/30_fix-missing-snd-seq.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/30_fix-missing-snd-seq.dpatch 2006-08-08 06:23:32 UTC (rev 894)
+++ rosegarden/trunk/debian/patches/30_fix-missing-snd-seq.dpatch 2006-08-08 06:50:33 UTC (rev 895)
@@ -1,206 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30fix-missing-snd-seq.dpatch by Mike O'Connor <stew at vireo.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad rosegarden-1.2.3.orig~/sound/AlsaDriver.cpp rosegarden-1.2.3.orig/sound/AlsaDriver.cpp
---- rosegarden-1.2.3.orig~/sound/AlsaDriver.cpp 2006-06-24 14:01:17.000000000 -0400
-+++ rosegarden-1.2.3.orig/sound/AlsaDriver.cpp 2006-06-24 14:07:08.000000000 -0400
-@@ -1631,18 +1631,22 @@
- m_firstTimerCheck = true;
- }
-
--void
-+bool
- AlsaDriver::initialise()
- {
-+ bool result = true;
-+
- initialiseAudio();
-- initialiseMidi();
-+ result = initialiseMidi();
-+
-+ return result;
- }
-
-
-
- // Set up queue, client and port
- //
--void
-+bool
- AlsaDriver::initialiseMidi()
- {
- Audit audit;
-@@ -1654,10 +1658,10 @@
- SND_SEQ_OPEN_DUPLEX,
- SND_SEQ_NONBLOCK) < 0) {
- audit << "AlsaDriver::initialiseMidi - "
-- << "couldn't open sequencer - " << snd_strerror(errno)
-+ << "couldn't open sequencer - " << snd_strerror(errno) << " - perhaps you need to modprobe snd-seq-midi."
- << std::endl;
- reportFailure(Rosegarden::MappedEvent::FailureALSACallFailed);
-- return;
-+ return false;
- }
-
- snd_seq_set_client_name(m_midiHandle, "rosegarden");
-@@ -1668,7 +1672,7 @@
- std::cerr << "AlsaDriver::initialiseMidi - can't create client"
- << std::endl;
- #endif
-- return;
-+ return false;
- }
-
- // Create a queue
-@@ -1680,7 +1684,7 @@
- std::cerr << "AlsaDriver::initialiseMidi - can't allocate queue"
- << std::endl;
- #endif
-- return;
-+ return false;
- }
-
- // Create the input port
-@@ -1701,7 +1705,7 @@
-
- if (checkAlsaError(snd_seq_create_port(m_midiHandle, pinfo),
- "initialiseMidi - can't create input port") < 0)
-- return;
-+ return false;
- m_inputPort = snd_seq_port_info_get_port(pinfo);
-
- // Subscribe the input port to the ALSA Announce port
-@@ -1722,7 +1726,7 @@
- << "can't modify pool parameters"
- << std::endl;
- #endif
-- return;
-+ return false;
- }
-
- // Create sync output now as well
-@@ -1761,7 +1765,7 @@
- if (checkAlsaError(snd_seq_start_queue(m_midiHandle, m_queue, NULL),
- "initialiseMidi(): couldn't start queue") < 0) {
- reportFailure(Rosegarden::MappedEvent::FailureALSACallFailed);
-- return;
-+ return false;
- }
-
- m_queueRunning = true;
-@@ -1771,6 +1775,8 @@
-
- audit << "AlsaDriver::initialiseMidi - initialised MIDI subsystem"
- << std::endl << std::endl;
-+
-+ return true;
- }
-
- // We don't even attempt to use ALSA audio. We just use JACK instead.
-diff -urNad rosegarden-1.2.3.orig~/sound/AlsaDriver.h rosegarden-1.2.3.orig/sound/AlsaDriver.h
---- rosegarden-1.2.3.orig~/sound/AlsaDriver.h 2006-06-24 14:01:17.000000000 -0400
-+++ rosegarden-1.2.3.orig/sound/AlsaDriver.h 2006-06-24 14:07:08.000000000 -0400
-@@ -56,7 +56,7 @@
- // shutdown everything that's currently open
- void shutdown();
-
-- virtual void initialise();
-+ virtual bool initialise();
- virtual void initialisePlayback(const RealTime &position);
- virtual void stopPlayback();
- virtual void punchOut();
-@@ -99,7 +99,7 @@
-
- // initialise subsystems
- //
-- void initialiseMidi();
-+ bool initialiseMidi();
- void initialiseAudio();
-
- // Some stuff to help us debug this
-diff -urNad rosegarden-1.2.3.orig~/sound/ArtsDriver.cpp rosegarden-1.2.3.orig/sound/ArtsDriver.cpp
---- rosegarden-1.2.3.orig~/sound/ArtsDriver.cpp 2006-06-24 14:01:17.000000000 -0400
-+++ rosegarden-1.2.3.orig/sound/ArtsDriver.cpp 2006-06-24 14:07:08.000000000 -0400
-@@ -129,11 +129,18 @@
-
-
-
--void
-+bool
- ArtsDriver::initialise()
- {
-- initialiseMidi();
-- initialiseAudio();
-+ bool ressult = true;
-+
-+ result = initialiseMidi();
-+ if( result )
-+ {
-+ result = initialiseAudio();
-+ }
-+
-+ return result;
- }
-
- void
-diff -urNad rosegarden-1.2.3.orig~/sound/ArtsDriver.h rosegarden-1.2.3.orig/sound/ArtsDriver.h
---- rosegarden-1.2.3.orig~/sound/ArtsDriver.h 2006-06-24 14:01:17.000000000 -0400
-+++ rosegarden-1.2.3.orig/sound/ArtsDriver.h 2006-06-24 14:07:08.000000000 -0400
-@@ -48,7 +48,7 @@
- ArtsDriver(MappedStudio *studio);
- virtual ~ArtsDriver();
-
-- virtual void initialise();
-+ virtual bool initialise();
- virtual void initialisePlayback(const RealTime &position);
- virtual void stopPlayback();
- virtual void resetPlayback(const RealTime &oldPosition, const RealTime &position);
-diff -urNad rosegarden-1.2.3.orig~/sound/SoundDriver.h rosegarden-1.2.3.orig/sound/SoundDriver.h
---- rosegarden-1.2.3.orig~/sound/SoundDriver.h 2006-06-24 14:01:17.000000000 -0400
-+++ rosegarden-1.2.3.orig/sound/SoundDriver.h 2006-06-24 14:07:08.000000000 -0400
-@@ -148,7 +148,7 @@
- SoundDriver(MappedStudio *studio, const std::string &name);
- virtual ~SoundDriver();
-
-- virtual void initialise() = 0;
-+ virtual bool initialise() = 0;
- virtual void shutdown() { }
-
- virtual void initialisePlayback(const RealTime &position) = 0;
-diff -urNad rosegarden-1.2.3.orig~/sound/SoundDriverFactory.cpp rosegarden-1.2.3.orig/sound/SoundDriverFactory.cpp
---- rosegarden-1.2.3.orig~/sound/SoundDriverFactory.cpp 2006-06-24 14:01:17.000000000 -0400
-+++ rosegarden-1.2.3.orig/sound/SoundDriverFactory.cpp 2006-06-24 14:07:08.000000000 -0400
-@@ -37,7 +37,7 @@
- SoundDriverFactory::createDriver(MappedStudio *studio)
- {
- SoundDriver *driver = 0;
--
-+ bool initialised = false;
- #ifdef NO_SOUND
- driver = new DummyDriver(studio);
- #else
-@@ -48,9 +48,18 @@
- #endif
- #endif
-
-- driver->initialise();
-+ initialised = driver->initialise();
-
-- return driver;
-+ if( initialised )
-+ {
-+ return driver;
-+ }
-+ else
-+ {
-+ driver->shutdown();
-+ delete driver;
-+ return 0;
-+ }
- }
-
-
Deleted: rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch 2006-08-08 06:23:32 UTC (rev 894)
+++ rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch 2006-08-08 06:50:33 UTC (rev 895)
@@ -1,81 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_fix_missing_lirc_config.dpatch by <stew at sandshark>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad rosegarden-1.2.3~/gui/lircclient.cpp rosegarden-1.2.3/gui/lircclient.cpp
---- rosegarden-1.2.3~/gui/lircclient.cpp 2006-01-03 15:14:34.000000000 -0500
-+++ rosegarden-1.2.3/gui/lircclient.cpp 2006-07-23 01:43:22.000000000 -0400
-@@ -40,7 +40,7 @@
-
- // constructor/destructor initializes the LircClient library
- LircClient::LircClient(void)
-- : QObject()
-+ : QObject(), m_available(false)
- {
- int socketFlags;
-
-@@ -57,12 +57,18 @@
- fcntl(socketFlags, F_SETFL, socketFlags|O_NONBLOCK);
- }
-
-- if(lirc_readconfig(NULL, &m_config, NULL)==-1) exit(EXIT_FAILURE);
--
-- m_socketNotifier = new QSocketNotifier(m_socket, QSocketNotifier::Read, 0);
-- connect(m_socketNotifier, SIGNAL(activated(int)), this, SLOT(readButton()) );
--
-- RG_DEBUG << "LircClient::LircClient: connected to socket: " << m_socket << endl;
-+ if(lirc_readconfig(NULL, &m_config, NULL)!=-1)
-+ {
-+ m_socketNotifier = new QSocketNotifier(m_socket, QSocketNotifier::Read, 0);
-+ connect(m_socketNotifier, SIGNAL(activated(int)), this, SLOT(readButton()) );
-+
-+ m_available = true;
-+ RG_DEBUG << "LircClient::LircClient: connected to socket: " << m_socket << endl;
-+ }
-+ else
-+ {
-+ RG_DEBUG << "LircClient::LircClient: lirc config missing. lirc support will be disabled.";
-+ }
- }
-
- LircClient::~LircClient()
-diff -urNad rosegarden-1.2.3~/gui/lircclient.h rosegarden-1.2.3/gui/lircclient.h
---- rosegarden-1.2.3~/gui/lircclient.h 2006-01-03 15:14:34.000000000 -0500
-+++ rosegarden-1.2.3/gui/lircclient.h 2006-07-23 01:44:13.000000000 -0400
-@@ -47,12 +47,14 @@
-
- public slots:
- void readButton();
-+ bool getAvailable() { return m_available; }
-
- signals:
- void buttonPressed(char *);
-
- private:
- int m_socket;
-+ bool m_available;
- QSocketNotifier *m_socketNotifier;
- struct lirc_config *m_config;
- char *m_command;
-diff -urNad rosegarden-1.2.3~/gui/lirccommander.cpp rosegarden-1.2.3/gui/lirccommander.cpp
---- rosegarden-1.2.3~/gui/lirccommander.cpp 2006-01-03 15:14:34.000000000 -0500
-+++ rosegarden-1.2.3/gui/lirccommander.cpp 2006-07-23 02:00:35.000000000 -0400
-@@ -39,7 +39,9 @@
- {
- m_lirc = lirc;
- m_rgGUIApp = rgGUIApp;
-- connect(m_lirc, SIGNAL(buttonPressed(char *)), this, SLOT(execute(char *)) );
-+
-+ if(m_lirc && m_lirc->getAvailable() )
-+ connect(m_lirc, SIGNAL(buttonPressed(char *)), this, SLOT(execute(char *)) );
- }
-
-
-diff -urNad rosegarden-1.2.3~/version.txt rosegarden-1.2.3/version.txt
---- rosegarden-1.2.3~/version.txt 1969-12-31 19:00:00.000000000 -0500
-+++ rosegarden-1.2.3/version.txt 2006-07-23 02:14:50.000000000 -0400
-@@ -0,0 +1 @@
-+4-1.2.3
More information about the Demudi-commits
mailing list