[Modconf-commits] r187 - in trunk/modconf: . debian

[Frank Lichtenheld]

Author: djpig
Date: 2005-08-28 22:06:28 +0000 (Sun, 28 Aug 2005)
New Revision: 187

Modified:
   trunk/modconf/Makefile
   trunk/modconf/debian/changelog
   trunk/modconf/debian/control
   trunk/modconf/debian/rules
Log:
Use descriptions both from 2.6 and 2.4 which removes most of
the "(no description available)" messages


Modified: trunk/modconf/Makefile
===================================================================
--- trunk/modconf/Makefile	2005-08-28 22:00:35 UTC (rev 186)
+++ trunk/modconf/Makefile	2005-08-28 22:06:28 UTC (rev 187)
@@ -21,7 +21,8 @@
 
 MANPAGES = modconf.8 modconf.8.pl modconf.8.fr modconf.8.es
 
-KERNELTREE=/usr/src/linux
+KERNELTREE24=/usr/src/linux-2.4
+KERNELTREE26=/usr/src/linux
 
 all:	descr.gz $(EVALTARGETS) #eval.gz
 
@@ -67,7 +68,8 @@
 	( cat build/kerneldsc ; debian/mkpcmciadesc.pl build/pcmcia-src) | sort | uniq > $@
 
 build/kerneldsc:
-	debian/mkkerneldesc.pl "$(KERNELTREE)" > build/kerneldsc
+	debian/mkkerneldesc.pl "$(KERNELTREE24)" >  build/kerneldsc
+	debian/mkkerneldesc.pl "$(KERNELTREE26)" >> build/kerneldsc
 
 build/pcmcia-src:
 	mkdir -p build/pcmcia-src || true

Modified: trunk/modconf/debian/changelog
===================================================================
--- trunk/modconf/debian/changelog	2005-08-28 22:00:35 UTC (rev 186)
+++ trunk/modconf/debian/changelog	2005-08-28 22:06:28 UTC (rev 187)
@@ -1,8 +1,10 @@
 modconf (0.2.50) UNRELEASED; urgency=low
 
   * Apply fixes to Spanish man page by Ruben Porras (Closes: #310275)
+  * Use descriptions both from 2.6 and 2.4 which removes most of
+    the "(no description available)" messages
 
- --
+ -- Frank Lichtenheld <djpig at debian.org>  Sun, 28 Aug 2005 23:59:28 +0200
 
 modconf (0.2.49) unstable; urgency=low
 

Modified: trunk/modconf/debian/control
===================================================================
--- trunk/modconf/debian/control	2005-08-28 22:00:35 UTC (rev 186)
+++ trunk/modconf/debian/control	2005-08-28 22:06:28 UTC (rev 187)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Frank Lichtenheld <djpig at debian.org>
 Build-Depends: debhelper (>= 4)
-Build-Depends-Indep: pcmcia-source, kernel-tree-2.4.27
+Build-Depends-Indep: pcmcia-source, kernel-tree-2.4.27, linux-tree-2.6.12
 Standards-Version: 3.6.1
 
 Package: modconf

Modified: trunk/modconf/debian/rules
===================================================================
--- trunk/modconf/debian/rules	2005-08-28 22:00:35 UTC (rev 186)
+++ trunk/modconf/debian/rules	2005-08-28 22:06:28 UTC (rev 187)
@@ -1,19 +1,28 @@
 #!/usr/bin/make -f
 
 # copied from kernel-image-i386
-version :=  $(shell \
+version24 :=  $(shell \
         sed -n 's/.*kernel-tree-\([^,]*\).*/\1/p; t e; b; :e q' \
                 debian/control \
 )
+version26 :=  $(shell \
+        sed -n 's/.*linux-tree-\([^,]*\).*/\1/p; t e; b; :e q' \
+                debian/control \
+)
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 	[ -d build ] || mkdir build
-	cd build && tar xjf /usr/src/kernel-source-$(version).tar.bz2
-	cd build/kernel-source-$(version) && \
-		/usr/src/kernel-patches/all/$(version)/apply/debian $(version)
-	$(MAKE) KERNELTREE=$(CURDIR)/build/kernel-source-$(version)
+	cd build && tar xjf /usr/src/kernel-source-$(version24).tar.bz2
+	cd build && tar xjf /usr/src/linux-source-$(version26).tar.bz2
+	cd build/kernel-source-$(version24) && \
+		/usr/src/kernel-patches/all/$(version24)/apply/debian $(version24)
+	cd build/linux-source-$(version26) && \
+		override_version=$(version26) \
+		/usr/src/kernel-patches/all/$(version26)/apply/debian $(version26)
+	$(MAKE) KERNELTREE24=$(CURDIR)/build/kernel-source-$(version24) \
+		KERNELTREE26=$(CURDIR)/build/linux-source-$(version26)
 	touch build-stamp
 
 clean: