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

[Mike O'Connor]

Author: stew-guest
Date: 2006-08-25 07:41:31 +0000 (Fri, 25 Aug 2006)
New Revision: 902

Added:
   rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch
Modified:
   rosegarden/trunk/debian/changelog
   rosegarden/trunk/debian/control
   rosegarden/trunk/debian/patches/00list
Log:
adding lirc patch, back, getting 1.4.1 ready to release

Modified: rosegarden/trunk/debian/changelog
===================================================================
--- rosegarden/trunk/debian/changelog	2006-08-21 18:05:44 UTC (rev 901)
+++ rosegarden/trunk/debian/changelog	2006-08-25 07:41:31 UTC (rev 902)
@@ -2,8 +2,9 @@
 
   * New upstream release (Closes: #374814)
   * Got rid of patches which have been applied upstream
+  * Switched dependencies in control file to use ${Source-Version}
 
- -- Mike O'Connor <stew at vireo.org>  Tue,  8 Aug 2006 03:24:56 -0400
+ -- Mike O'Connor <stew at vireo.org>  Fri, 25 Aug 2006 03:26:18 -0400
 
 rosegarden (1:1.2.3-3) unstable; urgency=low
 

Modified: rosegarden/trunk/debian/control
===================================================================
--- rosegarden/trunk/debian/control	2006-08-21 18:05:44 UTC (rev 901)
+++ rosegarden/trunk/debian/control	2006-08-25 07:41:31 UTC (rev 902)
@@ -8,7 +8,7 @@
 
 Package: rosegarden
 Architecture: any
-Depends: ${shlibs:Depends}, khelpcenter, rosegarden-data
+Depends: ${shlibs:Depends}, khelpcenter, rosegarden-data (= ${Source-Version})
 Replaces: rosegarden4,rosegarden2
 Provides: rosegarden4,rosegarden2
 Conflicts: rosegarden4 (< 1:1.2.3), rosegarden2 (< 1:1.2.3)
@@ -21,7 +21,7 @@
 
 Package: rosegarden2
 Architecture: all
-Depends: rosegarden (>= 1:1.2.3)
+Depends: rosegarden (= ${Source-Version})
 Description: music editor and MIDI/audio sequencer
  Rosegarden is a KDE application which provides a mixed Audio/MIDI
  sequencer (for playback and recording), a multi-track editor, music
@@ -33,7 +33,7 @@
 
 Package: rosegarden4
 Architecture: all
-Depends: rosegarden (>= 1:1.2.3)
+Depends: rosegarden (>= ${Source-Version})
 Description: music editor and MIDI/audio sequencer
  Rosegarden is a KDE application which provides a mixed Audio/MIDI
  sequencer (for playback and recording), a multi-track editor, music

Modified: rosegarden/trunk/debian/patches/00list
===================================================================
--- rosegarden/trunk/debian/patches/00list	2006-08-21 18:05:44 UTC (rev 901)
+++ rosegarden/trunk/debian/patches/00list	2006-08-25 07:41:31 UTC (rev 902)
@@ -0,0 +1,2 @@
+20_env.dpatch
+40_fix_missing_lirc_config.dpatch

Added: rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch	2006-08-21 18:05:44 UTC (rev 901)
+++ rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch	2006-08-25 07:41:31 UTC (rev 902)
@@ -0,0 +1,76 @@
+#! /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 *)) );
+ } 
+ 
+ 


Property changes on: rosegarden/trunk/debian/patches/40_fix_missing_lirc_config.dpatch
___________________________________________________________________
Name: svn:executable
   + *