r1087 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian

[Andres Salomon]

Author: dilinger-guest
Date: 2004-08-14 02:55:18 -0600 (Sat, 14 Aug 2004)
New Revision: 1087

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free
Log:
@%!#^ upstream was nuking our debian/ directory during clean.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-14 08:47:06 UTC (rev 1086)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-14 08:55:18 UTC (rev 1087)
@@ -39,6 +39,9 @@
       (forward port firmware changes to new tg3; from version 3.3
       of driver to version 3.8)
 
+  * Stop the kernel distclean from nuking the debian directory by
+    having the clean rule check for debian/official (Andres Salomon).
+
  -- Andres Salomon <dilinger@voxel.net>  Sat, 14 Aug 2004 02:40:50 -0400
 
 kernel-source-2.6.7 (2.6.7-4) unstable; urgency=high

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free	2004-08-14 08:47:06 UTC (rev 1086)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/prune-non-free	2004-08-14 08:55:18 UTC (rev 1087)
@@ -40,3 +40,8 @@
 # prune the firmware from the Tigon3 driver, leaving the rest in place
 #awk '/^(static )?u32.*tg3(Tso)?5?Fw(Data|Rodata|Text)/,/^};$/{evil=1}!evil{print}{evil=0}' drivers/net/tg3.c > drivers/net/tg3.c.pruned
 #mv drivers/net/tg3.c.pruned drivers/net/tg3.c
+
+# Upstream deletes our debian directory.  Bastards.
+sed 's#rm -rf $(objtree)/debian/#test -f $(objtree)/debian/official || rm -rf $(objtree)/debian/#' scripts/package/Makefile > scripts/package/Makefile.ouch
+mv scripts/package/Makefile.ouch scripts/package/Makefile
+