Merge disorder.userman branch

[disorder] / debian / Makefile.am

diff --git a/debian/Makefile.am b/debian/Makefile.am
index ec4dab2..8896a55 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ noinst_SCRIPTS=rules
 
 EXTRA_DIST=README.Debian config.disorder-server control \
           copyright README.RTP \
-          etc.disorder.options etc.disorder.config htaccess \
+          etc.disorder.options.user etc.disorder.config \
           postinst.disorder-server prerm.disorder-server \
           postrm.disorder-server \
           templates.disorder-server conffiles.disorder-server \