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

Proposed by Sebastian Carneiro
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~scarneiro/ubuntu/raring/adns/fix-for-ignored-make-clean-errors
Merge into: lp:ubuntu/raring/adns
Diff against target: 77 lines (+21/-6)
5 files modified
Makefile (+5/-2)
Makefile.in (+1/-1)
debian/changelog (+11/-0)
debian/control (+2/-1)
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~scarneiro/ubuntu/raring/adns/fix-for-ignored-make-clean-errors
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+136558@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

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.

Revision history for this message
Sebastian Carneiro (scarneiro) wrote :

> 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 !

Revision history for this message
Daniel Holbach (dholbach) wrote :

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

Revision history for this message
Sebastian Carneiro (scarneiro) wrote :

Unmerged revisions

8. By Sebastian Carneiro

* 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2006-10-17 17:45:15 +0000
+++ Makefile 2012-11-28 02:37:24 +0000
@@ -36,8 +36,11 @@
3636
37SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress37SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
3838
39all install uninstall clean distclean mostlyclean maintainer-clean distprep:39clean distclean mostlyclean maintainer-clean:
40 set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done40 $(MAKE) $@-here
41
42all install uninstall distprep:
43 set -e; for d in $(SUBDIRS); $(MAKE) -C $$d $@; done
41 $(MAKE) $@-here44 $(MAKE) $@-here
4245
43all-here install-here uninstall-here distprep-here: README46all-here install-here uninstall-here distprep-here: README
4447
=== 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 @@
37SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress37SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
3838
39all install uninstall clean distclean mostlyclean maintainer-clean distprep:39all install uninstall clean distclean mostlyclean maintainer-clean distprep:
40 set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done40 set -e; for d in $(SUBDIRS); do [ -f $$d/Makefile ] && $(MAKE) -C $$d $@; done
41 $(MAKE) $@-here41 $(MAKE) $@-here
4242
43all-here install-here uninstall-here distprep-here: README43all-here install-here uninstall-here distprep-here: README
4444
=== 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 @@
1adns (1.4-2ubuntu1) raring; urgency=low
2
3 * Fix for lintian warning, by which debian/rules ignores
4 make clean / distclean:
5 - debian/rules: stops ignoring make clean / distclean errors,
6 and executes target if Makefile exists.
7 - Makefile, Makefile.in: only executes distclean on current directory,
8 as subdirs don't have that target.
9
10 -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Tue, 27 Nov 2012 21:45:25 -0300
11
1adns (1.4-2build2) quantal; urgency=low12adns (1.4-2build2) quantal; urgency=low
213
3 * Rebuild for new armel compiler default of ARMv5t.14 * Rebuild for new armel compiler default of ARMv5t.
415
=== 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 @@
1Source: adns1Source: adns
2Section: devel2Section: devel
3Priority: optional3Priority: optional
4Maintainer: Robert S. Edmonds <edmonds@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Robert S. Edmonds <edmonds@debian.org>
5Build-Depends: debhelper (>= 7), netbase, m46Build-Depends: debhelper (>= 7), netbase, m4
6Standards-Version: 3.8.07Standards-Version: 3.8.0
7Homepage: http://www.chiark.greenend.org.uk/~ian/adns/8Homepage: http://www.chiark.greenend.org.uk/~ian/adns/
89
=== 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 @@
1414
15clean:15clean:
16 dh clean --before dh_auto_clean16 dh clean --before dh_auto_clean
17 -$(MAKE) distclean17 [ ! -f Makefile ] || $(MAKE) distclean
18 -$(MAKE) -C regress distclean18 [ ! -f regress/Makefile ] || $(MAKE) -C regress distclean
19 rm -f regress/output-*19 rm -f regress/output-*
20 dh clean --after dh_auto_clean20 dh clean --after dh_auto_clean
2121

Subscribers

People subscribed via source and target branches