[kernel] r16304 - in dists/trunk/firmware-nonfree/debian: . bin

[Ben Hutchings]

Author: benh
Date: Sat Sep 18 00:30:49 2010
New Revision: 16304

Log:
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.

Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/rules
   dists/trunk/firmware-nonfree/debian/rules.real

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Sat Sep 18 00:14:14 2010	(r16303)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Sat Sep 18 00:30:49 2010	(r16304)
@@ -204,6 +204,8 @@
             vars['license'] = file("%s/LICENSE" % package).read()
             file("debian/firmware-%s.copyright" % package, 'w').write(self.substitute(copyright, vars))
 
+        os.symlink('bug-presubj', 'debian/firmware-%s.bug-presubj' % package)
+
         files_orig = config_entry['files']
         files_real = {}
 

Modified: dists/trunk/firmware-nonfree/debian/rules
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules	Sat Sep 18 00:14:14 2010	(r16303)
+++ dists/trunk/firmware-nonfree/debian/rules	Sat Sep 18 00:30:49 2010	(r16304)
@@ -8,11 +8,9 @@
 
 GENCONTROL = debian/bin/gencontrol.py $(KERNELVERSION)
 
-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

Modified: dists/trunk/firmware-nonfree/debian/rules.real
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules.real	Sat Sep 18 00:14:14 2010	(r16303)
+++ dists/trunk/firmware-nonfree/debian/rules.real	Sat Sep 18 00:30:49 2010	(r16304)
@@ -24,7 +24,6 @@
 	  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