Merge lp:~scarneiro/ubuntu/raring/adns/fix-for-ignored-make-clean-errors into lp:ubuntu/raring/adns

[Sebastian Carneiro]

Corrected Makefile, Makefile.in and debian/rules to avoid ignoring
make clean errors, fixing lintian warning.

[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=694763

Unmerged revisions

8. By Sebastian Carneiro on 2012-11-28

* Fix for lintian warning, by which debian/rules ignores
  make clean / distclean:
  - debian/rules: stops ignoring make clean / distclean errors,
    and executes target if Makefile exists.
  - Makefile, Makefile.in: only executes distclean on current directory,
    as subdirs don't have that target.

=== modified file 'Makefile'
--- Makefile	2006-10-17 17:45:15 +0000
+++ Makefile	2012-11-28 02:37:24 +0000
@@ -36,8 +36,11 @@
 
 SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
 
-all install uninstall clean distclean mostlyclean maintainer-clean distprep:
-	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
+clean distclean mostlyclean maintainer-clean:
+	$(MAKE) $@-here
+	
+all install uninstall distprep:
+	set -e; for d in $(SUBDIRS); $(MAKE) -C $$d $@; done
 	$(MAKE) $@-here
 
 all-here install-here uninstall-here distprep-here:	README

=== modified file 'Makefile.in'
--- Makefile.in	2006-10-17 17:45:15 +0000
+++ Makefile.in	2012-11-28 02:37:24 +0000
@@ -37,7 +37,7 @@
 SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
 
 all install uninstall clean distclean mostlyclean maintainer-clean distprep:
-	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
+	set -e; for d in $(SUBDIRS); do [ -f $$d/Makefile ] && $(MAKE) -C $$d $@; done
 	$(MAKE) $@-here
 
 all-here install-here uninstall-here distprep-here:	README

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-01 16:42:35 +0000
+++ debian/changelog	2012-11-28 02:37:24 +0000
@@ -1,3 +1,14 @@
+adns (1.4-2ubuntu1) raring; urgency=low
+
+  * Fix for lintian warning, by which debian/rules ignores 
+    make clean / distclean: 
+    - debian/rules: stops ignoring make clean / distclean errors, 
+      and executes target if Makefile exists.
+    - Makefile, Makefile.in: only executes distclean on current directory, 
+      as subdirs don't have that target. 
+
+ -- Sebastian Carneiro <[e-mail]>  Tue, 27 Nov 2012 21:45:25 -0300
+
 adns (1.4-2build2) quantal; urgency=low
 
   * Rebuild for new armel compiler default of ARMv5t.

=== modified file 'debian/control'
--- debian/control	2008-09-17 10:37:36 +0000
+++ debian/control	2012-11-28 02:37:24 +0000
@@ -1,7 +1,8 @@
 Source: adns
 Section: devel
 Priority: optional
-Maintainer: Robert S. Edmonds <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Robert S. Edmonds <[e-mail]>
 Build-Depends: debhelper (>= 7), netbase, m4
 Standards-Version: 3.8.0
 Homepage: http://www.chiark.greenend.org.uk/~ian/adns/

=== modified file 'debian/rules'
--- debian/rules	2008-06-15 20:08:31 +0000
+++ debian/rules	2012-11-28 02:37:24 +0000
@@ -14,8 +14,8 @@
 
 clean:
 	dh clean --before dh_auto_clean
-	-$(MAKE) distclean
-	-$(MAKE) -C regress distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
+	[ ! -f regress/Makefile ] || $(MAKE) -C regress distclean
 	rm -f regress/output-*
 	dh clean --after dh_auto_clean