[Demudi-commits] r926 - in rosegarden/trunk/debian: . patches

[Mike O'Connor]

Author: stew-guest
Date: 2006-09-28 13:53:27 +0000 (Thu, 28 Sep 2006)
New Revision: 926

Removed:
   rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch
Modified:
   rosegarden/trunk/debian/changelog
   rosegarden/trunk/debian/patches/00list
Log:
upgrading to upstream's 1.4.0

Modified: rosegarden/trunk/debian/changelog
===================================================================
--- rosegarden/trunk/debian/changelog	2006-09-28 07:45:32 UTC (rev 925)
+++ rosegarden/trunk/debian/changelog	2006-09-28 13:53:27 UTC (rev 926)
@@ -1,3 +1,10 @@
+rosegarden (1:1.4.0-1) unstable; urgency=low
+
+  * New upstream version (Closes: 385658)
+  * Adding Suggests: for qjackctl (Closes: 387907)
+
+ -- Mike O'Connor <stew at vireo.org>  Thu, 28 Sep 2006 09:45:57 -0400
+
 rosegarden (1:1.2.4-1) unstable; urgency=low
 
   [ Mike O'Connor ]

Modified: rosegarden/trunk/debian/patches/00list
===================================================================
--- rosegarden/trunk/debian/patches/00list	2006-09-28 07:45:32 UTC (rev 925)
+++ rosegarden/trunk/debian/patches/00list	2006-09-28 13:53:27 UTC (rev 926)
@@ -1,2 +1 @@
 20_env.dpatch
-40_fix_missing_lirc_config.dpatch

Deleted: rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch	2006-09-28 07:45:32 UTC (rev 925)
+++ rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch	2006-09-28 13:53:27 UTC (rev 926)
@@ -1,76 +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 *)) );
- } 
- 
-