[debian-edu-commits] debian-edu/ 01/02: Merge dist-clean and clean targets into clean target.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-doc.

commit 6513832ed4d2fafddafe23566bddf2799e780586
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 4 19:12:38 2014 +0000

    Merge dist-clean and clean targets into clean target.
---
 Makefile                             | 4 +---
 debian/changelog                     | 1 +
 debian/rules                         | 5 -----
 documentation/common/Makefile.common | 4 +---
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 2a2ff73..ce0297f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,8 @@ update-copyright:
 		> debian/copyright
 	rm documentation/*/copyright.manual
 
-readme status build install dist-clean clean pdf epub::
+readme status build install clean pdf epub::
 	$(MAKE) -C $(SRCDIR)/debian-edu-wheezy $@
 	$(MAKE) -C $(SRCDIR)/debian-edu-jessie $@
 	$(MAKE) -C $(SRCDIR)/rosegarden $@
 	$(MAKE) -C $(SRCDIR)/audacity $@
-
-dist-clean:: clean
diff --git a/debian/changelog b/debian/changelog
index 5c67e4b..7fb36e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,7 @@ debian-edu-doc (1.6~20141005) UNRELEASED; urgency=medium
     a serious bug. Now network is only needed for get-orig-source which is
     obviously needs it.
   * Switch to compat 9 and dh style building.
+  * Merge dist-clean and clean targets into clean target.
 
   [ Petter Reinholdtsen ]
   * Added Dutch (nl) audacity manual by Frans Spiesschaert (Closes:
diff --git a/debian/rules b/debian/rules
index c709bc5..597c9db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,6 @@ get-orig-source:
 %:
 	dh $@
 
-override_dh_clean:
-	$(MAKE) dist-clean
-	rm -rf $(DESTDIR)/debian-edu-doc-?? $(DESTDIR)/debian-edu-doc
-	dh_clean
-
 override_dh_install:
 	$(MAKE) install DESTDIR="$(DESTDIR)"
 
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index f592f24..60ebfa9 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -133,8 +133,6 @@ clean:
 	rm -f *.pdf images/*.pdf images/*/*.pdf
 	rm -f *.html
 	rm -f $(name).*.xml
-	rm -f *.po~
-
-dist-clean:	clean
 	rm -f *.epub
 	rm -f *.pdf
+	rm -f *.po~

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git