Changed Version from 2.2-test to 2.2

Changed make.sh to push to master
Edit some IPFire 2.1 strings to 2.2

diff --git a/config/rootfiles/updater/filelists/other b/config/rootfiles/updater/filelists/other
index 2e8834dcaa029a9cb0106ea4e0968c421c39e13d..bcf49116db6b388caa0e6c058020e5de6963b40a 100644 (file)
--- a/config/rootfiles/updater/filelists/other
+++ b/config/rootfiles/updater/filelists/other
@@ -5,6 +5,7 @@ etc/rc.d/init.d/network
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/networking/red.up/40-ipac
+etc/linuxigd/gatedesc.xml
 usr/local/bin/getiptstate
 usr/local/bin/makegraphs
 srv/web/ipfire/cgi-bin/speed.cgi

diff --git a/config/upnp/gatedesc.xml b/config/upnp/gatedesc.xml
index 07dc07be7f692cb3e7aaaaeeb10bcc3c5d4e6ad3..3d878194ac2fb8e3a09498c51df84a99e2ba08c4 100755 (executable)
--- a/config/upnp/gatedesc.xml
+++ b/config/upnp/gatedesc.xml
@@ -9,7 +9,7 @@
                <friendlyName>IPFire UPnP Device</friendlyName>
                <manufacturer>IPFire Project</manufacturer>
                <manufacturerURL>http://www.ipfire.org</manufacturerURL>
-               <modelName>IPFire 2.1</modelName>
+               <modelName>IPFire 2.2</modelName>
                <UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
                <iconList>
                        <icon>
@@ -37,9 +37,9 @@
                                <manufacturerURL>http://www.ipfire.org</manufacturerURL>
                                <modelDescription>WAN Device on Linux IGD</modelDescription>
                                <modelName>IPFire</modelName>
-                               <modelNumber>2.1</modelNumber>
+                               <modelNumber>2.2</modelNumber>
                                <modelURL>http://linux-igd.sourceforge.net</modelURL>
-                               <serialNumber>2.1</serialNumber>
+                               <serialNumber>2.2</serialNumber>
                                <UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
                                <UPC>Linux IGD</UPC>
                                <serviceList>
@@ -59,9 +59,9 @@
                                                <manufacturerURL>http://www.ipfire.org</manufacturerURL>
                                                <modelDescription>Internet connection on Linux IPFire Firewall</modelDescription>
                                                <modelName>IPFire</modelName>
-                                               <modelNumber>2.1</modelNumber>
+                                               <modelNumber>2.2</modelNumber>
                                                <modelURL>http://www.ipfire.org</modelURL>
-                                               <serialNumber>2.1</serialNumber>
+                                               <serialNumber>2.2</serialNumber>
                                                <UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
                                                <UPC>Linux IGD</UPC>
                                                <serviceList>

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 1c1939cfdcbfd54ec29bfa443c861f20280e3192..85d8add674dd3576e5f4e4cfc1e02155c76a44a0 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -73,7 +73,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
 
 $sambasettings{'WORKGRP'} = 'homeip.net';
 $sambasettings{'NETBIOSNAME'} = 'IPFire';
-$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.1';
+$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.2';
 $sambasettings{'INTERFACES'} = '';
 $sambasettings{'SECURITY'} = 'share';
 $sambasettings{'OSLEVEL'} = '33';

diff --git a/make.sh b/make.sh
index 0d55a9b633362b5e55fc3a424ea047ee0c09cd51..cd3601307855fae6c85d4eb94679ed2ae8c95112 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.2-test"
-GIT_BRANCH=rspezial:rspezial                                                                           # Version number
+VERSION="2.2"
+GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level