Merge lp:~scarneiro/ubuntu/raring/dictclient/fix-for-ignore-make-clean-errors into lp:ubuntu/raring/dictclient

[Sebastian Carneiro]

Fixes lintian warning about debian/rules ignoring clean target errors,
checking for existence of Makefile before executing such target.

[Daniel Holbach (dholbach)]

Thanks for your work on this. Do you think it would be possible for you to forward the change to Debian instead? It would make things a lot easier for us. You should be able to just run 'submittodebian' from the source tree to submit it there. http://developer.ubuntu.com/packaging/html/fixing-a-bug-example.html has some additional information as well.

[Sebastian Carneiro (scarneiro)]

> Thanks for your work on this. Do you think it would be possible for you to
> forward the change to Debian instead? It would make things a lot easier for
> us. You should be able to just run 'submittodebian' from the source tree to
> submit it there. http://developer.ubuntu.com/packaging/html/fixing-a-bug-
> example.html has some additional information as well.

Sure, I will do that. What about this merge proposal, should I delete it ?

Thanks, Daniel !

[Daniel Holbach (dholbach)]

I'll just ask for the merge proposal to be closed. Thanks a lot for your work Sebastian!

[Sebastian Carneiro (scarneiro)]

Patch submitted to Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694764

Unmerged revisions

8. By Sebastian Carneiro on 2012-11-28

* Fixes lintian warning, by which debian/rules ignores make clean
  target errors.
  - debian/rules: stop ignoring clean target errors, checking
    Makefile is present.

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-14 15:23:15 +0000
+++ debian/changelog	2012-11-28 03:19:19 +0000
@@ -1,3 +1,12 @@
+dictclient (1.0.3.1ubuntu4) raring; urgency=low
+
+  * Fixes lintian warning, by which debian/rules ignores make clean
+    target errors.
+    - debian/rules: stop ignoring clean target errors, checking
+      Makefile is present.
+
+ -- Sebastian Carneiro <[e-mail]>  Tue, 27 Nov 2012 23:47:59 -0300
+
 dictclient (1.0.3.1ubuntu3) precise; urgency=low
 
   * Build using dh_python2.

=== modified file 'debian/control'
--- debian/control	2011-12-14 15:23:15 +0000
+++ debian/control	2012-11-28 03:19:19 +0000
@@ -1,7 +1,7 @@
 Source: dictclient
 Section: interpreters
 Priority: optional
-Maintainer: Ubuntu Core Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: John Goerzen <[e-mail]>
 Build-Depends-Indep: debhelper (>> 5.0.37.2), python, python-dev (>= 2.3), python-all-dev (>= 2.3.5-11)
 Build-Depends: debhelper (>> 5.0.37.2)

=== modified file 'debian/rules'
--- debian/rules	2011-12-14 15:23:15 +0000
+++ debian/rules	2012-11-28 03:19:19 +0000
@@ -46,7 +46,7 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 	-$(PYTHON) setup.py clean --all
 
 	dh_clean