[Modconf-commits] r194 - in trunk/modconf: . debian
Frank Lichtenheld
djpig at debian.org
Fri Nov 10 09:05:40 CET 2006
Author: djpig
Date: 2006-11-10 09:05:40 +0100 (Fri, 10 Nov 2006)
New Revision: 194
Removed:
trunk/modconf/debian/mkpcmciadesc.pl
Modified:
trunk/modconf/Makefile
trunk/modconf/debian/changelog
trunk/modconf/debian/control
trunk/modconf/debian/rules
Log:
Remove dependency on 2.4 kernel source and remove support for
using pcmcia-source completly. Closes: #395229
Modified: trunk/modconf/Makefile
===================================================================
--- trunk/modconf/Makefile 2005-08-29 00:00:50 UTC (rev 193)
+++ trunk/modconf/Makefile 2006-11-10 08:05:40 UTC (rev 194)
@@ -21,7 +21,6 @@
MANPAGES = modconf.8 modconf.8.pl modconf.8.fr modconf.8.es
-KERNELTREE24=/usr/src/linux-2.4
KERNELTREE26=/usr/src/linux
all: descr.gz $(EVALTARGETS) #eval.gz
@@ -63,18 +62,12 @@
cat build/$@.1 build/$@.4 build/$@.2 > $@
rm -f build/$@.[1-4]
-build/eval_%.auto: build/pcmcia-src build/kerneldsc
+build/eval_%.auto: build/kerneldsc
[ -d build ] || mkdir build
- ( cat build/kerneldsc ; debian/mkpcmciadesc.pl build/pcmcia-src) | sort | uniq > $@
build/kerneldsc:
- debian/mkkerneldesc.pl "$(KERNELTREE24)" > build/kerneldsc
debian/mkkerneldesc.pl "$(KERNELTREE26)" >> build/kerneldsc
-build/pcmcia-src:
- mkdir -p build/pcmcia-src || true
- zcat /usr/src/pcmcia-cs.tar.gz | tar -x -C build/pcmcia-src
-
count: $(EVALTARGETS)
@for i in $(EVALTARGETS); do \
echo -n "$$i "; \
Modified: trunk/modconf/debian/changelog
===================================================================
--- trunk/modconf/debian/changelog 2005-08-29 00:00:50 UTC (rev 193)
+++ trunk/modconf/debian/changelog 2006-11-10 08:05:40 UTC (rev 194)
@@ -1,3 +1,10 @@
+modconf (0.3.1) unstable; urgency=low
+
+ * Remove dependency on 2.4 kernel source and remove support for
+ using pcmcia-source completly. Closes: #395229
+
+ -- Frank Lichtenheld <djpig at debian.org> Fri, 10 Nov 2006 09:03:09 +0100
+
modconf (0.3.0) unstable; urgency=low
* Apply fixes to Spanish man page by Ruben Porras (Closes: #310275)
Modified: trunk/modconf/debian/control
===================================================================
--- trunk/modconf/debian/control 2005-08-29 00:00:50 UTC (rev 193)
+++ trunk/modconf/debian/control 2006-11-10 08:05:40 UTC (rev 194)
@@ -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, linux-tree-2.6.12
+Build-Depends-Indep: linux-tree-2.6.18
Standards-Version: 3.6.2
Package: modconf
Deleted: trunk/modconf/debian/mkpcmciadesc.pl
===================================================================
--- trunk/modconf/debian/mkpcmciadesc.pl 2005-08-29 00:00:50 UTC (rev 193)
+++ trunk/modconf/debian/mkpcmciadesc.pl 2006-11-10 08:05:40 UTC (rev 194)
@@ -1,34 +0,0 @@
-#!/usr/bin/perl
-
-# (c) 2002 Eduard Bloch <blade at debian.org>, GPLv2
-
-use strict;
-
-if ( -z "$ARGV[0]" ) {
- print STDERR "Usage: $0 pcmcia-source-file\n";
- exit 1;
-}
-
-open(find, "find $ARGV[0] |");
-
-while(<find>)
-{
- my $file = $_;
- /^.*\/([^\/]+)\.c$/;
- my $basename = $1;
- $basename =~ s/[-,\+]/_/g;
- open(src, "<$file");
- while(<src>)
- {
- if(/^MODULE_DESCRIPTION\("([^"]+)$/)
- {
- print STDERR "WARNING: $basename has unuseable description, ignoring it.\n";
- }
-
- if($_ =~ s/^MODULE_DESCRIPTION\("([^"]+)".*/summary_$basename="$1"/)
- {
- print $_;
- }
- }
- close(src);
-}
Modified: trunk/modconf/debian/rules
===================================================================
--- trunk/modconf/debian/rules 2005-08-29 00:00:50 UTC (rev 193)
+++ trunk/modconf/debian/rules 2006-11-10 08:05:40 UTC (rev 194)
@@ -1,10 +1,6 @@
#!/usr/bin/make -f
# copied from kernel-image-i386
-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 \
@@ -14,15 +10,11 @@
build-stamp:
dh_testdir
[ -d build ] || mkdir build
- 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)
+ $(MAKE) KERNELTREE26=$(CURDIR)/build/linux-source-$(version26)
touch build-stamp
clean:
More information about the Modconf-commits
mailing list