[kernel] r6369 - dists/trunk/linux-nonfree-2.6/debian

[Bastian Blank]

Author: waldi
Date: Tue Apr  4 09:35:30 2006
New Revision: 6369

Removed:
   dists/trunk/linux-nonfree-2.6/debian/rules.defs
Modified:
   dists/trunk/linux-nonfree-2.6/debian/rules
   dists/trunk/linux-nonfree-2.6/debian/rules.real
Log:
* debian/rules, debian/rules.real: Fix to work with linux-support-*.
* debian/rules.defs: Remove.


Modified: dists/trunk/linux-nonfree-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/rules	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/rules	Tue Apr  4 09:35:30 2006
@@ -1,19 +1,18 @@
 #!/usr/bin/make -f
-SHELL    := sh -e
-srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-VERSION  := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
-MAJOR    := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION)))
-UPSTREAMVERSION  := $(shell echo $(VERSION) | sed -e 's,^[^+]*+,,' -e 's,-rc[0-9]*$$,,')
+SHELL := sh -e
+SOURCEVERSION := 2.6.16
+VERSION := 2.6.16-1
+MAJOR := 2.6
 
-include /usr/src/linux-headers-$(UPSTREAMVERSION)/modules/rules.include
+include /usr/src/linux-support-$(VERSION)/modules/rules.include
 
-orig: ../orig/linux-nonfree-$(MAJOR)-$(VERSION)
-	rsync --delete --exclude debian --exclude .svn -av ../orig/linux-nonfree-$(MAJOR)-$(VERSION)/ .
+orig: ../orig/linux-nonfree-$(MAJOR)-$(SOURCEVERSION)
+	rsync --delete --exclude debian --exclude .svn -av ../orig/linux-nonfree-$(MAJOR)-$(SOURCEVERSION)/ .
 
 ../orig/linux-$(MAJOR)-$(VERSION):
 	if [ -f "../linux-nonfree-$(MAJOR)_$(VERSION).orig.tar.gz" ]; then \
 		mkdir -p ../orig; \
-		tar -C ../orig -xzf ../linux-nonfree-$(MAJOR)_$(VERSION).orig.tar.gz; \
+		tar -C ../orig -xzf ../linux-nonfree-$(MAJOR)_$(SOURCEVERSION).orig.tar.gz; \
 	else \
 		echo "Can't find orig tarball." >&2; \
 		exit 1; \

Modified: dists/trunk/linux-nonfree-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/rules.real	Tue Apr  4 09:35:30 2006
@@ -5,9 +5,7 @@
 
 export DH_OPTIONS
 
-HEADERS_DIR = /usr/src/linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
-
-include debian/rules.defs
+include /usr/src/linux-support-$(UPSTREAMVERSION)$(ABINAME)/modules/rules.real.include
 
 #
 # Targets