'[kdepimlibs/akregator_port] /: fix'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepimlibs/akregator_port] /: fix
From:       Frank Osterfeld <osterfeld () kde ! org>
Date:       2012-03-31 15:16:24
Message-ID: 20120331151624.B90DCA6133 () git ! kde ! org
[Download RAW message or body]

Git commit d790bc1cfd7738804f3bf21b4590a087dd447b43 by Frank Osterfeld.
Committed on 31/03/2012 at 13:08.
Pushed by osterfeld into branch 'akregator_port'.

fix

M  +0    -1    CMakeLists.txt
M  +1    -0    akonadi/CMakeLists.txt
R  +2    -3    akonadi/krss/CMakeLists.txt [from: krss/CMakeLists.txt - 087=
% similarity]
R  +0    -0    akonadi/krss/Messages.sh [from: krss/Messages.sh - 100% simi=
larity]
R  +0    -0    akonadi/krss/attributegen.rb [from: krss/attributegen.rb - 1=
00% similarity]
R  +0    -0    akonadi/krss/category.cpp [from: krss/category.cpp - 100% si=
milarity]
R  +0    -0    akonadi/krss/category.h [from: krss/category.h - 100% simila=
rity]
R  +0    -0    akonadi/krss/enclosure.cpp [from: krss/enclosure.cpp - 100% =
similarity]
R  +0    -0    akonadi/krss/enclosure.h [from: krss/enclosure.h - 100% simi=
larity]
R  +0    -0    akonadi/krss/feedcollection.cpp [from: krss/feedcollection.c=
pp - 100% similarity]
R  +0    -0    akonadi/krss/feedcollection.h [from: krss/feedcollection.h -=
 100% similarity]
R  +0    -0    akonadi/krss/feeditemmodel.cpp [from: krss/feeditemmodel.cpp=
 - 100% similarity]
R  +0    -0    akonadi/krss/feeditemmodel.h [from: krss/feeditemmodel.h - 1=
00% similarity]
R  +0    -0    akonadi/krss/feedpropertiescollectionattribute.cpp [from: kr=
ss/feedpropertiescollectionattribute.cpp - 100% similarity]
R  +0    -0    akonadi/krss/feedpropertiescollectionattribute.h [from: krss=
/feedpropertiescollectionattribute.h - 100% similarity]
R  +0    -0    akonadi/krss/helper.cpp [from: krss/helper.cpp - 100% simila=
rity]
R  +0    -0    akonadi/krss/helper_p.h [from: krss/helper_p.h - 100% simila=
rity]
R  +0    -0    akonadi/krss/item.cpp [from: krss/item.cpp - 100% similarity]
R  +0    -0    akonadi/krss/item.h [from: krss/item.h - 100% similarity]
R  +0    -0    akonadi/krss/item_p.h [from: krss/item_p.h - 100% similarity]
R  +0    -0    akonadi/krss/krss_export.h [from: krss/krss_export.h - 100% =
similarity]
R  +0    -0    akonadi/krss/person.cpp [from: krss/person.cpp - 100% simila=
rity]
R  +0    -0    akonadi/krss/person.h [from: krss/person.h - 100% similarity]
R  +0    -0    akonadi/krss/rssitem.cpp [from: krss/rssitem.cpp - 100% simi=
larity]
R  +0    -0    akonadi/krss/rssitem.h [from: krss/rssitem.h - 100% similari=
ty]
R  +0    -0    akonadi/krss/tests/CMakeLists.txt [from: krss/tests/CMakeLis=
ts.txt - 100% similarity]
R  +0    -0    akonadi/krss/tests/feedcollectiontest.cpp [from: krss/tests/=
feedcollectiontest.cpp - 100% similarity]
R  +0    -0    akonadi/krss/tests/feedcollectiontest.h [from: krss/tests/fe=
edcollectiontest.h - 100% similarity]
R  +0    -0    akonadi/krss/tests/itemimporter.cpp [from: krss/tests/itemim=
porter.cpp - 100% similarity]
R  +0    -0    akonadi/krss/tests/tagprovidertest.cpp [from: krss/tests/tag=
providertest.cpp - 100% similarity]
R  +0    -0    akonadi/krss/tests/tagprovidertest.h [from: krss/tests/tagpr=
ovidertest.h - 100% similarity]
R  +0    -0    akonadi/krss/tests/testcategory.cpp [from: krss/tests/testca=
tegory.cpp - 100% similarity]
R  +0    -0    akonadi/krss/tests/testcategory.h [from: krss/tests/testcate=
gory.h - 100% similarity]
R  +0    -0    akonadi/krss/tests/testenclosure.cpp [from: krss/tests/teste=
nclosure.cpp - 100% similarity]
R  +0    -0    akonadi/krss/tests/testenclosure.h [from: krss/tests/testenc=
losure.h - 100% similarity]
R  +0    -0    akonadi/krss/tests/testhelper.cpp [from: krss/tests/testhelp=
er.cpp - 100% similarity]
R  +0    -0    akonadi/krss/tests/testhelper.h [from: krss/tests/testhelper=
.h - 100% similarity]
R  +0    -0    akonadi/krss/tests/testitem.cpp [from: krss/tests/testitem.c=
pp - 100% similarity]
R  +0    -0    akonadi/krss/tests/testitem.h [from: krss/tests/testitem.h -=
 100% similarity]
