tag 394083 patch thanks Hi,
Attached is the diff for making .htaccess a conffile. Basically, I am now using dh_install to install it. BTW, I also converted the other cp instructions into dh_install. Matti, would you need help comaintaining the package? Do you still have time or interest in maintaining dokuwiki? -- adn Mohammed Adnène Trojette
diff -u dokuwiki-0.0.20060309/debian/dirs dokuwiki-0.0.20060309/debian/dirs --- dokuwiki-0.0.20060309/debian/dirs +++ dokuwiki-0.0.20060309/debian/dirs @@ -1,3 +1,3 @@ usr/share/dokuwiki -var/lib/dokuwiki +var/lib/dokuwiki/acl etc/dokuwiki diff -u dokuwiki-0.0.20060309/debian/rules dokuwiki-0.0.20060309/debian/rules --- dokuwiki-0.0.20060309/debian/rules +++ dokuwiki-0.0.20060309/debian/rules @@ -34,14 +34,8 @@ dh_installdirs dh_install - # Copy DokuWiki files to approppriate locations. - cp -r lib inc $(DESTDIR)/usr/share/dokuwiki - cp .htaccess $(DESTDIR)/usr/share/dokuwiki/ - cp *.php $(DESTDIR)/usr/share/dokuwiki/ chown -R root.root $(DESTDIR)/usr/share/dokuwiki chmod 755 $(DESTDIR)/usr/share/dokuwiki - cp -r data $(DESTDIR)/var/lib/dokuwiki - cp conf/* $(DESTDIR)/etc/dokuwiki/ # Allow www-data to write new pages. chown -R www-data.root $(DESTDIR)/var/lib/dokuwiki @@ -57,9 +51,6 @@ # Decode uuencoded Debian button uudecode -o $(DESTDIR)/usr/share/dokuwiki/lib/tpl/default/images/button-debian.png $(DESTDIR)/usr/share/dokuwiki/lib/tpl/default/images/button-debian.png.uue - # Set up access control system - mkdir $(DESTDIR)/var/lib/dokuwiki/acl - # Build architecture-independent files here. binary-indep: build install dh_testdir diff -u dokuwiki-0.0.20060309/debian/changelog dokuwiki-0.0.20060309/debian/changelog --- dokuwiki-0.0.20060309/debian/changelog +++ dokuwiki-0.0.20060309/debian/changelog @@ -1,3 +1,11 @@ +dokuwiki (0.0.20060309-5.3) unstable; urgency=low + + * Non-maintainer upload. + * Use dh_install instead of copying: + + makes .htaccess a conffile. (Closes: #394083) + + -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Thu, 19 Oct 2006 15:47:18 +0200 + dokuwiki (0.0.20060309-5.2) unstable; urgency=high * Non-maintainer upload. diff -u dokuwiki-0.0.20060309/debian/install dokuwiki-0.0.20060309/debian/install --- dokuwiki-0.0.20060309/debian/install +++ dokuwiki-0.0.20060309/debian/install @@ -2,0 +3,6 @@ +lib /usr/share/dokuwiki +inc /usr/share/dokuwiki +.htaccess /usr/share/dokuwiki/ +*.php /usr/share/dokuwiki/ +data /var/lib/dokuwiki +conf/* /etc/dokuwiki/