This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jspwiki.
commit 15dc3901130a05d070bd8556525c75fe8d5785ce Author: Emmanuel Bourg <[email protected]> Date: Thu Mar 6 15:10:02 2014 +0000 Use dh_install to install the files in /etc/jspwiki --- debian/changelog | 1 + debian/jspwiki.install | 5 +++++ debian/rules | 5 +---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bdddce1..c8f210a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ jspwiki (2.8.0-6) UNRELEASED; urgency=medium - 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 <[email protected]> Thu, 06 Mar 2014 12:59:23 +0100 diff --git a/debian/jspwiki.install b/debian/jspwiki.install new file mode 100644 index 0000000..ad77d85 --- /dev/null +++ b/debian/jspwiki.install @@ -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/ diff --git a/debian/rules b/debian/rules index c62fd7e..f398d2f 100755 --- a/debian/rules +++ b/debian/rules @@ -62,14 +62,11 @@ binary-indep: build install 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jspwiki.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