R  +0    -0    akonadi/krss/tests/testperson.cpp [from: krss/tests/testpers=
on.cpp - 100% similarity]
R  +0    -0    akonadi/krss/tests/testperson.h [from: krss/tests/testperson=
.h - 100% similarity]
R  +0    -0    akonadi/krss/tests/unittestenv/config.xml [from: krss/tests/=
unittestenv/config.xml - 100% similarity]
R  +0    -0    akonadi/krss/tests/unittestenv/kdehome/broken.opml [from: kr=
ss/tests/unittestenv/kdehome/broken.opml - 100% similarity]
R  +0    -0    akonadi/krss/tests/unittestenv/kdehome/good.opml [from: krss=
/tests/unittestenv/kdehome/good.opml - 100% similarity]
R  +0    -0    akonadi/krss/tests/unittestenv/kdehome/original.opml [from: =
krss/tests/unittestenv/kdehome/original.opml - 100% similarity]
R  +0    -0    akonadi/krss/tests/unittestenv/kdehome/planetkde_org_rss20.x=
ml [from: krss/tests/unittestenv/kdehome/planetkde_org_rss20.xml - 100% sim=
ilarity]
R  +0    -0    akonadi/krss/tests/unittestenv/kdehome/share/config/akonadi_=
opml_rss_resource_0rc [from: krss/tests/unittestenv/kdehome/share/config/ak=
onadi_opml_rss_resource_0rc - 100% similarity]

http://commits.kde.org/kdepimlibs/d790bc1cfd7738804f3bf21b4590a087dd447b43

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38bbd93..69c3509 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,6 @@ if (NOT KDEPIM_ONLY_KLEO)
   if (NOT KDEPIM_NO_KRESOURCES)
     add_subdirectory(kresources)
   endif()
-  add_subdirectory(krss)
   add_subdirectory(ktnef)
   add_subdirectory(kxmlrpcclient)
   add_subdirectory(mailtransport)
diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
index 2f0a11b..b0ebc16 100644
--- a/akonadi/CMakeLists.txt
+++ b/akonadi/CMakeLists.txt
@@ -23,6 +23,7 @@ configure_file(kdepimlibs-version.h.cmake ${CMAKE_CURRENT=
_BINARY_DIR}/kdepimlibs
 add_subdirectory( kabc )
 add_subdirectory( kcal )
 add_subdirectory( kmime )
+add_subdirectory( krss )
 add_subdirectory( contact )
 add_subdirectory( calendar )
 add_subdirectory( notes )
diff --git a/krss/CMakeLists.txt b/akonadi/krss/CMakeLists.txt
similarity index 87%
rename from krss/CMakeLists.txt
rename to akonadi/krss/CMakeLists.txt
index e350c0d..409854b 100644
--- a/krss/CMakeLists.txt
+++ b/akonadi/krss/CMakeLists.txt
@@ -26,12 +26,11 @@ set(krss_LIB_HDRS
 kde4_add_library(krss ${LIBRARY_TYPE} ${krss_LIB_SRCS})
 =

 target_link_libraries(krss
+                      akonadi-kde
+                      syndication
                       ${KDE4_KDECORE_LIBS}
                       ${KDE4_KDEUI_LIBS}
                       ${KDE4_KIO_LIBS}
-                      ${KDEPIMLIBS_AKONADI_LIBS}
-                      ${KDEPIMLIBS_SYNDICATION_LIBS}
-                      ${KRSS_EXTRA_LIBS}
 )
 =

 set_target_properties(krss PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVER=
SION ${GENERIC_LIB_SOVERSION} )
diff --git a/krss/Messages.sh b/akonadi/krss/Messages.sh
similarity index 100%
rename from krss/Messages.sh
rename to akonadi/krss/Messages.sh
diff --git a/krss/attributegen.rb b/akonadi/krss/attributegen.rb
similarity index 100%
rename from krss/attributegen.rb
rename to akonadi/krss/attributegen.rb
diff --git a/krss/category.cpp b/akonadi/krss/category.cpp
similarity index 100%
rename from krss/category.cpp
rename to akonadi/krss/category.cpp
diff --git a/krss/category.h b/akonadi/krss/category.h
similarity index 100%
rename from krss/category.h
rename to akonadi/krss/category.h
diff --git a/krss/enclosure.cpp b/akonadi/krss/enclosure.cpp
similarity index 100%
rename from krss/enclosure.cpp
rename to akonadi/krss/enclosure.cpp
diff --git a/krss/enclosure.h b/akonadi/krss/enclosure.h
similarity index 100%
rename from krss/enclosure.h
rename to akonadi/krss/enclosure.h
diff --git a/krss/feedcollection.cpp b/akonadi/krss/feedcollection.cpp
similarity index 100%
rename from krss/feedcollection.cpp
rename to akonadi/krss/feedcollection.cpp
diff --git a/krss/feedcollection.h b/akonadi/krss/feedcollection.h
similarity index 100%
rename from krss/feedcollection.h
rename to akonadi/krss/feedcollection.h
diff --git a/krss/feeditemmodel.cpp b/akonadi/krss/feeditemmodel.cpp
similarity index 100%
rename from krss/feeditemmodel.cpp
rename to akonadi/krss/feeditemmodel.cpp
diff --git a/krss/feeditemmodel.h b/akonadi/krss/feeditemmodel.h
similarity index 100%
rename from krss/feeditemmodel.h
rename to akonadi/krss/feeditemmodel.h
diff --git a/krss/feedpropertiescollectionattribute.cpp b/akonadi/krss/feed=
propertiescollectionattribute.cpp
similarity index 100%
rename from krss/feedpropertiescollectionattribute.cpp
rename to akonadi/krss/feedpropertiescollectionattribute.cpp
diff --git a/krss/feedpropertiescollectionattribute.h b/akonadi/krss/feedpr=
opertiescollectionattribute.h
similarity index 100%
rename from krss/feedpropertiescollectionattribute.h
rename to akonadi/krss/feedpropertiescollectionattribute.h
diff --git a/krss/helper.cpp b/akonadi/krss/helper.cpp
similarity index 100%
rename from krss/helper.cpp
rename to akonadi/krss/helper.cpp
diff --git a/krss/helper_p.h b/akonadi/krss/helper_p.h
similarity index 100%
rename from krss/helper_p.h
rename to akonadi/krss/helper_p.h
diff --git a/krss/item.cpp b/akonadi/krss/item.cpp
similarity index 100%
rename from krss/item.cpp
rename to akonadi/krss/item.cpp
diff --git a/krss/item.h b/akonadi/krss/item.h
similarity index 100%
rename from krss/item.h
rename to akonadi/krss/item.h
diff --git a/krss/item_p.h b/akonadi/krss/item_p.h
similarity index 100%
rename from krss/item_p.h
rename to akonadi/krss/item_p.h
diff --git a/krss/krss_export.h b/akonadi/krss/krss_export.h
similarity index 100%
rename from krss/krss_export.h
rename to akonadi/krss/krss_export.h
diff --git a/krss/person.cpp b/akonadi/krss/person.cpp
similarity index 100%
rename from krss/person.cpp
rename to akonadi/krss/person.cpp
diff --git a/krss/person.h b/akonadi/krss/person.h
similarity index 100%
rename from krss/person.h
rename to akonadi/krss/person.h
diff --git a/krss/rssitem.cpp b/akonadi/krss/rssitem.cpp
similarity index 100%
rename from krss/rssitem.cpp
rename to akonadi/krss/rssitem.cpp
diff --git a/krss/rssitem.h b/akonadi/krss/rssitem.h
similarity index 100%
rename from krss/rssitem.h
rename to akonadi/krss/rssitem.h
diff --git a/krss/tests/CMakeLists.txt b/akonadi/krss/tests/CMakeLists.txt
similarity index 100%
rename from krss/tests/CMakeLists.txt
rename to akonadi/krss/tests/CMakeLists.txt
diff --git a/krss/tests/feedcollectiontest.cpp b/akonadi/krss/tests/feedcol=
lectiontest.cpp
similarity index 100%
rename from krss/tests/feedcollectiontest.cpp
rename to akonadi/krss/tests/feedcollectiontest.cpp
diff --git a/krss/tests/feedcollectiontest.h b/akonadi/krss/tests/feedcolle=
ctiontest.h
similarity index 100%
rename from krss/tests/feedcollectiontest.h
rename to akonadi/krss/tests/feedcollectiontest.h
diff --git a/krss/tests/itemimporter.cpp b/akonadi/krss/tests/itemimporter.=
cpp
similarity index 100%
rename from krss/tests/itemimporter.cpp
rename to akonadi/krss/tests/itemimporter.cpp
diff --git a/krss/tests/tagprovidertest.cpp b/akonadi/krss/tests/tagprovide=
rtest.cpp
similarity index 100%
rename from krss/tests/tagprovidertest.cpp
rename to akonadi/krss/tests/tagprovidertest.cpp
diff --git a/krss/tests/tagprovidertest.h b/akonadi/krss/tests/tagprovidert=
est.h
similarity index 100%
rename from krss/tests/tagprovidertest.h
rename to akonadi/krss/tests/tagprovidertest.h
diff --git a/krss/tests/testcategory.cpp b/akonadi/krss/tests/testcategory.=
cpp
similarity index 100%
rename from krss/tests/testcategory.cpp
rename to akonadi/krss/tests/testcategory.cpp
diff --git a/krss/tests/testcategory.h b/akonadi/krss/tests/testcategory.h
similarity index 100%
rename from krss/tests/testcategory.h
rename to akonadi/krss/tests/testcategory.h
diff --git a/krss/tests/testenclosure.cpp b/akonadi/krss/tests/testenclosur=
e.cpp
similarity index 100%
rename from krss/tests/testenclosure.cpp
rename to akonadi/krss/tests/testenclosure.cpp
diff --git a/krss/tests/testenclosure.h b/akonadi/krss/tests/testenclosure.h
similarity index 100%
rename from krss/tests/testenclosure.h
rename to akonadi/krss/tests/testenclosure.h
diff --git a/krss/tests/testhelper.cpp b/akonadi/krss/tests/testhelper.cpp
similarity index 100%
rename from krss/tests/testhelper.cpp
rename to akonadi/krss/tests/testhelper.cpp
diff --git a/krss/tests/testhelper.h b/akonadi/krss/tests/testhelper.h
similarity index 100%
rename from krss/tests/testhelper.h
rename to akonadi/krss/tests/testhelper.h
diff --git a/krss/tests/testitem.cpp b/akonadi/krss/tests/testitem.cpp
similarity index 100%
rename from krss/tests/testitem.cpp
rename to akonadi/krss/tests/testitem.cpp
diff --git a/krss/tests/testitem.h b/akonadi/krss/tests/testitem.h
similarity index 100%
rename from krss/tests/testitem.h
rename to akonadi/krss/tests/testitem.h
diff --git a/krss/tests/testperson.cpp b/akonadi/krss/tests/testperson.cpp
similarity index 100%
rename from krss/tests/testperson.cpp
rename to akonadi/krss/tests/testperson.cpp
diff --git a/krss/tests/testperson.h b/akonadi/krss/tests/testperson.h
similarity index 100%
rename from krss/tests/testperson.h
rename to akonadi/krss/tests/testperson.h
diff --git a/krss/tests/unittestenv/config.xml b/akonadi/krss/tests/unittes=
tenv/config.xml
similarity index 100%
rename from krss/tests/unittestenv/config.xml
rename to akonadi/krss/tests/unittestenv/config.xml
diff --git a/krss/tests/unittestenv/kdehome/broken.opml b/akonadi/krss/test=
s/unittestenv/kdehome/broken.opml
similarity index 100%
rename from krss/tests/unittestenv/kdehome/broken.opml
rename to akonadi/krss/tests/unittestenv/kdehome/broken.opml
diff --git a/krss/tests/unittestenv/kdehome/good.opml b/akonadi/krss/tests/=
unittestenv/kdehome/good.opml
similarity index 100%
rename from krss/tests/unittestenv/kdehome/good.opml
rename to akonadi/krss/tests/unittestenv/kdehome/good.opml
diff --git a/krss/tests/unittestenv/kdehome/original.opml b/akonadi/krss/te=
sts/unittestenv/kdehome/original.opml
similarity index 100%
rename from krss/tests/unittestenv/kdehome/original.opml
rename to akonadi/krss/tests/unittestenv/kdehome/original.opml
diff --git a/krss/tests/unittestenv/kdehome/planetkde_org_rss20.xml b/akona=
di/krss/tests/unittestenv/kdehome/planetkde_org_rss20.xml
similarity index 100%
rename from krss/tests/unittestenv/kdehome/planetkde_org_rss20.xml
rename to akonadi/krss/tests/unittestenv/kdehome/planetkde_org_rss20.xml
diff --git a/krss/tests/unittestenv/kdehome/share/config/akonadi_opml_rss_r=
esource_0rc b/akonadi/krss/tests/unittestenv/kdehome/share/config/akonadi_o=
pml_rss_resource_0rc
similarity index 100%
rename from krss/tests/unittestenv/kdehome/share/config/akonadi_opml_rss_re=
source_0rc
rename to akonadi/krss/tests/unittestenv/kdehome/share/config/akonadi_opml_=
rss_resource_0rc

[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic