Moving sat-repo to official libzypp-repo; PART 2

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 6fc941a..7d4e38b 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -77,6 +77,7 @@ SET( zypp_SRCS
   ZYppCommitPolicy.cc
   ZYppCommitResult.cc
   ZYppFactory.cc
+  Repo.cc
 )
 SET( zypp_EARLY_SRCS
   ZConfig.cc
@@ -180,6 +181,7 @@ SET( zypp_HEADERS
   ZYppCommitResult.h
   ZYppFactory.h
   ZYpp.h
+  Repo.h
 )
 
 INSTALL(  FILES ${zypp_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/zypp" )
@@ -512,7 +514,6 @@ INSTALL(  FILES
 
 SET( zypp_sat_SRCS
   sat/Pool.cc
-  sat/Repo.cc
   sat/Solvable.cc
   sat/WhatProvides.cc
   sat/SATResolver.cc
@@ -521,7 +522,6 @@ SET( zypp_sat_SRCS
 
 SET( zypp_sat_HEADERS
   sat/Pool.h
-  sat/Repo.h
   sat/Solvable.h
   sat/WhatProvides.h
   sat/SATResolver.h

diff --git a/zypp/Capability.h b/zypp/Capability.h
index 36bdc90..e10a29b 100644 (file)
--- a/zypp/Capability.h
+++ b/zypp/Capability.h
@@ -6,11 +6,11 @@
 |                         /_____||_| |_| |_|                           |
 |                                                                      |
 \---------------------------------------------------------------------*/
-/** \file      zypp/sat/Capability.h
+/** \file      zypp/Capability.h
  *
 */
-#ifndef ZYPP_SAT_CAPABILITY_H
-#define ZYPP_SAT_CAPABILITY_H
+#ifndef ZYPP_CAPABILITY_H
+#define ZYPP_CAPABILITY_H
 
 #include <iosfwd>
 #include <tr1/unordered_set>
@@ -305,4 +305,4 @@ namespace zypp
 
 ZYPP_DEFINE_ID_HASHABLE( ::zypp::Capability )
 
-#endif // ZYPP_SAT_CAPABILITY_H
+#endif // ZYPP_CAPABILITY_H

diff --git a/zypp/sat/Repo.cc b/zypp/Repo.cc
similarity index 99%
rename from zypp/sat/Repo.cc
rename to zypp/Repo.cc
index 92fcc50..7ee8642 100644 (file)
--- a/zypp/sat/Repo.cc
+++ b/zypp/Repo.cc
@@ -19,7 +19,7 @@
 #include "zypp/Pathname.h"
 
 #include "zypp/sat/detail/PoolImpl.h"
-#include "zypp/sat/Repo.h"
+#include "zypp/Repo.h"
 #include "zypp/sat/Pool.h"
 
 using std::endl;

diff --git a/zypp/sat/Repo.h b/zypp/Repo.h
similarity index 99%
rename from zypp/sat/Repo.h
rename to zypp/Repo.h
index 0517915..b202ae9 100644 (file)
--- a/zypp/sat/Repo.h
+++ b/zypp/Repo.h
@@ -6,7 +6,7 @@
 |                         /_____||_| |_| |_|                           |
 |                                                                      |
 \---------------------------------------------------------------------*/
-/** \file      zypp/sat/Repo.h
+/** \file      zypp/Repo.h
  *
 */
 #ifndef ZYPP_SAT_REPO_H

diff --git a/zypp/ResObject.cc b/zypp/ResObject.cc
index af22b61..f760d9d 100644 (file)
--- a/zypp/ResObject.cc
+++ b/zypp/ResObject.cc
@@ -15,7 +15,7 @@
 #include "zypp/Repository.h"
 #include "zypp/sat/SolvAttr.h"
 #include "zypp/sat/Solvable.h"
-#include "zypp/sat/Repo.h"
+#include "zypp/Repo.h"
 
 using namespace zypp;
 using namespace std;

diff --git a/zypp/pool/PoolImpl.cc b/zypp/pool/PoolImpl.cc
index 7224ef2..61a9a29 100644 (file)
--- a/zypp/pool/PoolImpl.cc
+++ b/zypp/pool/PoolImpl.cc
@@ -17,7 +17,7 @@
 #include "zypp/VendorAttr.h"
 
 #include "zypp/sat/Pool.h"
-#include "zypp/sat/Repo.h"
+#include "zypp/Repo.h"
 
 using std::endl;
 

diff --git a/zypp/sat/Pool.h b/zypp/sat/Pool.h
index f6c0ad9..141ef07 100644 (file)
--- a/zypp/sat/Pool.h
+++ b/zypp/sat/Pool.h
@@ -17,7 +17,7 @@
 #include "zypp/Pathname.h"
 
 #include "zypp/sat/detail/PoolMember.h"
-#include "zypp/sat/Repo.h"
+#include "zypp/Repo.h"
 #include "zypp/sat/WhatProvides.h"
 
 ///////////////////////////////////////////////////////////////////

diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc
index 2e4398c..b48edef 100644 (file)
--- a/zypp/sat/Solvable.cc
+++ b/zypp/sat/Solvable.cc
@@ -19,7 +19,7 @@
 
 #include "zypp/sat/detail/PoolImpl.h"
 #include "zypp/sat/Solvable.h"
-#include "zypp/sat/Repo.h"
+#include "zypp/Repo.h"
 
 using std::endl;
 

diff --git a/zypp/solver/detail/Testcase.h b/zypp/solver/detail/Testcase.h
index b9a982a..4949cf0 100644 (file)
--- a/zypp/solver/detail/Testcase.h
+++ b/zypp/solver/detail/Testcase.h
@@ -22,7 +22,7 @@
 #include "zypp/Capabilities.h"
 #include "zypp/ResPool.h"
 #include "zypp/base/GzStream.h"
-#include "zypp/sat/Repo.h"
+#include "zypp/Repo.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 4f0136a..1fb88dc 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -29,6 +29,7 @@
 #include "zypp/TmpPath.h"
 #include "zypp/RepoStatus.h"
 #include "zypp/ExternalProgram.h"
+#include "zypp/Repo.h"
 
 #include "zypp/CapMatchHelper.h"
 #include "zypp/ResFilters.h"
@@ -47,7 +48,6 @@
 #include "zypp/repo/SrcPackageProvider.h"
 
 #include "zypp/sat/Pool.h"
-#include "zypp/sat/Repo.h"
 
 using namespace std;
 using namespace zypp;