Keep old name for Debian Apache files

debian/README.Debian

@@ -15,14 +15,14 @@ with a quick sed command. For example, we change it to ow2.org:
 Enable the components you've installed:
 
   # Portal
-  a2ensite portal-apache2.X.conf
+  a2ensite portal-apache2.conf
 
   # Manager
-  a2ensite manager-apache2.X.conf
+  a2ensite manager-apache2.conf
 
   # Handler
-  a2ensite handler-apache2.X.conf
-  a2ensite test-apache2.X.conf
+  a2ensite handler-apache2.conf
+  a2ensite test-apache2.conf
 
 and enable mod_perl if not already loaded:
 

debian/liblemonldap-ng-handler-perl.examples

@@ -1,3 +1,3 @@
-debian/tmp/etc/lemonldap-ng/handler-apache2.X.conf
-debian/tmp/etc/lemonldap-ng/test-apache2.X.conf
+debian/tmp/etc/lemonldap-ng/handler-apache2.conf
+debian/tmp/etc/lemonldap-ng/test-apache2.conf
 debian/tmp/var/lib/lemonldap-ng/test

debian/liblemonldap-ng-handler-perl.install

@@ -2,5 +2,5 @@
 /usr/share/man/man3/Lemonldap::NG::Handler*
 /var/lib/lemonldap-ng/test
 /usr/share/lemonldap-ng/bin/purgeLocalCache
-/etc/lemonldap-ng/handler-apache2.X.conf
-/etc/lemonldap-ng/test-apache2.X.conf
+/etc/lemonldap-ng/handler-apache2.conf
+/etc/lemonldap-ng/test-apache2.conf

debian/liblemonldap-ng-handler-perl.links

@@ -1,2 +1,2 @@
-/etc/lemonldap-ng/handler-apache2.X.conf /etc/apache2/sites-available/handler-apache2.X.conf
-/etc/lemonldap-ng/test-apache2.X.conf /etc/apache2/sites-available/test-apache2.X.conf
+/etc/lemonldap-ng/handler-apache2.conf /etc/apache2/sites-available/handler-apache2.conf
+/etc/lemonldap-ng/test-apache2.conf /etc/apache2/sites-available/test-apache2.conf

debian/liblemonldap-ng-manager-perl.install

@@ -1,5 +1,5 @@
 /usr/share/perl5/Lemonldap/NG/Manager*
-/etc/lemonldap-ng/manager-apache2.X.conf
+/etc/lemonldap-ng/manager-apache2.conf
 /usr/share/lemonldap-ng/manager
 /var/lib/lemonldap-ng/manager
 /usr/share/lemonldap-ng/bin/lmConfigEditor

debian/liblemonldap-ng-manager-perl.links

@@ -1,2 +1,2 @@
-/etc/lemonldap-ng/manager-apache2.X.conf /etc/apache2/sites-available/manager-apache2.X.conf
+/etc/lemonldap-ng/manager-apache2.conf /etc/apache2/sites-available/manager-apache2.conf
 

debian/liblemonldap-ng-portal-perl.install

@@ -6,4 +6,4 @@
 /usr/share/lemonldap-ng/bin/buildPortalWSDL
 /usr/share/lemonldap-ng/portal
 /var/lib/lemonldap-ng/portal
-/etc/lemonldap-ng/portal-apache2.X.conf
+/etc/lemonldap-ng/portal-apache2.conf

debian/liblemonldap-ng-portal-perl.links

@@ -1,4 +1,4 @@
-/etc/lemonldap-ng/portal-apache2.X.conf /etc/apache2/sites-available/portal-apache2.X.conf
+/etc/lemonldap-ng/portal-apache2.conf /etc/apache2/sites-available/portal-apache2.conf
 /usr/share/lemonldap-ng/portal/cdc.pl /var/lib/lemonldap-ng/portal/cdc.pl
 /usr/share/lemonldap-ng/portal/index.pl /var/lib/lemonldap-ng/portal/index.pl
 /usr/share/lemonldap-ng/portal/mail.pl /var/lib/lemonldap-ng/portal/mail.pl

debian/rules

@@ -49,6 +49,9 @@ override_dh_auto_install:
 
 	mkdir $(TMP)/$(LMSHAREDIR)/manager $(TMP)/$(LMSHAREDIR)/portal
 	mv $(TMP)/$(LMVARDIR)/portal/*.pl $(TMP)/$(LMSHAREDIR)/portal/
+	for i in handler portal manager test; do \
+		mv $(TMP)/etc/lemonldap-ng/$$i-apache2.X.conf $(TMP)/etc/lemonldap-ng/$$i-apache2.conf; \
+	done
 
 override_dh_compress:
 	dh_compress -X favicon.ico