tags 356366 + pending
thanks

I've uploaded the following NMU to delayed-2.


diff -u raidutils-0.0.4/debian/changelog raidutils-0.0.4/debian/changelog
--- raidutils-0.0.4/debian/changelog
+++ raidutils-0.0.4/debian/changelog
@@ -1,3 +1,10 @@
+raidutils (0.0.4-7.1) unstable; urgency=low
+
+  * NMU as part of the GCC 4.1 transition.
+  * Remove extra qualification from C++ header files (closes: #356366)
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]>  Thu, 25 May 2006 21:58:25 +0200
+
 raidutils (0.0.4-7) unstable; urgency=low
 
--- raidutils-0.0.4.orig/raideng/raid.h
+++ raidutils-0.0.4/raideng/raid.h
@@ -271,7 +271,7 @@
 
 // Constructor/Destructor.............................
 
-                       raidDef_S::raidDef_S();
+                       raidDef_S();
 
 };
 #endif  // c++
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raideng/connect.hpp
+++ raidutils-0.0.4/raideng/connect.hpp
@@ -189,7 +189,7 @@
 
 // Constructor/Destructor.............................
 
-                       dptSCSIcon_C::dptSCSIcon_C();
+                       dptSCSIcon_C();
 
 // Message Handlers...................................
 
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/setrate.hpp
+++ raidutils-0.0.4/raidutil/setrate.hpp
@@ -59,8 +59,8 @@
        public:
 
                // Set the (global) rebuild rate
-        SetRate::SetRate(int rate, SCSI_Addr_List *objs);
-        SetRate::SetRate(const SetRate &right);
+                SetRate(int rate, SCSI_Addr_List *objs);
+                SetRate(const SetRate &right);
                virtual ~SetRate();
 
                Dpt_Error execute(String_List **output);
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/segment.hpp
+++ raidutils-0.0.4/raidutil/segment.hpp
@@ -51,7 +51,7 @@
 {
 
        public:
-               arraySegment::arraySegment(SCSI_Address raidToSeg, uLONG 
segSize[8], uLONG segOffset[8], bool showSeg);
+               arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG 
segOffset[8], bool showSeg);
                arraySegment(const arraySegment &new_arraySegment);
                virtual ~arraySegment();
 
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/rmwflash.hpp
+++ raidutils-0.0.4/raidutil/rmwflash.hpp
@@ -59,7 +59,7 @@
 {
 
         public:
-                RMWFlash::RMWFlash(int hbaNo, char *Data, int Region, unsigned 
long Offset, unsigned Size);
+                RMWFlash(int hbaNo, char *Data, int Region, unsigned long 
Offset, unsigned Size);
                 RMWFlash(const RMWFlash &new_RMWFlash);
                 virtual ~RMWFlash();
 
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/setcache.hpp
+++ raidutils-0.0.4/raidutil/setcache.hpp
@@ -55,11 +55,11 @@
 class SetCache:public Command
        {
        public:
-               SetCache::SetCache(
-                               SCSI_Addr_List  *addresses,             // a 
list of addresses
-                               int                             on,             
                // Whether to enable or disable
-                               int                             rw              
                // Read or write cacheing.
-                               );                                              
                // to delete raid tables on
+               SetCache(
+                       SCSI_Addr_List  *addresses,             // a list of 
addresses
+                       int                             on,                     
        // Whether to enable or disable
+                       int                             rw                      
        // Read or write cacheing.
+                       );                                                      
        // to delete raid tables on
                SetCache( const SetCache &new_SetCache );
                virtual ~SetCache();
                SetCache        &operator = ( SetCache &right );
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/eventlog.hpp
+++ raidutils-0.0.4/raidutil/eventlog.hpp
@@ -77,7 +77,7 @@
        {
 
        public:
-               EventLog::EventLog(SCSI_Addr_List *deviceList, 
+               EventLog(SCSI_Addr_List *deviceList, 
             EventLogOptions cmd);
                EventLog(const EventLog &new_EventLog);
                virtual ~EventLog();
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/taskctrl.hpp
+++ raidutils-0.0.4/raidutil/taskctrl.hpp
@@ -59,7 +59,7 @@
 class TaskControl:public Command
        {
        public:
-               TaskControl::TaskControl(SCSI_Addr_List *deviceList, 
TaskCommandOptions cmd);
+               TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
                TaskControl(const TaskControl &new_TaskControl);
                virtual ~TaskControl();
 
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/zap.hpp
+++ raidutils-0.0.4/raidutil/zap.hpp
@@ -55,7 +55,7 @@
 class Zap:public Command
        {
        public:
-               Zap::Zap(
+               Zap(
                                SCSI_Addr_List  *addresses,  // a list of 
addresses
             int resync = 0            // (send reset to hba or not)
       );                                                                       
 // to delete raid tables on
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/setscfg.hpp
+++ raidutils-0.0.4/raidutil/setscfg.hpp
@@ -59,7 +59,7 @@
 {
 
        public:
-               setscfg::setscfg();
+               setscfg();
                virtual ~setscfg();
 
                Dpt_Error execute(String_List **output);
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/uartdmp.hpp
+++ raidutils-0.0.4/raidutil/uartdmp.hpp
@@ -59,7 +59,7 @@
 {
 
        public:
-               UartDmp::UartDmp(int hbaNo, char *fileName);
+               UartDmp(int hbaNo, char *fileName);
                UartDmp(const UartDmp &new_UartDmp);
                virtual ~UartDmp();
 
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/alarm.hpp
+++ raidutils-0.0.4/raidutil/alarm.hpp
@@ -58,7 +58,7 @@
 class AlarmStatus:public Command
        {
        public:
-               AlarmStatus::AlarmStatus( int hba, AlarmCommand cmd );          
                                        
+               AlarmStatus( int hba, AlarmCommand cmd );                       
                                
                AlarmStatus( const AlarmStatus &new_AlarmStatus );
                virtual ~AlarmStatus();
                AlarmStatus     &operator = ( AlarmStatus &right );
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/forcest.hpp
+++ raidutils-0.0.4/raidutil/forcest.hpp
@@ -65,7 +65,7 @@
 class ForceState:public Command
        {
        public:
-               ForceState::ForceState(SCSI_Addr_List *deviceList, 
ForceStateOptions cmd);
+               ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
                ForceState(const ForceState &new_ForceState);
                virtual ~ForceState();
 
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/namarray.hpp
+++ raidutils-0.0.4/raidutil/namarray.hpp
@@ -58,7 +58,7 @@
 {
 
        public:
-               NameArray::NameArray(SCSI_Address arrayToName, char *arrayName);
+               NameArray(SCSI_Address arrayToName, char *arrayName);
                NameArray(const NameArray &new_NameArray);
                virtual ~NameArray();
 
only in patch2:
unchanged:
--- raidutils-0.0.4.orig/raidutil/expand.hpp
+++ raidutils-0.0.4/raidutil/expand.hpp
@@ -55,7 +55,7 @@
 class Expand:public Command
 {
    public:
-      Expand::Expand (SCSI_Address raid, SCSI_Addr_List *list);
+                Expand (SCSI_Address raid, SCSI_Addr_List *list);
                Expand (const Expand &new_Expand);
                virtual ~Expand();
                Expand &operator = (Expand &right);

-- 
Martin Michlmayr
http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to