diff -Nru rds-1.1.0/debian/changelog rds-1.1.0/debian/changelog --- rds-1.1.0/debian/changelog 2012-03-03 21:13:06.000000000 +0000 +++ rds-1.1.0/debian/changelog 2012-08-02 12:38:19.000000000 +0100 @@ -1,3 +1,13 @@ +rds (1.1.0-0ubuntu2) quantal; urgency=low + + * Switch Depends: to isc-dhcp-server following dhcp3-server to + isc-dhcp-server transition. + * Switch paths to follow new location of configuration files. + * debian/patches/gcc-4.7: a smattering of porting issues including + a peppering of unistd.h includes. + + -- Andy Whitcroft Thu, 02 Aug 2012 09:52:33 +0100 + rds (1.1.0-0ubuntu1) precise; urgency=low * Initial release (LP: #930422). diff -Nru rds-1.1.0/debian/patches/follow-isc-dhcp-server-transition-filename-changes rds-1.1.0/debian/patches/follow-isc-dhcp-server-transition-filename-changes --- rds-1.1.0/debian/patches/follow-isc-dhcp-server-transition-filename-changes 1970-01-01 01:00:00.000000000 +0100 +++ rds-1.1.0/debian/patches/follow-isc-dhcp-server-transition-filename-changes 2012-08-02 10:04:32.000000000 +0100 @@ -0,0 +1,79 @@ +Description: Follow filename changes in isc-dhcp-server transition. + As part of the dhcp3 to isc-dhcp transition the name of the /etc/default + file has changed. Update the source to reference the new file. +Author: Andy Whitcroft +Last-Update: 2012-08-02 +Index: rds-1.1.0/rds/rdsserver/rdsdhcpmanager.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsserver/rdsdhcpmanager.cpp 2012-02-14 15:30:50.000000000 +0000 ++++ rds-1.1.0/rds/rdsserver/rdsdhcpmanager.cpp 2012-08-02 10:00:50.309390424 +0100 +@@ -1261,10 +1261,10 @@ + + ReturnValue RdsDhcpManager::interfaces() + { +- QFile defaults("/etc/default/dhcp3-server"); ++ QFile defaults("/etc/default/isc-dhcp-server"); + if (!defaults.open(QFile::ReadOnly)) + { +- return(ReturnValue(1, "Failed to open /etc/default/dhcp3-server for reading")); ++ return(ReturnValue(1, "Failed to open /etc/default/isc-dhcp-server for reading")); + } + + QTextStream stream(&defaults); +@@ -1289,10 +1289,10 @@ + ReturnValue RdsDhcpManager::setInterfaces(QStringList interfaces) + { + QStringList lines; +- QFile defaults("/etc/default/dhcp3-server"); ++ QFile defaults("/etc/default/isc-dhcp-server"); + if (!defaults.open(QFile::ReadOnly)) + { +- return(ReturnValue(1, "Failed to open /etc/default/dhcp3-server for reading")); ++ return(ReturnValue(1, "Failed to open /etc/default/isc-dhcp-server for reading")); + } + + QTextStream stream(&defaults); +@@ -1322,7 +1322,7 @@ + + if (!defaults.open(QFile::WriteOnly | QFile::Truncate)) + { +- return(ReturnValue(1, "Failed to open /etc/default/dhcp3-server for writing")); ++ return(ReturnValue(1, "Failed to open /etc/default/isc-dhcp-server for writing")); + } + + foreach(line, lines) +@@ -1337,10 +1337,10 @@ + + ReturnValue RdsDhcpManager::enabled() + { +- QFile defaults("/etc/default/dhcp3-server"); ++ QFile defaults("/etc/default/isc-dhcp-server"); + if (!defaults.open(QFile::ReadOnly)) + { +- return(ReturnValue(1, "Failed to open /etc/default/dhcp3-server for reading")); ++ return(ReturnValue(1, "Failed to open /etc/default/isc-dhcp-server for reading")); + } + + QTextStream stream(&defaults); +@@ -1363,10 +1363,10 @@ + } + + QStringList lines; +- QFile defaults("/etc/default/dhcp3-server"); ++ QFile defaults("/etc/default/isc-dhcp-server"); + if (!defaults.open(QFile::ReadOnly)) + { +- return(ReturnValue(1, "Failed to open /etc/default/dhcp3-server for reading")); ++ return(ReturnValue(1, "Failed to open /etc/default/isc-dhcp-server for reading")); + } + + QTextStream stream(&defaults); +@@ -1396,7 +1396,7 @@ + + if (!defaults.open(QFile::WriteOnly | QFile::Truncate)) + { +- return(ReturnValue(1, "Failed to open /etc/default/dhcp3-server for writing")); ++ return(ReturnValue(1, "Failed to open /etc/default/isc-dhcp-server for writing")); + } + + foreach(line, lines) diff -Nru rds-1.1.0/debian/patches/gcc-4.7 rds-1.1.0/debian/patches/gcc-4.7 --- rds-1.1.0/debian/patches/gcc-4.7 1970-01-01 01:00:00.000000000 +0100 +++ rds-1.1.0/debian/patches/gcc-4.7 2012-08-02 11:48:26.000000000 +0100 @@ -0,0 +1,191 @@ +Description: updates for gcc-4.7 strictness + Updates for stricter handling in gcc-4.7: + . + - add a sprinkling of #include + - cast enumeration initialisers to avoid overloaded operator warnings +Author: Andy Whitcroft +Last-update: 2012-08-02 +Index: rds-1.1.0/rds/qtrpc2/serverprotocollistenerbase.cpp +=================================================================== +--- rds-1.1.0.orig/rds/qtrpc2/serverprotocollistenerbase.cpp 2012-02-08 22:30:26.000000000 +0000 ++++ rds-1.1.0/rds/qtrpc2/serverprotocollistenerbase.cpp 2012-08-02 10:40:24.545163645 +0100 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + namespace QtRpc + { +Index: rds-1.1.0/rds/shared/rdsutils.cpp +=================================================================== +--- rds-1.1.0.orig/rds/shared/rdsutils.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/shared/rdsutils.cpp 2012-08-02 10:43:16.710017354 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + ///@todo: serverize + #ifndef Q_OS_WIN32 +Index: rds-1.1.0/rds/rdsconsole/acemodel.h +=================================================================== +--- rds-1.1.0.orig/rds/rdsconsole/acemodel.h 2012-02-08 22:30:27.000000000 +0000 ++++ rds-1.1.0/rds/rdsconsole/acemodel.h 2012-08-02 10:56:41.302007108 +0100 +@@ -34,29 +34,29 @@ + enum Flag + { + None = 0, +- ReadData = RdsAce::CreateChild, +- ReadAttributes = RdsAce::ListObject, +- ReadExtendedAttributes = RdsAce::SelfWrite, +- ReadPermissions = RdsAce::ReadControl, ++ ReadData = (int)RdsAce::CreateChild, ++ ReadAttributes = (int)RdsAce::ListObject, ++ ReadExtendedAttributes = (int)RdsAce::SelfWrite, ++ ReadPermissions = (int)RdsAce::ReadControl, + Read = ReadData | ReadAttributes | ReadExtendedAttributes | ReadPermissions, +- CreateFile = RdsAce::DeleteChild, +- CreateFolder = RdsAce::ListChildren, +- WriteAttributes = RdsAce::ControlAccess, +- WriteExtendedAttributes = RdsAce::ReadProperty, +- Delete = RdsAce::Delete, ++ CreateFile = (int)RdsAce::DeleteChild, ++ CreateFolder = (int)RdsAce::ListChildren, ++ WriteAttributes = (int)RdsAce::ControlAccess, ++ WriteExtendedAttributes = (int)RdsAce::ReadProperty, ++ Delete = (int)RdsAce::Delete, + Write = CreateFile | CreateFolder | WriteAttributes | WriteExtendedAttributes, +- DeleteTree = RdsAce::DeleteTree, +- TakeOwnership = RdsAce::WriteOwner, +- ChangePermissions = RdsAce::WriteDac, ++ DeleteTree = (int)RdsAce::DeleteTree, ++ TakeOwnership = (int)RdsAce::WriteOwner, ++ ChangePermissions = (int)RdsAce::WriteDac, + Special = 1 << 26, + List = (int)RdsAce::WriteProperty, + ReadAndExec = Read | List | 1 << 25, + Modify = List | Read | Write | Delete, + FullControl = Modify | DeleteTree | TakeOwnership | ChangePermissions, +- FileInherit = RdsAce::FileInherit << 27, +- FolderInherit = RdsAce::FolderInherit << 27, +- InheritOnly = RdsAce::InheritOnly << 27, +- NoPropogate = RdsAce::NoPropogate << 27, ++ FileInherit = (int)RdsAce::FileInherit << 27, ++ FolderInherit = (int)RdsAce::FolderInherit << 27, ++ InheritOnly = (int)RdsAce::InheritOnly << 27, ++ NoPropogate = (int)RdsAce::NoPropogate << 27, + InheritFlags = FileInherit | FolderInherit | InheritOnly | NoPropogate, + }; + Q_DECLARE_FLAGS(Flags, Flag); +Index: rds-1.1.0/rds/rdsldap/rdsldapsession.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsldap/rdsldapsession.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/rdsldap/rdsldapsession.cpp 2012-08-02 10:57:41.958307886 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include "lutil_ldap.h" + #include + #include "rdsldapactions_p.h" +Index: rds-1.1.0/rds/rdsserver/rdssharemanager.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsserver/rdssharemanager.cpp 2012-02-15 15:01:50.000000000 +0000 ++++ rds-1.1.0/rds/rdsserver/rdssharemanager.cpp 2012-08-02 11:19:34.064814270 +0100 +@@ -39,6 +39,8 @@ + #include + #include + ++#include ++ + QMutex RdsShareManagerPrivate::volmutex; + RdsVolumeManager *RdsShareManagerPrivate::volmgr = NULL; + QHash RdsShareManagerPrivate::volumepaths; +Index: rds-1.1.0/rds/rdsserver/rdsstoragedevice.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsserver/rdsstoragedevice.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/rdsserver/rdsstoragedevice.cpp 2012-08-02 11:08:26.709505044 +0100 +@@ -32,6 +32,7 @@ + #include + #include + ++#include + #include + #include + #include +Index: rds-1.1.0/rds/rdsserver/rdsvolume.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsserver/rdsvolume.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/rdsserver/rdsvolume.cpp 2012-08-02 11:13:15.646937802 +0100 +@@ -33,6 +33,7 @@ + #include "RdsUtils" + #include "rdssinglevolume_p.h" + ++#include + #include + #include + #include +Index: rds-1.1.0/rds/rdsserver/rdsschedulemanager.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsserver/rdsschedulemanager.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/rdsserver/rdsschedulemanager.cpp 2012-08-02 11:18:47.600583864 +0100 +@@ -23,6 +23,8 @@ + #include + #include + ++#include ++ + QTRPC_SERVICEPROXY_PIMPL_IMPLEMENT(RdsScheduleManager); + + RdsScheduler& RdsScheduleManagerPrivate::scheduler() +Index: rds-1.1.0/rds/rdsd/main.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsd/main.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/rdsd/main.cpp 2012-08-02 11:25:35.934608682 +0100 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + #include + #include + #include "rdsdaemon.h" +Index: rds-1.1.0/rds/rdsd/rdsprovisionator.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsd/rdsprovisionator.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/rdsd/rdsprovisionator.cpp 2012-08-02 11:38:02.886312623 +0100 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include "rdsnetmonitorthread.h" + #include "logmanager.h" + #include "rdsprovisionthread.h" +Index: rds-1.1.0/rds/rdsd/rdsservice.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsd/rdsservice.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/rdsd/rdsservice.cpp 2012-08-02 11:32:22.448624480 +0100 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include "rdsprovisionator.h" + #include "rdssambaldapsession.h" + #include "logmanager.h" +Index: rds-1.1.0/rds/rdsprovision/main.cpp +=================================================================== +--- rds-1.1.0.orig/rds/rdsprovision/main.cpp 2012-02-08 22:30:28.000000000 +0000 ++++ rds-1.1.0/rds/rdsprovision/main.cpp 2012-08-02 11:48:02.093283947 +0100 +@@ -32,6 +32,7 @@ + + #include "qxtcommandoptions.h" + #include "rdsprovisionator.h" ++#include + #include + + #define CHECK_ERR if(ret.isError()) \ diff -Nru rds-1.1.0/debian/patches/series rds-1.1.0/debian/patches/series --- rds-1.1.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ rds-1.1.0/debian/patches/series 2012-08-02 10:32:34.000000000 +0100 @@ -0,0 +1,2 @@ +follow-isc-dhcp-server-transition-filename-changes +gcc-4.7