From 520e961efb34835e2fd3c5cf054571af55ec44fb Mon Sep 17 00:00:00 2001
From: Emiliano Vavassori <syntaxerrormmm@gmail.com>
Date: Sun, 1 Jul 2018 17:18:00 +0200
Subject: [PATCH] Rivisto versionamento e alcune variabili.

---
 Makefile                                      |  6 +++---
 ...m-base.control => libreschool-base.control | 17 ++++++++-------
 ...ontrol => libreschool-primary-base.control | 19 ++++++++++-------
 ...ol => libreschool-primary-optional.control | 21 +++++++++++--------
 4 files changed, 36 insertions(+), 27 deletions(-)
 rename libreschool-vm-base.control => libreschool-base.control (73%)
 rename libreschool-vm-primary-base.control => libreschool-primary-base.control (60%)
 rename libreschool-vm-primary-optional.control => libreschool-primary-optional.control (58%)

diff --git a/Makefile b/Makefile
index 9b1f09e..1f8a754 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-sources = libreschool-vm-base.control \
- libreschool-vm-primary-base.control \
- libreschool-vm-primary-optional.control
+sources = libreschool-base.control \
+ libreschool-primary-base.control \
+ libreschool-primary-optional.control
 obj = $(sources:.control=.deb) 
 
 all: $(obj)
diff --git a/libreschool-vm-base.control b/libreschool-base.control
similarity index 73%
rename from libreschool-vm-base.control
rename to libreschool-base.control
index 17ef178..da11099 100644
--- a/libreschool-vm-base.control
+++ b/libreschool-base.control
@@ -3,11 +3,11 @@
 # Source: <source package name; defaults to package name>
 Section: misc
 Priority: optional
-# Homepage: <enter URL here; no default>
-Standards-Version: 3.9.2
+Homepage: https://libreschool.org
+Standards-Version: 3.9.7
 
-Package: libreschool-vm-base
-Version: 0.9.0
+Package: libreschool-base
+Version: 0~20180701
 Maintainer: Emiliano Vavassori <syntaxerrormmm@gmail.com>
 # Pre-Depends: <comma-separated list of packages>
 Depends: breeze-icon-theme, gedit, kde-l10n-it, libreoffice, libreoffice-gnome, libreoffice-help-it, libreoffice-l10n-it, libreoffice-librelogo, openclipart-libreoffice, xournal
@@ -17,14 +17,17 @@ Depends: breeze-icon-theme, gedit, kde-l10n-it, libreoffice, libreoffice-gnome,
 # Replaces: <comma-separated list of packages>
 Architecture: all
 # Multi-Arch: <one of: foreign|same|allowed>
-#Copyright: GPL3
+# Copyright: GPL3
 # Changelog: <changelog file; defaults to a generic changelog>
 # Readme: <README.Debian file; defaults to a generic one>
 # Extra-Files: <comma-separated list of additional files for the doc directory>
 # Files: <pair of space-separated paths; First is file to include, second is destination>
 #  <more pairs, if there's more than one file to include. Notice the starting space>
-Description: LibreSchool for VM - Selected base packages
+Description: LibreSchool - Selected base packages (metapackage)
  Selected base packages for didactics in schools in Italy.
  .
- Applications were selected by Omar Lazzari as part of a simplification effort for a Ubuntu-based system for the Voting Machine in Lombardy, North of Italy.
+ LibreSchool project aims to help schools migrate to free software and GNU/Linux
+ operating system.
+ The packages included in the present packages were selected by Omar Lazzari to
+ be part of a basic o.s. for schools. 
 
diff --git a/libreschool-vm-primary-base.control b/libreschool-primary-base.control
similarity index 60%
rename from libreschool-vm-primary-base.control
rename to libreschool-primary-base.control
index 75ac146..fcf5409 100644
--- a/libreschool-vm-primary-base.control
+++ b/libreschool-primary-base.control
@@ -4,18 +4,18 @@
 Section: misc
 Priority: optional
 Homepage: https://libreschool.org
-Standards-Version: 3.9.2
+Standards-Version: 3.9.7
 
-Package: libreschool-vm-primary-base
-Version: 0.9.0
+Package: libreschool-primary-base
+Version: 0~20180701
 Maintainer: Emiliano Vavassori <syntaxerrormmm@gmail.com>
 # Pre-Depends: <comma-separated list of packages>
