Author: glen Date: Sun Oct 15 12:57:16 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge with AC-branch
---- Files affected:
SPECS:
kdepim.spec (1.242 -> 1.243)
---- Diffs:
================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.242 SPECS/kdepim.spec:1.243
--- SPECS/kdepim.spec:1.242 Tue Oct 10 17:15:43 2006
+++ SPECS/kdepim.spec Sun Oct 15 14:57:09 2006
@@ -18,7 +18,7 @@
Summary(uk): đĹŇÓĎÎÁĚŘÎŮĘ ĐĚÁÎŐ×ÁĚŘÎÉË (PIM) ÄĚŃ KDE
Name: kdepim
Version: 3.5.5
-Release: 0.1
+Release: 0.5
Epoch: 9
License: GPL
Group: X11/Applications
@@ -65,7 +65,6 @@
Obsoletes: kdeaddons-kontact
Obsoletes: kdepim-kontact
Obsoletes: kdepim-korganizer
-Obsoletes: kdepim-korganizer-libs
Obsoletes: kdepim-kresources
Obsoletes: kdepim-ksync
#Obsoletes: kdepim-libkcal
@@ -778,6 +777,7 @@
%{_datadir}/apps/korgac
%{_datadir}/apps/korganizer
%{_datadir}/apps/ksync
+%{_datadir}/apps/kdepim
%{_datadir}/apps/multisynk
%{_datadir}/autostart/korgac.desktop
%{_datadir}/config.kcfg/akregator.kcfg
@@ -840,6 +840,7 @@
%{_desktopdir}/kde/korganizer.desktop
%{_desktopdir}/kde/multisynk.desktop
%{_desktopdir}/kde/groupwarewizard.desktop
+%{_desktopdir}/kde/korganizer-import.desktop
%{_iconsdir}/*/*/apps/akregator*
%{_iconsdir}/*/*/*/korganizer*.png
%{_iconsdir}/*/*/apps/multisynk.png
@@ -1346,6 +1347,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.243 2006/10/15 12:57:09 glen
+- merge with AC-branch
+
Revision 1.242 2006/10/10 15:15:43 arekm
- reenable branch diff (it already contains fixes)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.242&r2=1.243&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
