[firmware-free] 03/19: Move creation and deletion of bug-presubj links out of build and clean rules

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository firmware-free.

commit 59b889ef37e1c370c717e7bd4ec09cb3ed9475e7
Author: Ben Hutchings <benh at debian.org>
Date:   Sat Sep 18 00:30:49 2010 +0000

    Move creation and deletion of bug-presubj links out of build and clean rules
    
    We can't easily add to the 'clean' commands provided by linux-support
    and we certainly shouldn't replace them.
    
    [bwh: Cherry-picked from firmware-nonfree commit
     9fa8d503b990603079e084e3f36859417c2a52a2]
---
 debian/bin/gencontrol.py | 2 ++
 debian/rules             | 4 +---
 debian/rules.real        | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 8594f97..3d225cb 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -179,6 +179,8 @@ class GenControl(debian_linux.gencontrol.Gencontrol):
             vars['license'] = codecs.open("%s/LICENSE" % package, 'r', 'utf-8').read()
             codecs.open("debian/firmware-%s.copyright" % package, 'w', 'utf-8').write(self.substitute(copyright, vars))
 
+        os.symlink('bug-presubj', 'debian/firmware-%s.bug-presubj' % package)
+
         files_orig = config_entry['files']
         files_real = {}
 
diff --git a/debian/rules b/debian/rules
index 1357ee6..f5c8894 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,11 +47,9 @@ debian/control-real: $(GENCONTROL) $(CONTROL_FILES)
 	@echo
 	exit 1
 
-clean:
-	rm -f debian/*.bug-presubj
-
 maintainerclean:
 	-rm debian/control debian/control.md5sum debian/rules.gen
+	rm -f debian/*.bug-presubj
 	-rm debian/*.copyright
 	-rm debian/*.hook.*
 	-rm debian/*.preinst
diff --git a/debian/rules.real b/debian/rules.real
index c8051fe..1c46c7d 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -21,7 +21,6 @@ install:
 	  echo install -m644 -D "$$s" debian/$(PACKAGE_NAME)"$$d"; \
 	  install -m644 -D "$$s" debian/$(PACKAGE_NAME)"$$d"; \
 	done
-	ln -sf bug-presubj debian/$(PACKAGE_NAME).bug-presubj
 	dh_bugfiles
 	dh_installchangelogs
 	dh_installdocs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-free.git