-Depends: libreschool-vm-base, tuxmath, tuxpaint, gcompris, gcompris-sound-it, kgeography, marble, calibre, kturtle, pinta, tupi, pencil2d, inkscape, scribus, vlc, openshot
+Depends: calibre, gcompris, gcompris-sound-it, inkscape, kgeography, kturtle, libreschool-base, marble, openshot, pencil2d, pinta, scribus, tupi, tuxmath, tuxpaint, vlc
 # Recommends: <comma-separated list of packages>
 # Suggests: <comma-separated list of packages>
 # Provides: <comma-separated list of packages>
 # Replaces: <comma-separated list of packages>
-# Architecture: all
+Architecture: all
 # Multi-Arch: <one of: foreign|same|allowed>
 # Copyright: <copyright file; defaults to GPL2>
 # Changelog: <changelog file; defaults to a generic changelog>
@@ -23,8 +23,11 @@ Depends: libreschool-vm-base, tuxmath, tuxpaint, gcompris, gcompris-sound-it, kg
 # Extra-Files: <comma-separated list of additional files for the doc directory>
 # Files: <pair of space-separated paths; First is file to include, second is destination>
 #  <more pairs, if there's more than one file to include. Notice the starting space>
-Description: LibreSchool - Selected packages for primary
- Selected packages for didactics in primary schools in Italy.
+Description: LibreSchool - Selected base packages for primary schools (metapackage)
+ Selected base packages for didactics in primary schools in Italy.
  .
- Applications were selected by Omar Lazzari as part of a simplification effort for a Ubuntu-based system for the Voting Machine in Lombardy, North of Italy.
+ LibreSchool project aims to help schools migrate to free software and GNU/Linux
+ operating system.
+ The packages included in the present packages were selected by Omar Lazzari to
+ be part of a basic o.s. for schools. 
 
diff --git a/libreschool-vm-primary-optional.control b/libreschool-primary-optional.control
similarity index 58%
rename from libreschool-vm-primary-optional.control
rename to libreschool-primary-optional.control
index 9feb9e5..11ed33e 100644
--- a/libreschool-vm-primary-optional.control
+++ b/libreschool-primary-optional.control
@@ -3,19 +3,19 @@
 # Source: <source package name; defaults to package name>
 Section: misc
 Priority: optional
-# Homepage: <enter URL here; no default>
-Standards-Version: 3.9.2
+Homepage: https://libreschool.org
+Standards-Version: 3.9.7
 
-Package: libreschool-vm-primary-optional
-Version: 0.9.0
+Package: libreschool-primary-optional
+Version: 0~20180701
 Maintainer: Emiliano Vavassori <syntaxerrormmm@gmail.com>
 # Pre-Depends: <comma-separated list of packages>
-Depends: libreschool-vm-primary-base, childsplay, childsplay-alphabet-sounds-it, kanagram, khangman, kwordquiz, kolourpaint4, synaptics
+Depends: childsplay, childsplay-alphabet-sounds-it, kanagram, khangman, kolourpaint4, kwordquiz, libreschool-primary-base, synaptics
 # Recommends: <comma-separated list of packages>
 # Suggests: <comma-separated list of packages>
 # Provides: <comma-separated list of packages>
 # Replaces: <comma-separated list of packages>
-# Architecture: all
+Architecture: all
 # Multi-Arch: <one of: foreign|same|allowed>
 # Copyright: GPL3
 # Changelog: <changelog file; defaults to a generic changelog>
@@ -23,8 +23,11 @@ Depends: libreschool-vm-primary-base, childsplay, childsplay-alphabet-sounds-it,
 # Extra-Files: <comma-separated list of additional files for the doc directory>
 # Files: <pair of space-separated paths; First is file to include, second is destination>
 #  <more pairs, if there's more than one file to include. Notice the starting space>
-Description: LibreSchool - Optional packages for primary
- Optional packages for didactics in primary schools in Italy.
+Description: LibreSchool - Selected optional packages for primary schools (metapackage)
+ Selected optional packages for didactics in primary schools in Italy.
  .
- Applications were selected by Omar Lazzari as part of a simplification effort for a Ubuntu-based system for the Voting Machine in Lombardy, North of Italy.
+ LibreSchool project aims to help schools migrate to free software and GNU/Linux
+ operating system.
+ The packages included in the present packages were selected by Omar Lazzari to
+ be part of a basic o.s. for schools.