[kernel] r7458 - in dists/trunk/linux-modules-extra-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Tue Sep 19 22:10:39 2006
New Revision: 7458

Modified:
   dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-modules-extra-2.6/debian/rules.real

Log:
* debian/bin/gencontrol.py: Add some version infos.
* debian/rules.real: Make versions of packages sane.


Modified: dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py	Tue Sep 19 22:10:39 2006
@@ -14,7 +14,8 @@
     def do_main_setup(self, vars, makeflags, extra):
         super(gencontrol, self).do_main_setup(vars, makeflags, extra)
         makeflags.update({
-            'SOURCEVERSION': self.version['linux']['source'],
+            'VERSION_SOURCE': self.version['linux']['source_upstream'],
+            'VERSION_DEBIAN': self.version['linux']['debian'],
         })
 
     def do_main_makefile(self, makefile, makeflags, extra):

Modified: dists/trunk/linux-modules-extra-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/rules.real	Tue Sep 19 22:10:39 2006
@@ -12,8 +12,8 @@
   JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
 endif
 
-MODULVERSION = $(shell dpkg -s $(MODULESOURCE) | perl -ne 'print $$1 if m/^Version: (.*)$$/;')
-ifeq (,$(MODULVERSION))
+MODULEVERSION = $(shell dpkg -s $(MODULESOURCE) | perl -ne 'print $$1 if m/^Version: (.*?)(-[^-]+)?$$/;')
+ifeq (,$(MODULEVERSION))
 $(error Was not able to retreive version of $(MODULESOURCE))
 endif
 
@@ -66,14 +66,18 @@
 install: PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
 
 install-real: PACKAGE_LATEST_NAME = $(MODULE)-modules-$(MAJOR)$(LOCALVERSION)
-install-real: PACKAGES = $(PACKAGE_NAME) $(PACKAGE_LATEST_NAME)
-install-real: DH_OPTIONS = $(foreach PACKAGE, $(PACKAGES), -p$(PACKAGE))
 
 install: $(BUILD_STAMP)
 install:
 	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
 
 install-real:
-	$(MAKE) -f debian/rules.real install install-base PACKAGES="$(PACKAGES)" GENCONTROL_ARGS="-v$(MODULVERSION)+$(SOURCEVERSION)"
+	$(MAKE) -f debian/rules.real install
+	$(MAKE) -f debian/rules.real install-base \
+		GENCONTROL_ARGS="-v$(VERSION_SOURCE)+$(MODULEVERSION)-$(VERSION_DEBIAN)" \
+		PACKAGE="$(PACKAGE_NAME)" DH_OPTIONS="-p$(PACKAGE_NAME)"
+	$(MAKE) -f debian/rules.real install-base \
+		GENCONTROL_ARGS="-v2:$(VERSION_SOURCE)-$(VERSION_DEBIAN)" \
+		PACKAGE="$(PACKAGE_LATEST_NAME)" DH_OPTIONS="-p$(PACKAGE_LATEST_NAME)"
 
 -include $(MODULE)/rules