[kernel] r6006 - in people/waldi/linux-2.6/debian: . lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Thu Mar  2 10:16:14 2006
New Revision: 6006

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   people/waldi/linux-2.6/debian/rules.real
Log:
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
  - Use SOURCEVERSION.
  - Fix another brocken ABINAME usage.


Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Thu Mar  2 10:16:14 2006
@@ -37,7 +37,7 @@
         makeflags = {
             'VERSION': self.version['version'],
             'SOURCE_UPSTREAM': self.version['source_upstream'],
-            'SOURCE_VERSION': self.version['source'],
+            'SOURCEVERSION': self.version['source'],
             'UPSTREAMVERSION': self.version['upstream'],
             'ABINAME': self.abiname,
             'REVISIONS': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Thu Mar  2 10:16:14 2006
@@ -90,7 +90,7 @@
 	rm -rf '$(DIR)'
 
 define patch_cmd
-cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
+cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches' --overwrite-source='$(SOURCEVERSION)' --overwrite-revisions='$(REVISIONS)'
 endef
 
 srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
@@ -297,7 +297,7 @@
 	dh_python $(DH_OPTIONS) -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
 
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(VERSION)-$(ABINAME)$(LOCALVERSION)
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -325,7 +325,7 @@
 	dh_testroot
 	dh_clean -d -k
 	dh_installdirs 'boot'
-	cp '$(SOURCE_DIR)/vmlinuz' $(PACKAGE_DIR)/boot/vmlinuz-$(VERSION)-$(ABINAME)$(LOCALVERSION)
+	cp '$(SOURCE_DIR)/vmlinuz' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
 	cd '$(SOURCE_DIR)'; $(setup_env) make modules_install ARCH=$(KERNEL_ARCH) INSTALL_MOD_PATH=$(PACKAGE_DIR)
 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
 
@@ -344,7 +344,7 @@
 	sed \
 	  -e 's, at home@,$(pbase)/debian,' \
 	  -e 's, at revisions@,$(REVISIONS),' \
-	  -e 's, at source@,$(SOURCE_VERSION),' \
+	  -e 's, at source@,$(SOURCEVERSION),' \
 	  debian/bin/apply.py > '$(pfull)/apply/debian'
 	sed -e 's/@upstream@/$(SOURCE_UPSTREAM)/g' debian/bin/unpatch > '$(pfull)/unpatch/debian'
 	chmod 755 '$(pfull)/apply/debian' '$(pfull)/unpatch/debian'