Merge branch 'next' into initscripts-cleanup

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 659d8c22ed483245b1181512624940182ede6f38..f5e792a9a91855b62f946e0c983e8102ffa23a4a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="109"                                                     # Core Level (Filename)
+CORE="110"                                                     # Core Level (Filename)
 PAKFIRE_CORE="109"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -487,12 +487,17 @@ buildipfire() {
   ipfiremake libgpg-error
   ipfiremake libgcrypt
   ipfiremake libassuan
+  ipfiremake nettle
+  ipfiremake libevent
+  ipfiremake libevent2
+  ipfiremake expat
+  ipfiremake unbound
+  ipfiremake gnutls
   ipfiremake bind
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake boost
   ipfiremake linux-atm
-  ipfiremake expat
   ipfiremake gdbm
   ipfiremake pam
   ipfiremake curl
@@ -539,10 +544,6 @@ buildipfire() {
   ipfiremake arping
   ipfiremake beep
   ipfiremake dvdrtools
-  ipfiremake nettle
-  ipfiremake libevent
-  ipfiremake libevent2
-  ipfiremake unbound
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake xfsprogs
@@ -650,6 +651,10 @@ buildipfire() {
   ipfiremake avahi
   ipfiremake cups
   ipfiremake ghostscript
+  ipfiremake lcms2
+  ipfiremake qpdf
+  ipfiremake poppler
+  ipfiremake cups-filters
   ipfiremake epson-inkjet-printer-escpr
   ipfiremake foomatic
   ipfiremake hplip