Move conf files from other packages to conf-available2

11 files changed, 9 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index 82f2db2..c106353 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
+lighttpd (1.4.28-2) unstable; urgency=low
+
   [ Olaf van der Spek ]
   * Use relative instead of absolute links for conf-enabled (closes: 541645)
 
+ -- Olaf van der Spek <olaf@router>  Sat, 23 Oct 2010 17:31:25 +0200
+
 lighttpd (1.4.28-1) unstable; urgency=low
 
   [ Olaf van der Spek ]
diff --git a/debian/conf-available/10-cml.conf b/debian/conf-available2/10-cml.conf
index e9a7735..e9a7735 100644
--- a/debian/conf-available/10-cml.conf
+++ b/debian/conf-available2/10-cml.conf
diff --git a/debian/conf-available/10-magnet.conf b/debian/conf-available2/10-magnet.conf
index 32993f7..32993f7 100644
--- a/debian/conf-available/10-magnet.conf
+++ b/debian/conf-available2/10-magnet.conf
diff --git a/debian/conf-available/10-trigger-b4-dl.conf b/debian/conf-available2/10-trigger-b4-dl.conf
index 02ff589..02ff589 100644
--- a/debian/conf-available/10-trigger-b4-dl.conf
+++ b/debian/conf-available2/10-trigger-b4-dl.conf
diff --git a/debian/conf-available/10-webdav.conf b/debian/conf-available2/10-webdav.conf
index 167170d..167170d 100644
--- a/debian/conf-available/10-webdav.conf
+++ b/debian/conf-available2/10-webdav.conf
diff --git a/debian/lighttpd-mod-cml.install b/debian/lighttpd-mod-cml.install
index e1745ff..1fbf921 100644
--- a/debian/lighttpd-mod-cml.install
+++ b/debian/lighttpd-mod-cml.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/lighttpd/mod_cml.so
-debian/conf-available/10-cml.conf etc/lighttpd/conf-available
+debian/conf-available2/10-cml.conf etc/lighttpd/conf-available
diff --git a/debian/lighttpd-mod-magnet.install b/debian/lighttpd-mod-magnet.install
index a7ac430..646bbe9 100644
--- a/debian/lighttpd-mod-magnet.install
+++ b/debian/lighttpd-mod-magnet.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/lighttpd/mod_magnet.so
-debian/conf-available/10-magnet.conf etc/lighttpd/conf-available
+debian/conf-available2/10-magnet.conf etc/lighttpd/conf-available
diff --git a/debian/lighttpd-mod-trigger-b4-dl.install b/debian/lighttpd-mod-trigger-b4-dl.install
index 780066a..a9ad781 100644
--- a/debian/lighttpd-mod-trigger-b4-dl.install
+++ b/debian/lighttpd-mod-trigger-b4-dl.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/lighttpd/mod_trigger_b4_dl.so
-debian/conf-available/10-trigger-b4-dl.conf etc/lighttpd/conf-available
+debian/conf-available2/10-trigger-b4-dl.conf etc/lighttpd/conf-available
diff --git a/debian/lighttpd-mod-webdav.install b/debian/lighttpd-mod-webdav.install
index f453a5d..022e687 100644
--- a/debian/lighttpd-mod-webdav.install
+++ b/debian/lighttpd-mod-webdav.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/lighttpd/mod_webdav.so
-debian/conf-available/10-webdav.conf        /etc/lighttpd/conf-available
+debian/conf-available2/10-webdav.conf        /etc/lighttpd/conf-available
diff --git a/debian/lighttpd.conf b/debian/lighttpd.conf
index 84ef663..7e3d807 100644
--- a/debian/lighttpd.conf
+++ b/debian/lighttpd.conf
@@ -24,12 +24,8 @@ url.access-deny             = ( "~", ".inc" )
 
 static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
-## Use ipv6 if available
 include_shell "/usr/share/lighttpd/use-ipv6.pl"
 
-# server.port               = 81
-# server.bind               = "localhost"
-
 dir-listing.encoding        = "utf-8"
 server.dir-listing          = "enable"
 
diff --git a/debian/lighttpd.install b/debian/lighttpd.install
index 17084ed..ed607d4 100644
--- a/debian/lighttpd.install
+++ b/debian/lighttpd.install
@@ -28,21 +28,7 @@ debian/tmp/usr/lib/lighttpd/mod_status.so
 debian/tmp/usr/lib/lighttpd/mod_userdir.so
 debian/tmp/usr/lib/lighttpd/mod_usertrack.so
 debian/lighttpd.conf                        /etc/lighttpd
-debian/conf-available/05-auth.conf          /etc/lighttpd/conf-available
-debian/conf-available/10-status.conf        /etc/lighttpd/conf-available
-debian/conf-available/10-accesslog.conf     /etc/lighttpd/conf-available
-debian/conf-available/10-cgi.conf           /etc/lighttpd/conf-available
-debian/conf-available/10-fastcgi.conf       /etc/lighttpd/conf-available
-debian/conf-available/10-no-www.conf        /etc/lighttpd/conf-available
-debian/conf-available/10-proxy.conf         /etc/lighttpd/conf-available
-debian/conf-available/10-rrdtool.conf       /etc/lighttpd/conf-available
-debian/conf-available/10-simple-vhost.conf  /etc/lighttpd/conf-available
-debian/conf-available/10-ssi.conf           /etc/lighttpd/conf-available
-debian/conf-available/10-ssl.conf           /etc/lighttpd/conf-available
-debian/conf-available/10-userdir.conf       /etc/lighttpd/conf-available
-debian/conf-available/15-fastcgi-php.conf   /etc/lighttpd/conf-available
-debian/conf-available/90-debian-doc.conf    /etc/lighttpd/conf-available
-debian/conf-available/README                /etc/lighttpd/conf-available
+debian/conf-available/*                     /etc/lighttpd/conf-available
 debian/create-mime.assign.pl                /usr/share/lighttpd/
 debian/include-conf-enabled.pl              /usr/share/lighttpd/
 debian/use-ipv6.pl                          /usr/share/lighttpd/