[kernel] r6348 - in dists/trunk/linux-nonfree-2.6/debian: . templates

[Bastian Blank]

Author: waldi
Date: Thu Mar 30 12:18:22 2006
New Revision: 6348

Modified:
   dists/trunk/linux-nonfree-2.6/debian/rules.real
   dists/trunk/linux-nonfree-2.6/debian/templates/control.main.in
Log:
debian/rules.real,
debian/templates/control.main.in: Use linux-source-nonfree as name for sources.


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	Thu Mar 30 12:18:22 2006
@@ -18,13 +18,13 @@
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
-$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
-$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION)
-$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source
+$(BUILD_DIR)/linux-source-nonfree-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
+$(BUILD_DIR)/linux-source-nonfree-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-nonfree-$(UPSTREAMVERSION)
+$(BUILD_DIR)/linux-source-nonfree-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source
 	rm -rf '$@' '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	chmod -R u+rw,go=rX '$(DIR)'
-	cd '$(BUILD_DIR)'; tar -cjf 'linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2' 'linux-nonfree-source-$(UPSTREAMVERSION)'
+	cd '$(BUILD_DIR)'; tar -cjf 'linux-source-nonfree-$(UPSTREAMVERSION).tar.bz2' 'linux-source-nonfree-$(UPSTREAMVERSION)'
 	rm -rf '$(DIR)'
 
 srcfiles := $(filter-out debian, $(wildcard *))
@@ -83,8 +83,8 @@
 	cd $(SOURCE_DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) make install DIR=$(HEADERS_DIR) MODLIB=$(DIR) INSTALL_MOD_DIR=nonfree
 	$(MAKE) -f debian/rules.real install-base
 
-install-source: DH_OPTIONS = -plinux-nonfree-source-$(VERSION)
-install-source: $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2
+install-source: DH_OPTIONS = -plinux-source-nonfree-$(VERSION)
+install-source: $(BUILD_DIR)/linux-source-nonfree-$(UPSTREAMVERSION).tar.bz2
 	dh_testdir
 	dh_testroot
 	dh_install '$<' /usr/src

Modified: dists/trunk/linux-nonfree-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/templates/control.main.in	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/templates/control.main.in	Thu Mar 30 12:18:22 2006
@@ -1,4 +1,4 @@
-Package: linux-nonfree-source- at version@
+Package: linux-source-nonfree- at version@
 Architecture: all
 Section: non-free/devel
 Priority: optional