package bareos-17.2 packages

bareos · Nov 30, 2017 · 6d7c97a · 6d7c97a
1 parent 50d378d
commit 6d7c97a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/manuals/en/main/Makefile b/manuals/en/main/Makefile
@@ -140,7 +140,7 @@ autogenerated/bareos-tray-monitor-*.tex: autogenerated/bareos-tray-monitor-confi
 	$(GENERATED_RESOURCE_DESCRIPTIONS) autogenerated/bareos-tray-monitor-config-schema.json
 
 autogenerated/bareos-packages-table-*.tex:
-	$(GENERATED_PACKAGE_INFO) -o autogenerated/ data/bareos-12.4-packages.json data/bareos-13.2-packages.json data/bareos-14.2-packages.json data/bareos-15.2-packages.json data/bareos-16.2-packages.json
+	$(GENERATED_PACKAGE_INFO) -o autogenerated/ data/bareos-12.4-packages.json data/bareos-13.2-packages.json data/bareos-14.2-packages.json data/bareos-15.2-packages.json data/bareos-16.2-packages.json data/bareos-17.2-packages.json
 
 check: bareos-manual-main-reference.pdf
 	@# hyperlink: multiline: pdfTeX warning .* has been reference$d but does not exist

diff --git a/manuals/en/main/data/bareos-17.2-packages.json b/manuals/en/main/data/bareos-17.2-packages.json
diff --git a/manuals/en/main/supportedoses.tex b/manuals/en/main/supportedoses.tex
@@ -124,6 +124,7 @@ \subsection{Packages for the different Linux platforms}
     \input{autogenerated/bareos-packages-table-redhat.tex}
     \input{autogenerated/bareos-packages-table-fedora.tex}
     \input{autogenerated/bareos-packages-table-suse.tex}
+    \input{autogenerated/bareos-packages-table-opensuse.tex}
     \input{autogenerated/bareos-packages-table-debian.tex}
     \input{autogenerated/bareos-packages-table-ubuntu.tex}
 }

diff --git a/manuals/scripts/generate-bareos-package-info.py b/manuals/scripts/generate-bareos-package-info.py
@@ -9,7 +9,7 @@
 """
 
 __author__ = "Joerg Steffens"
-__copyright__ = "2015-2016"
+__copyright__ = "2015-2017"
 __license__ = "AGPL"
 __version__ = "0.2"
 __email__ = "joerg.steffens@bareos.com"
@@ -114,7 +114,7 @@ def __init__(self):
         self.excluded_packages = set()
 
         self.dist_exclude_pattern = re.compile("win_cross|windows")
-        self.package_exclude_pattern = re.compile("php-ZendFramework2-.*|mhvtl.*|mingw.*|.*-dbg|.*-debug.*|.*-doc|.*-devel|.*-dev")
+        self.package_exclude_pattern = re.compile("php5-zendframework2|php-ZendFramework2.*|mhvtl.*|mingw.*|.*-dbg|.*-debug.*|.*-doc|.*-devel|.*-dev")
 
 
     def generate(self, inputdata):
@@ -249,6 +249,7 @@ def create_file(filename, data, filterregex):
     filenametemplate = dest + '-table-{0}.tex'
     create_file(filenametemplate.format('redhat'), data, 'CentOS.*|RHEL.*')
     create_file(filenametemplate.format('fedora'), data, 'Fedora_2.')
-    create_file(filenametemplate.format('suse'), data, 'openSUSE_13..|openSUSE_Leap_.*|SLE_10_SP4|SLE_11_SP4|SLE_12_SP1')
+    create_file(filenametemplate.format('opensuse'), data, 'openSUSE_13..|openSUSE_Leap_.*')
+    create_file(filenametemplate.format('suse'), data, 'SLE_10_SP4|SLE_11_SP4|SLE_12_.*')
     create_file(filenametemplate.format('debian'), data, 'Debian.*|Univention_4.*')
     create_file(filenametemplate.format('ubuntu'), data, 'xUbuntu.*')