From a2deff9ce20c4d4e6ab02b47b911725af095a910 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 14 Jun 2008 11:18:37 +0200
Subject: [PATCH] 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

---
 config/rootfiles/updater/filelists/other |  1 +
 config/upnp/gatedesc.xml                 | 10 +++++-----
 html/cgi-bin/samba.cgi                   |  2 +-
 make.sh                                  |  4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/config/rootfiles/updater/filelists/other b/config/rootfiles/updater/filelists/other
index 2e8834dcaa..bcf49116db 100644
--- 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 07dc07be7f..3d878194ac 100755
--- 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 1c1939cfdc..85d8add674 100644
--- 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 0d55a9b633..cd36013078 100755
--- 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
-- 
2.39.2