Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 28ac84d252555ce8a6e8f5a75d88f66671bdff58..cf3087d1db711dc46539c908742b1983f2b70967 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
 #!/usr/bin/make -f
 %:

-       dh $@
+       LC_ALL=C.UTF-8 TZ=UTC dh $@

 
 override_dh_auto_configure:
        # keeps it out of /usr/local
 
 override_dh_auto_configure:
        # keeps it out of /usr/local


@@ -12,8 +12,4 @@ override_dh_compress:
 
 override_dh_auto_clean:
        # distclean moans about MANIFEST, this is quieter
 
 override_dh_auto_clean:
        # distclean moans about MANIFEST, this is quieter

-       $(MAKE) realclean
-
-# Not intended for use by anyone except the author.
-announcedir:
-       @echo ${HOME}/src/ikiwiki/doc/news
+       if [ -e Makefile ]; then $(MAKE) realclean; fi