On Sat, 1 Feb 2020 16:46:11 +0100
Rafael Sadowski wrote:
> Another Qt4 to Qt5 update. Builds without patches and starts fine on
> amd64. That's all.
>
> OK?
I've built and ran it on powerpc and amd64, tried some examples, and
was able to produce HTML timetables successfully.
On powerpc, it complains about atomic no being in WANTLIB, but the
package signature has gcc-libs in it, so it's not strictly needed to
add the typical atomic block.
HOMEPAGE should be moved to https (i've fetched the distfile without
issues), OK cwen@ with that changed.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/productivity/fet/Makefile,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 Makefile
> --- Makefile 12 Jul 2019 20:48:58 -0000 1.25
> +++ Makefile 1 Feb 2020 15:43:51 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= automatically create timetables
>
> -DISTNAME= fet-5.14.1
> -REVISION= 5
> +DISTNAME= fet-5.42.3
> CATEGORIES= productivity x11
>
> HOMEPAGE= http://www.lalescu.ro/liviu/fet/
> @@ -11,18 +10,15 @@ HOMEPAGE=
> http://www.lalescu.ro/liviu/f
> # GPLv2
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += Qt3Support QtGui QtNetwork QtSql QtXml c m pthread
> -WANTLIB += ${COMPILER_LIBCXX}
> -WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
> iconv intl -
> -COMPILER = base-clang ports-gcc base-gcc
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network
> Qt5PrintSupport +WANTLIB += Qt5Widgets c m
>
> MASTER_SITES= ${HOMEPAGE}/download/ \
> http://timetabling.de/download/
> EXTRACT_SUFX= .tar.bz2
>
> MODULES= devel/qmake \
> - x11/qt4
> + x11/qt5
>
> PORTHOME= ${WRKDIR}
>
> @@ -31,11 +27,10 @@ NO_TEST= Yes
> do-install:
> ${INSTALL_PROGRAM} ${WRKBUILD}/fet ${PREFIX}/bin
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fet
> - ${INSTALL_DATA} ${WRKSRC}/doc/algorithm/* \
> - ${PREFIX}/share/doc/fet
> + ${INSTALL_DATA} ${WRKSRC}/doc/algorithm/*.txt \
> + ${PREFIX}/share/doc/fet
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fet
> cd ${WRKSRC}/examples/ && umask 022 && pax -rw . \
> ${PREFIX}/share/examples/fet
> - ${INSTALL_MAN} ${WRKSRC}/doc/fet.1 ${PREFIX}/man/man1
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/productivity/fet/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- distinfo 18 Jan 2015 03:14:59 -0000 1.7
> +++ distinfo 1 Feb 2020 15:43:51 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (fet-5.14.1.tar.bz2) =
> aAj8TQ2pHnSyM2kphP52dfzbR3nEfTvNqy/gwcR5UeE= -SIZE
> (fet-5.14.1.tar.bz2) = 5940608 +SHA256 (fet-5.42.3.tar.bz2) =
> PiipgI8iXEifSFqDMfgwfTCIg6EUl4EpHCyVxieKYXw= +SIZE
> (fet-5.42.3.tar.bz2) = 13053961 Index:
> patches/patch-src_engine_generate_cpp
> ===================================================================
> RCS file: patches/patch-src_engine_generate_cpp diff -N
> patches/patch-src_engine_generate_cpp
> --- patches/patch-src_engine_generate_cpp 8 May 2017 11:50:27
> -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_engine_generate_cpp,v 1.1 2017/05/08 11:50:27
> espie Exp $ -
> -Index: src/engine/generate.cpp
> ---- src/engine/generate.cpp.orig
> -+++ src/engine/generate.cpp
> -@@ -47,6 +47,8 @@ using namespace std;
> -
> - #include <QDateTime>
> -
> -+// XXX avoid collision with std::
> -+#define mutex mymutex
> - extern QMutex mutex; //timetablegenerateform.cpp
> -
> - #include <QList>
> Index:
> patches/patch-src_interface_constraintstudentsactivitytagmaxhourscontinuouslyform_h
> ===================================================================
> RCS file:
> patches/patch-src_interface_constraintstudentsactivitytagmaxhourscontinuouslyform_h
> diff -N
> patches/patch-src_interface_constraintstudentsactivitytagmaxhourscontinuouslyform_h
> ---
> patches/patch-src_interface_constraintstudentsactivitytagmaxhourscontinuouslyform_h
> 8 May 2017 11:50:27 -0000 1.1 +++ /dev/null 1 Jan 1970
> 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD:
> patch-src_interface_constraintstudentsactivitytagmaxhourscontinuouslyform_h,v
> 1.1 2017/05/08 11:50:27 espie Exp $ - -Index:
> src/interface/constraintstudentsactivitytagmaxhourscontinuouslyform.h
> ----
> src/interface/constraintstudentsactivitytagmaxhourscontinuouslyform.h.orig
> -+++
> src/interface/constraintstudentsactivitytagmaxhourscontinuouslyform.h
> -@@ -16,7 +16,7 @@
> -
> ***************************************************************************/
> -
> - #ifndef CONSTRAINTSTUDENTSACTIVITYTAGMAXHOURSCONTINUOUSLYFORM_H
> --#define CONSTRAINTSTUDENTSCTIVITYTAGMAXHOURSCONTINUOUSLYFORM_H
> -+#define CONSTRAINTSTUDENTSACTIVITYTAGMAXHOURSCONTINUOUSLYFORM_H
> -
> - #include
> "ui_constraintstudentsactivitytagmaxhourscontinuouslyform_template.h"
> - #include "timetable_defs.h"
> Index:
> patches/patch-src_interface_constraintstudentsactivitytagmaxhoursdailyform_h
> ===================================================================
> RCS file:
> patches/patch-src_interface_constraintstudentsactivitytagmaxhoursdailyform_h
> diff -N
> patches/patch-src_interface_constraintstudentsactivitytagmaxhoursdailyform_h
> ---
> patches/patch-src_interface_constraintstudentsactivitytagmaxhoursdailyform_h
> 8 May 2017 11:50:27 -0000 1.1 +++ /dev/null 1 Jan 1970
> 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD:
> patch-src_interface_constraintstudentsactivitytagmaxhoursdailyform_h,v
> 1.1 2017/05/08 11:50:27 espie Exp $ - -Index:
> src/interface/constraintstudentsactivitytagmaxhoursdailyform.h
> ----
> src/interface/constraintstudentsactivitytagmaxhoursdailyform.h.orig -+
> ++ src/interface/constraintstudentsactivitytagmaxhoursdailyform.h -@@
> -16,7 +16,7 @@
> -
> ***************************************************************************/
> -
> - #ifndef CONSTRAINTSTUDENTSACTIVITYTAGMAXHOURSDAILYFORM_H
> --#define CONSTRAINTSTUDENTSCTIVITYTAGMAXHOURSDAILYFORM_H
> -+#define CONSTRAINTSTUDENTSACTIVITYTAGMAXHOURSDAILYFORM_H
> -
> - #include
> "ui_constraintstudentsactivitytagmaxhoursdailyform_template.h"
> - #include "timetable_defs.h"
> Index: patches/patch-src_interface_timetablegenerateform_cpp
> ===================================================================
> RCS file: patches/patch-src_interface_timetablegenerateform_cpp
> diff -N patches/patch-src_interface_timetablegenerateform_cpp
> --- patches/patch-src_interface_timetablegenerateform_cpp 8
> May 2017 11:50:27 -0000 1.1 +++ /dev/null 1 Jan 1970
> 00:00:00 -0000 @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_interface_timetablegenerateform_cpp,v 1.1
> 2017/05/08 11:50:27 espie Exp $ -
> -Index: src/interface/timetablegenerateform.cpp
> ---- src/interface/timetablegenerateform.cpp.orig
> -+++ src/interface/timetablegenerateform.cpp
> -@@ -44,6 +44,8 @@ using namespace std;
> -
> - #include "longtextmessagebox.h"
> -
> -+// XXX avoid collision with std::
> -+#define mutex mymutex
> - QMutex mutex;
> -
> - static GenerateThread generateThread;
> Index: patches/patch-src_interface_timetablegeneratemultipleform_cpp
> ===================================================================
> RCS file:
> patches/patch-src_interface_timetablegeneratemultipleform_cpp diff -N
> patches/patch-src_interface_timetablegeneratemultipleform_cpp
> ---
> patches/patch-src_interface_timetablegeneratemultipleform_cpp
> 8 May 2017 11:50:27 -0000 1.1 +++ /dev/null 1 Jan 1970
> 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD:
> patch-src_interface_timetablegeneratemultipleform_cpp,v 1.1
> 2017/05/08 11:50:27 espie Exp $ - -Index:
> src/interface/timetablegeneratemultipleform.cpp
> ---- src/interface/timetablegeneratemultipleform.cpp.orig
> -+++ src/interface/timetablegeneratemultipleform.cpp
> -@@ -41,6 +41,8 @@ using namespace std;
> -
> - #include <QDir>
> -
> -+// XXX
> -+#define mutex mymutex
> - extern QMutex mutex;
> -
> - static GenerateMultipleThread generateMultipleThread;
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/productivity/fet/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- pkg/PLIST 1 Sep 2010 12:43:54 -0000 1.5
> +++ pkg/PLIST 1 Feb 2020 15:43:51 -0000
> @@ -1,12 +1,26 @@
> @comment $OpenBSD: PLIST,v 1.5 2010/09/01 12:43:54 jasper Exp $
> @bin bin/fet
> -@man man/man1/fet.1
> share/doc/fet/
> share/doc/fet/algorithm-code.txt
> -share/doc/fet/algorithm-explanation.txt
> +share/doc/fet/algorithm-description.txt
> +share/doc/fet/algorithm-details.txt
> +share/doc/fet/algorithm-references.txt
> share/doc/fet/improve-studentsmaxgapsperday.txt
> -share/doc/fet/references.txt
> +share/doc/fet/improve-todo-item-197.txt
> share/examples/fet/
> +share/examples/fet/Algeria/
> +share/examples/fet/Algeria/Algerian-college/
> +share/examples/fet/Algeria/Algerian-college/Find-the-gaps-readme.txt
> +share/examples/fet/Algeria/Algerian-college/Find-the-gaps.fet
> +share/examples/fet/Algeria/Faculte-SNV-BBA/
> +share/examples/fet/Algeria/Faculte-SNV-BBA/SNV-BBA-2019-2020-S1-VF.fet
> +share/examples/fet/Algeria/Mechanical-Batna_Univ/
> +share/examples/fet/Algeria/Mechanical-Batna_Univ/ET2012-2013-S1.fet
> +share/examples/fet/Algeria/Mechanical-Batna_Univ/ET2012-2013-S2.fet
> +share/examples/fet/Algeria/Mechanical-Batna_Univ/EXAM-2013-2014-S1-readme.txt
> +share/examples/fet/Algeria/Mechanical-Batna_Univ/EXAM-2013-2014-S1.fet
> +share/examples/fet/Argentina/
> +share/examples/fet/Argentina/Horario_ISJ.fet
> share/examples/fet/Belize/
> share/examples/fet/Belize/Sacred-Heart-College/
> share/examples/fet/Belize/Sacred-Heart-College/shc-2007/
> @@ -14,25 +28,50 @@ share/examples/fet/Belize/Sacred-Heart-C
> share/examples/fet/Belize/Sacred-Heart-College/shc-2007/shc_6_gaps_per_teacher.fet
> share/examples/fet/Belize/Sacred-Heart-College/shc-2008/
> share/examples/fet/Belize/Sacred-Heart-College/shc-2008/shc-prelim-08.fet
> +share/examples/fet/Belize/Sacred-Heart-College/shc-2012/
> +share/examples/fet/Belize/Sacred-Heart-College/shc-2012/test-2012.fet
> +share/examples/fet/Belize/Sacred-Heart-College/shc-2013/
> +share/examples/fet/Belize/Sacred-Heart-College/shc-2013/shc-2013-more-difficult.fet
> +share/examples/fet/Belize/Sacred-Heart-College/shc-2013/shc-2013.fet
> share/examples/fet/Brazil/
> -share/examples/fet/Brazil/Brazil-more-difficult.fet
> -share/examples/fet/Brazil/Brazil.fet
> +share/examples/fet/Brazil/1/
> +share/examples/fet/Brazil/1/Brazil-more-difficult.fet
> +share/examples/fet/Brazil/1/Brazil.fet
> +share/examples/fet/Brazil/2/
> +share/examples/fet/Brazil/2/EEBLJ-Diurno-readme.txt
> +share/examples/fet/Brazil/2/EEBLJ-Diurno.fet
> +share/examples/fet/Brazil/2/EEBLJ-Noturno.fet
> +share/examples/fet/Brazil/3/
> +share/examples/fet/Brazil/3/ACHILES-MANHA.fet
> share/examples/fet/Bulgaria/
> share/examples/fet/Bulgaria/Lom_high_school_2007-2008.fet
> share/examples/fet/Denmark/
> share/examples/fet/Denmark/small-school.fet
> +share/examples/fet/Egypt/
> +share/examples/fet/Egypt/Dakahlia/
> +share/examples/fet/Egypt/Dakahlia/input_Lectures_40.fet
> +share/examples/fet/Egypt/Dakahlia/institution-2012-2013.fet
> share/examples/fet/Germany/
> share/examples/fet/Germany/DGS-Pro/
> share/examples/fet/Germany/DGS-Pro/dgspro200809.fet
> share/examples/fet/Germany/DGS-Pro/older/
> share/examples/fet/Germany/DGS-Pro/older/DGS_Pro_Germany.fet
> share/examples/fet/Germany/secondary-school-1/
> -share/examples/fet/Germany/secondary-school-1/constraints-min-n-days-100-few-0/
> -share/examples/fet/Germany/secondary-school-1/constraints-min-n-days-100-few-0/german-100_and_0.fet
> +share/examples/fet/Germany/secondary-school-1/constraints-min-days-100-few-0/
> +share/examples/fet/Germany/secondary-school-1/constraints-min-days-100-few-0/German-100_and_0.fet
> share/examples/fet/Germany/secondary-school-1/older/
> share/examples/fet/Germany/secondary-school-1/older/secondary_school.fet
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-1/
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-1/German-test-virtual-rooms-1.fet
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-1/readme-German-test-virtual-rooms-1.txt
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-2/
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-2/German-test-virtual-rooms-2.fet
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-2/readme-German-test-virtual-rooms-2.txt
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-3/
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-3/German-test-virtual-rooms-3.fet
> +share/examples/fet/Germany/secondary-school-1/test-virtual-rooms-3/readme-German-test-virtual-rooms-3.txt
> share/examples/fet/Germany/secondary-school-1/using_subactivities_constraints/
> -share/examples/fet/Germany/secondary-school-1/using_subactivities_constraints/german_subact_constr.fet
> +share/examples/fet/Germany/secondary-school-1/using_subactivities_constraints/German_subact_constr.fet
> share/examples/fet/Germany/secondary-school-2/
> share/examples/fet/Germany/secondary-school-2/GYR-5-gaps-per-teacher-readme.txt
> share/examples/fet/Germany/secondary-school-2/GYR-5-gaps-per-teacher.fet
> @@ -43,9 +82,15 @@ share/examples/fet/Germany/secondary-sch
> share/examples/fet/Greece/
> share/examples/fet/Greece/Corfu/
> share/examples/fet/Greece/Corfu/THE-2008-2009-exams-sep.fet
> -share/examples/fet/Greece/Pireus-difficult-warn/
> -share/examples/fet/Greece/Pireus-difficult-warn/8th-highschool-readme.txt
> -share/examples/fet/Greece/Pireus-difficult-warn/8th-highschool.fet
> +share/examples/fet/Greece/Didymoteicho/
> +share/examples/fet/Greece/Didymoteicho/6th-Primary-School.fet
> +share/examples/fet/Greece/Gymnasio/
> +share/examples/fet/Greece/Gymnasio/Gymnasio.fet
> +share/examples/fet/Greece/Little-Music-School/
> +share/examples/fet/Greece/Little-Music-School/MSA.fet
> +share/examples/fet/Greece/Pireus-difficult/
> +share/examples/fet/Greece/Pireus-difficult/8th-highschool-readme.txt
> +share/examples/fet/Greece/Pireus-difficult/8th-highschool.fet
> share/examples/fet/Greece/Vartholomio/
> share/examples/fet/Greece/Vartholomio/2008-2009.fet
> share/examples/fet/Hong-Kong/
> @@ -56,31 +101,62 @@ share/examples/fet/Hungary/Bethlen/
> share/examples/fet/Hungary/Bethlen/2007-2008-difficult/
> share/examples/fet/Hungary/Bethlen/2007-2008-difficult/Bethlen_2007_2008.fet
> share/examples/fet/Hungary/Bethlen/2008-2009/
> -share/examples/fet/Hungary/Bethlen/2008-2009/newer/
> -share/examples/fet/Hungary/Bethlen/2008-2009/newer/Bethlen-2008-2009.fet
> -share/examples/fet/Hungary/Bethlen/2008-2009/older/
> -share/examples/fet/Hungary/Bethlen/2008-2009/older/Bethlen-2008-2009-old.fet
> +share/examples/fet/Hungary/Bethlen/2008-2009/1-older/
> +share/examples/fet/Hungary/Bethlen/2008-2009/1-older/Bethlen-2008-2009-old.fet
> +share/examples/fet/Hungary/Bethlen/2008-2009/2-newer/
> +share/examples/fet/Hungary/Bethlen/2008-2009/2-newer/Bethlen-2008-2009.fet
> +share/examples/fet/Hungary/Varosmajori_Gimnazium_Budapest/
> +share/examples/fet/Hungary/Varosmajori_Gimnazium_Budapest/vmg-20180901b-2.fet
> +share/examples/fet/Hungary/Varosmajori_Gimnazium_Budapest/vmg-20180901b-9.fet
> +share/examples/fet/Hungary/Varosmajori_Gimnazium_Budapest/vmg-20180901b-readme.txt
> share/examples/fet/India/
> -share/examples/fet/India/anna-university/
> -share/examples/fet/India/anna-university/timetable_July_Nov_09_9.fet
> +share/examples/fet/India/Chennai/
> +share/examples/fet/India/Chennai/Anna-University/
> +share/examples/fet/India/Chennai/Anna-University/timetable_July_Nov_09_9.fet
> +share/examples/fet/India/Kurukshetra/
> +share/examples/fet/India/Kurukshetra/Institute-of-Technology/
> +share/examples/fet/India/Kurukshetra/Institute-of-Technology/MED_2019-20-1.fet
> +share/examples/fet/India/New-Delhi/
> +share/examples/fet/India/New-Delhi/Eng_College.fet
> +share/examples/fet/India/REVA-University/
> +share/examples/fet/India/REVA-University/REVA-UNIVERSITY_JANUARY2016.fet
> +share/examples/fet/India/St-Marys-College/
> +share/examples/fet/India/St-Marys-College/St-Marys-College-Puthanagadi.fet
> +share/examples/fet/Indonesia/
> +share/examples/fet/Indonesia/SMK-Negeri-1-Arahan-Kab-Indramayu/
> +share/examples/fet/Indonesia/SMK-Negeri-1-Arahan-Kab-Indramayu/netura_2016-2017.fet
> +share/examples/fet/Indonesia/TelPolytech-Bandung/
> +share/examples/fet/Indonesia/TelPolytech-Bandung/2010-2011/
> +share/examples/fet/Indonesia/TelPolytech-Bandung/2010-2011/TelPolytech_even.fet
> +share/examples/fet/Indonesia/TelPolytech-Bandung/2010-2011/TelPolytech_odd.fet
> share/examples/fet/Iran/
> share/examples/fet/Iran/Sharif-University/
> share/examples/fet/Iran/Sharif-University/Sharif.fet
> share/examples/fet/Italy/
> -share/examples/fet/Italy/difficult/
> -share/examples/fet/Italy/difficult/2007/
> -share/examples/fet/Italy/difficult/2007/highschool-Ancona.fet
> -share/examples/fet/Italy/difficult/2009/
> -share/examples/fet/Italy/difficult/2009/liceo-scientifico.fet
> -share/examples/fet/Italy/simple/
> -share/examples/fet/Italy/simple/2007/
> -share/examples/fet/Italy/simple/2007/simpler-italian.fet
> +share/examples/fet/Italy/2007/
> +share/examples/fet/Italy/2007/difficult/
> +share/examples/fet/Italy/2007/difficult/highschool-Ancona.fet
> +share/examples/fet/Italy/2007/simple/
> +share/examples/fet/Italy/2007/simple/simpler-Italian.fet
> +share/examples/fet/Italy/2009/
> +share/examples/fet/Italy/2009/liceo-scientifico.fet
> +share/examples/fet/Italy/2010/
> +share/examples/fet/Italy/2010/Liceo-2010.fet
> +share/examples/fet/Italy/2010/base2010-23.fet
> +share/examples/fet/Malta/
> +share/examples/fet/Malta/Klikk-SLP/
> +share/examples/fet/Malta/Klikk-SLP/Klikks-SLP-readme.txt
> +share/examples/fet/Malta/Klikk-SLP/Klikks-SLP.fet
> share/examples/fet/Morocco/
> +share/examples/fet/Morocco/Goulmima/
> +share/examples/fet/Morocco/Goulmima/Lycee-Goulmima.fet
> share/examples/fet/Morocco/Hadkourt/
> share/examples/fet/Morocco/Hadkourt/lycee-Farabi-readme-Arabic.txt
> share/examples/fet/Morocco/Hadkourt/lycee-Farabi-readme-English.txt
> share/examples/fet/Morocco/Hadkourt/lycee-Farabi.fet
> -share/examples/fet/Morocco/readme-morocco.txt
> +share/examples/fet/Morocco/Hadkourt/old-without-max-7-hours/
> +share/examples/fet/Morocco/Hadkourt/old-without-max-7-hours/lycee-Farabi-old.fet
> +share/examples/fet/Morocco/Morocco-readme.txt
> share/examples/fet/Namibia/
> share/examples/fet/Namibia/by-Bobby/
> share/examples/fet/Namibia/by-Bobby/set-1/
> @@ -96,42 +172,114 @@ share/examples/fet/Namibia/by-Bobby/set-
> share/examples/fet/Namibia/by-Bobby/set-2/WTHS.fet
> share/examples/fet/Namibia/by-Bobby/set-2/may-take-hours/
> share/examples/fet/Namibia/by-Bobby/set-2/may-take-hours/CONCORDIA.fet
> +share/examples/fet/Namibia/by-Bobby/set-3/
> +share/examples/fet/Namibia/by-Bobby/set-3/ConColY13T1a.fet
> +share/examples/fet/Namibia/by-Bobby/set-3/StPaulsColY13T1a.fet
> +share/examples/fet/Namibia/by-Bobby/set-4/
> +share/examples/fet/Namibia/by-Bobby/set-4/ConcordiaY15T1a.fet
> +share/examples/fet/Namibia/by-Bobby/set-5/
> +share/examples/fet/Namibia/by-Bobby/set-5/KalengaPSY15T1a.fet
> +share/examples/fet/Namibia/by-Bobby/set-6-2016/
> +share/examples/fet/Namibia/by-Bobby/set-6-2016/ConcordiaY2016T1b.fet
> +share/examples/fet/Namibia/by-Bobby/set-6-2016/MAPSY16T1d.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/ConcordiaY2016T2a.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/EGS2016T2d.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/ErnstJagerCSY2016T2a.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/GoreangabJSSY2016T2b.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/HashiyanaPSY16T2a.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/HavanaPSY2016T2b.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/Moses-vd-Byl-Y2016-T1b.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/NamibiaPSY16T1f.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/NamutuniPSY16T2a.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/RehobothHSY2016T2d.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/RehobothPSY16T1a.fet
> +share/examples/fet/Namibia/by-Bobby/set-7-2016/StAndrewsPSY2016T2a.fet
> +share/examples/fet/Namibia/by-Bobby/set-8-2017/
> +share/examples/fet/Namibia/by-Bobby/set-8-2017/KalengaPSY2017T1d.fet
> +share/examples/fet/Namibia/by-Bobby/set-8-2017/NehaleSS2017T1a.fet
> +share/examples/fet/Namibia/by-Bobby/set-8-2017/PutuavangaSSY2017T1a.fet
> share/examples/fet/Namibia/by-Willy/
> -share/examples/fet/Namibia/by-Willy/highlands_christian_school.fet
> +share/examples/fet/Namibia/by-Willy/Highlands_Christian_School.fet
> share/examples/fet/Romania/
> +share/examples/fet/Romania/Constantin-Brancusi-School-Medgidia/
> +share/examples/fet/Romania/Constantin-Brancusi-School-Medgidia/2013-2014/
> +share/examples/fet/Romania/Constantin-Brancusi-School-Medgidia/2013-2014/Orar_5_3.fet
> +share/examples/fet/Romania/Constantin-Brancusi-School-Medgidia/2019-2020/
> +share/examples/fet/Romania/Constantin-Brancusi-School-Medgidia/2019-2020/Orar_4_6.fet
> share/examples/fet/Romania/Faculty-Computers-Craiova/
> -share/examples/fet/Romania/Faculty-Computers-Craiova/computers-craiova.fet
> +share/examples/fet/Romania/Faculty-Computers-Craiova/Computers-Craiova.fet
> share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/
> share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2007-2008-sem-2/
> share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2007-2008-sem-2/Econ-Timisoara.fet
> share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2008-2009-sem-1/
> -share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2008-2009-sem-1/econ-tim-ver8.fet
> +share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2008-2009-sem-1/Econ-Tim-ver8.fet
> share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-1/
> -share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-1/econ-v0.8-readme.txt
> -share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-1/econ-v0.8.fet
> +share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-1/Econ-v0.8-readme.txt
> +share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-1/Econ-v0.8.fet
> share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-2/
> share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-2/v1_7-readme.txt
> share/examples/fet/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-2/v1_7.fet
> share/examples/fet/Romania/Oradea/
> share/examples/fet/Romania/Oradea/FS-2008-2009-difficult.fet
> -share/examples/fet/Romania/Oradea/school-10-oradea-2007-2008.fet
> +share/examples/fet/Romania/Oradea/School-10-Oradea-2007-2008.fet
> share/examples/fet/Romania/Pedagogic-High-School-Tg-Mures/
> share/examples/fet/Romania/Pedagogic-High-School-Tg-Mures/2006-2007.fet
> share/examples/fet/Romania/Pedagogic-High-School-Tg-Mures/2007-2008_sem1-a.fet
> +share/examples/fet/Romania/Pedagogic-High-School-Tg-Mures/2007-2008_sem1-d-test-students-max-span-per-day.fet
> share/examples/fet/Romania/Pedagogic-High-School-Tg-Mures/2007-2008_sem1-d.fet
> +share/examples/fet/Russia/
> +share/examples/fet/Russia/Russian-Medical-College/
> +share/examples/fet/Russia/Russian-Medical-College/timetable-ru.fet
> share/examples/fet/Saudi-Arabia/
> -share/examples/fet/Saudi-Arabia/Arabic_saudi_1.fet
> -share/examples/fet/Saudi-Arabia/Arabic_saudi_2.fet
> -share/examples/fet/Saudi-Arabia/Arabic_saudi_3.fet
> +share/examples/fet/Saudi-Arabia/Arabic_Saudi_1.fet
> +share/examples/fet/Saudi-Arabia/Arabic_Saudi_2.fet
> +share/examples/fet/Saudi-Arabia/Arabic_Saudi_3.fet
> +share/examples/fet/Saudi-Arabia/may-not-solve/
> +share/examples/fet/Saudi-Arabia/may-not-solve/Arabic_Saudi_Examination.fet
> +share/examples/fet/Saudi-Arabia/may-not-solve/Arabic_Saudi_Examination_readme.txt
> share/examples/fet/South-Africa/
> share/examples/fet/South-Africa/difficult/
> share/examples/fet/South-Africa/difficult/Collegiate_Junior_School2.fet
> share/examples/fet/South-Africa/difficult/Insight_Learning_Centre2.fet
> share/examples/fet/Spain/
> -share/examples/fet/Spain/Spanish_school.fet
> +share/examples/fet/Spain/1-school/
> +share/examples/fet/Spain/1-school/school.fet
> +share/examples/fet/Spain/2-secondary-school/
> +share/examples/fet/Spain/2-secondary-school/secondary-school.fet
> +share/examples/fet/Spain/3-school/
> +share/examples/fet/Spain/3-school/primaria.fet
> share/examples/fet/Sudan/
> share/examples/fet/Sudan/Khartoum-2010-02-13-readme.txt
> share/examples/fet/Sudan/Khartoum-2010-02-13.fet
> +share/examples/fet/Syria/
> +share/examples/fet/Syria/Hama/
> +share/examples/fet/Syria/Hama/2019/
> +share/examples/fet/Syria/Hama/2019/High-school.fet
> +share/examples/fet/Syria/Hama/2019/Industrial-high-school.fet
> +share/examples/fet/Tunisia/
> +share/examples/fet/Tunisia/Licee-secondaire-Hanibal-a-L'Ariana/
> +share/examples/fet/Tunisia/Licee-secondaire-Hanibal-a-L'Ariana/Diff1TverouillageTPass3-readme.txt
> +share/examples/fet/Tunisia/Licee-secondaire-Hanibal-a-L'Ariana/Diff1TverouillageTPass3.fet
> +share/examples/fet/United-Arab-Emirates/
> +share/examples/fet/United-Arab-Emirates/IBDP-School-2016.fet
> share/examples/fet/United-Kingdom/
> share/examples/fet/United-Kingdom/Hopwood/
> share/examples/fet/United-Kingdom/Hopwood/Hopwood.fet
> +share/examples/fet/Vietnam/
> +share/examples/fet/Vietnam/1-Le-Qui-Don_Lam-Ha/
> +share/examples/fet/Vietnam/1-Le-Qui-Don_Lam-Ha/Khoi-chieu.fet
> +share/examples/fet/Vietnam/1-Le-Qui-Don_Lam-Ha/Khoi-sang.fet
> +share/examples/fet/Vietnam/2-secondary-school/
> +share/examples/fet/Vietnam/2-secondary-school/VietNamHungYen.fet
> +share/examples/fet/Vietnam/3-THCS-(Mo-hinh-truong-hoc-moi)/
> +share/examples/fet/Vietnam/3-THCS-(Mo-hinh-truong-hoc-moi)/TKB-THCS-DucHop_KimDong_HungYen-(8_2015).fet
> +share/examples/fet/anonymous/
> +share/examples/fet/anonymous/1/
> +share/examples/fet/anonymous/1/2007/
> +share/examples/fet/anonymous/1/2007/anonymous-1-2007.fet
> +share/examples/fet/anonymous/1/2008/
> +share/examples/fet/anonymous/1/2008/anonymous-1-2008.fet
> +share/examples/fet/anonymous/2/
> +share/examples/fet/anonymous/2/2017/
> +share/examples/fet/anonymous/2/2017/lk-example.fet
>
No comments:
Post a Comment