Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 100 insertions, 0 deletions

diff --git a/kppp/Rules/Macedonia/Macedonia_GenericISP_interurban.rst b/kppp/Rules/Macedonia/Macedonia_GenericISP_interurban.rst
new file mode 100644
index 00000000..17ce3306
--- /dev/null
+++ b/kppp/Rules/Macedonia/Macedonia_GenericISP_interurban.rst
@@ -0,0 +1,30 @@
+##########################################################
+# kppp ruleset for all Macedonian ISPs (except MTnet)
+# This ruleset is for interurban connections 
+# For the latest prices, call the phone number 971
+# 
+# Created on 4-Jun-2001
+# Last modified on 1-Jul-2004
+#
+# Darko Spasovski, [email protected]
+# Georgi Stanojevski, [email protected]
+##########################################################
+
+name=Macedonia_GenericISP_interurban
+
+currency_symbol=DEN
+currency_position=right
+currency_digits=2
+
+per_connection=0.0
+minimum_costs=0.0
+default=(1.00, 20)
+
+#############################################################
+# 06:00-17:59 3.00 den. za 1 minuta (1 den za 20 sekundi)
+# 18:00-05:59 1.50 den. za 1 minuta (.05 den za 20 sekundi)
+# Vo cenite ne e presmetan DDV (+18%)
+#############################################################
+
+on () between (6:00..17:59) use (1.00,20)
+on () between (18:00..5:59) use (0.50,20)
diff --git a/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst b/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst
new file mode 100644
index 00000000..aa0f3005
--- /dev/null
+++ b/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst
@@ -0,0 +1,30 @@
+##########################################################
+# kppp ruleset for all Macedonian ISPs (except MTnet)
+# This ruleset is for local connections
+# For the latest prices, call the phone number 971
+# 
+# Created on 4-Jun-2001
+# Last modified on 1-Jul-2004
+#
+# Darko Spasovski, [email protected]
+# Georgi Stanojevski, [email protected]
+##########################################################
+
+name=Macedonia_GenericISP_local
+
+currency_symbol=DEN
+currency_position=right
+currency_digits=2
+
+per_connection=0.0
+minimum_costs=0.0
+default=(0.33, 20)
+
+#############################################################
+# 06:00-17:59 1 den. za 1 minuta (0,33 na 20 sekundi)
+# 18:00-05:59 0,6 den. za 1 minuta (0,2 na 20 sekundi)
+# Vo cenite ne e presmetan DDV (+18%)
+#############################################################
+
+on () between (6:00..17:59) use (0.33,20)
+on () between (18:00..5:59) use (0.20,20)
diff --git a/kppp/Rules/Macedonia/Macedonia_MTnet.rst b/kppp/Rules/Macedonia/Macedonia_MTnet.rst
new file mode 100644
index 00000000..dc2e8217
--- /dev/null
+++ b/kppp/Rules/Macedonia/Macedonia_MTnet.rst
@@ -0,0 +1,33 @@
+##########################################################
+# kppp ruleset for MTnet, local Macedonian ISP
+# See www.mt.net.mk for price updates
+# 
+# Last updated on 4-Jun-2001
+#
+# Darko Spasovski, [email protected]
+##########################################################
+
+name=Macedonia_MTnet
+
+currency_symbol=DEN
+currency_position=right
+currency_digits=2
+
+per_connection=0.0
+minimum_costs=0.0
+default=(1.60, 60)
+
+#############################################################
+# 06:00-17:59 od ponedelnik do petok, 1.60 den. za minuta
+# 18:00-23:59 od ponedelnik do petok, 0.80 den. za minuta
+# 06:00-23:59 vikend i praznici, 0.80 den. za minuta
+#             (za praznici se smetaat samo 1.01 i 2.05)
+# 00:00-05:59 sekoj den vo nedelata, 0.35 den. za minuta
+# Vo cenite ne e presmetan DDV (+18%)
+#############################################################
+
+on (monday..friday) between (6:00..17:59) use (1.60,60)
+on (monday..friday) between (18:00..23:59) use (0.80,60)
+on (saturday..sunday) between (6:00..23:59) use (0.80,60)
+on (01/01, 05/02) between (6:00..23:59) use (0.80,60)
+on () between (0:00..5:59) use (0.35,60)
diff --git a/kppp/Rules/Macedonia/Makefile.am b/kppp/Rules/Macedonia/Makefile.am
new file mode 100644
index 00000000..68515e48
--- /dev/null
+++ b/kppp/Rules/Macedonia/Makefile.am
@@ -0,0 +1,7 @@
+emo_DATA = Macedonia_GenericISP_interurban.rst \
+	Macedonia_GenericISP_local.rst \
+	Macedonia_MTnet.rst
+
+emodir = $(kde_datadir)/kppp/Rules/Macedonia
+
+EXTRA_DIST = $(emo_DATA)