From cb6cac79587006ad7a11a73de4bf1a9b6b8719e1 Mon Sep 17 00:00:00 2001
From: Andrew Thompson <andrew@clonedev.co.nz>
Date: Thu, 26 Jan 2012 20:01:06 +1300
Subject: Move haproxy-dev to haproxy proper, ticket ZVS-164444

---
 pkg_config.7.xml       | 14 +-------------
 pkg_config.8.xml       |  2 +-
 pkg_config.8.xml.amd64 |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 2719360e..27b7f080 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -74,22 +74,10 @@
 		<descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>0.29</version>
-		<status>BETA</status>
-		<required_version>1.2.3</required_version>
-		<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>
-		<configurationfile>haproxy.xml</configurationfile>
-	</package>
-	<package>
-		<pkginfolink>http://doc.pfsense.org/index.php/haproxy_package</pkginfolink>
-		<name>haproxy-dev</name>
-		<descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr>
-		<website>http://haproxy.1wt.eu/</website>
-		<category>Services</category>
 		<version>0.31</version>
 		<status>BETA</status>
 		<required_version>1.2.3</required_version>
-		<config_file>http://www.pfsense.com/packages/config/haproxy-dev/haproxy.xml</config_file>
+		<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>
 		<configurationfile>haproxy.xml</configurationfile>
 	</package>
 	<package>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 5d1824ce..74a82fea 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -120,7 +120,7 @@
 		<descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.18 pkg v 1.0</version>
+		<version>1.4.20 pkg v 1.1</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index ab63efd6..df1e5495 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -203,7 +203,7 @@
 		<descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.4.18 pkg v 1.0</version>
+		<version>1.4.20 pkg v 1.1</version>
 		<status>Release</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>
-- 
cgit v1.2.3