[pkg-java] r17843 - trunk/jspwiki/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-06 15:10:02 +0000 (Thu, 06 Mar 2014)
New Revision: 17843

Added:
   trunk/jspwiki/debian/jspwiki.install
Modified:
   trunk/jspwiki/debian/changelog
   trunk/jspwiki/debian/rules
Log:
Use dh_install to install the files in /etc/jspwiki



Modified: trunk/jspwiki/debian/changelog
===================================================================
--- trunk/jspwiki/debian/changelog	2014-03-06 14:51:47 UTC (rev 17842)
+++ trunk/jspwiki/debian/changelog	2014-03-06 15:10:02 UTC (rev 17843)
@@ -12,6 +12,7 @@
     - Use canonical URLs for the Vcs-* fields
     - Updated the Homepage field
   * Added a watch file
+  * debian/rules: Use dh_install to install the files in /etc/jspwiki
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 06 Mar 2014 12:59:23 +0100
 

Added: trunk/jspwiki/debian/jspwiki.install
===================================================================
--- trunk/jspwiki/debian/jspwiki.install	                        (rev 0)
+++ trunk/jspwiki/debian/jspwiki.install	2014-03-06 15:10:02 UTC (rev 17843)
@@ -0,0 +1,5 @@
+debian/jspwiki.properties etc/jspwiki/
+debian/jspwiki.xml etc/jspwiki/
+debian/tomcat.policy etc/jspwiki/
+etc/groupdatabase.xml etc/jspwiki/
+etc/userdatabase.xml etc/jspwiki/

Modified: trunk/jspwiki/debian/rules
===================================================================
--- trunk/jspwiki/debian/rules	2014-03-06 14:51:47 UTC (rev 17842)
+++ trunk/jspwiki/debian/rules	2014-03-06 15:10:02 UTC (rev 17843)
@@ -62,14 +62,11 @@
 	dh_testdir
 	dh_testroot
 	dh_installdirs -p jspwiki etc/jspwiki etc/tomcat6/policy.d var/lib/jspwiki var/lib/tomcat6/webapps usr/share/doc/jspwiki/examples usr/share
+	dh_install -p jspwiki
 	cp -r build/JSPWiki debian/jspwiki/usr/share/jspwiki
-	cp debian/jspwiki.xml debian/jspwiki/etc/jspwiki/jspwiki.xml
-	cp etc/groupdatabase.xml etc/userdatabase.xml debian/jspwiki/etc/jspwiki/
 	rm -f debian/jspwiki/usr/share/jspwiki/WEB-INF/jspwiki.properties
 
-	cp debian/jspwiki.properties debian/jspwiki/etc/jspwiki/jspwiki.properties
 	mv debian/jspwiki/usr/share/jspwiki/WEB-INF/web.xml debian/jspwiki/usr/share/jspwiki/WEB-INF/jspwiki.tld debian/jspwiki/etc/jspwiki/
-	cp debian/tomcat.policy debian/jspwiki/etc/jspwiki/tomcat.policy
 
 	dh_installdocs README doc/Compiling.txt debian/README.Debian
 	dh_installchangelogs ChangeLog