r3825 - people/waldi/kernel/source/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: 2005-08-10 14:17:33 +0000 (Wed, 10 Aug 2005)
New Revision: 3825

Modified:
   people/waldi/kernel/source/linux-2.6/debian/rules
Log:
debian/rules: Cleanup.


Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 13:55:41 UTC (rev 3824)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 14:17:33 UTC (rev 3825)
@@ -6,23 +6,9 @@
 DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-version  := $(word 1,$(subst -, ,$(srcver)))
-ltver    := $(word 2,$(subst -, ,$(srcver)))
-major_v  := $(word 1,$(subst ., ,$(version)))
-minor_v  := $(word 2,$(subst ., ,$(version)))
-major    := $(major_v).$(minor_v)
-release  := $(version)-$(ltver)
-uver     := $(subst .,_,$(version))
-#
-# The following definition gets the list of relevant files in the top-level
-# directory. At this point we cannot verify that we are in top-level dir
-# (we probably are), so it should be referenced only in the targets which 
-# run dh_testdir in the beginning.
-#
-source_files = $(filter-out debian linux-source-$(version), $(shell echo *))
+VERSION  := $(word 1,$(subst -, ,$(srcver)))
+MAJOR    := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION)))
 
-export version abiname ltver kbuildver flavours major uver
-
 include debian/rules.defs
 
 setup: debian/setup-stamp
@@ -40,13 +26,13 @@
 $(BUILD_DIR) $(STAMPS_DIR):
 	@[ -d $@ ] || mkdir $@
 
-orig: ../orig/linux-$(major)-$(version)
-	rsync --delete --exclude debian --exclude .svn -av ../orig/linux-$(major)-$(version)/ .
+orig: ../orig/linux-$(MAJOR)-$(VERSION)
+	rsync --delete --exclude debian --exclude .svn -av ../orig/linux-$(MAJOR)-$(VERSION)/ .
 
-../orig/linux-$(major)-$(version):
-	if [ -f "../linux-$(major)_$(version).orig.tar.gz" ]; then \
+../orig/linux-$(MAJOR)-$(VERSION):
+	if [ -f "../linux-$(MAJOR)_$(VERSION).orig.tar.gz" ]; then \
 		mkdir -p ../orig; \
-		tar -C ../orig -xzf ../linux-$(major)_$(version).orig.tar.gz; \
+		tar -C ../orig -xzf ../linux-$(MAJOR)_$(VERSION).orig.tar.gz; \
 	else \
 		echo "Can't find orig tarball." >&2; \
 		exit 1; \
@@ -55,7 +41,7 @@
 clean: unpatch
 	dh_testdir
 	rm -f version.Debian
-	cd debian; rm -f *-stamp config.* *.kpatches.arch
+	cd debian; rm -f *.kpatches.arch
 	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean