r3602 - in trunk/kernel/source/linux-2.6-2.6.12/debian: . arch/s390
templates
Andres Salomon
dilinger at costa.debian.org
Wed Jul 20 21:13:54 UTC 2005
Author: dilinger
Date: 2005-07-20 21:13:54 +0000 (Wed, 20 Jul 2005)
New Revision: 3602
Modified:
trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390x
trunk/kernel/source/linux-2.6-2.6.12/debian/rules
trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in
Log:
fix desc for multiline scenarios. no, it's not pretty, but it works.
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile 2005-07-20 20:50:37 UTC (rev 3601)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile 2005-07-20 21:13:54 UTC (rev 3602)
@@ -194,7 +194,6 @@
-e "s/@subarch@/$(append)/g" \
-e "s/@flavour@/$$2/g" \
-e "s#@class@#$$class#g" \
- -e "s#@desc@#$$desc#g" \
-e 's/@ltver@/$(ltver)/g' \
-e 's/@srcver@/$(srcver)/g' \
-e 's/@lt_depends@/$(lt_depends)/g' \
@@ -202,12 +201,13 @@
-e 's/@abiname@/$(abiname)/g' | \
sed '/^[[:space:]]*$$/d' | \
sed 's/^Package:/\n&/g'; \
+ [ -z "$$3" ] || printf "$$desc\n"; \
}; \
substitute source.in "" >> $(tkdir)/debian/control; \
substitute headers.in "" >> $(tkdir)/debian/control; \
for f in $(flavours); do \
substitute headers.flavour.in $$f >> $(tkdir)/debian/control; \
- substitute image.in $$f >> $(tkdir)/debian/control; \
+ substitute image.in $$f "1" >> $(tkdir)/debian/control; \
done
touch $(tkdir)/debian/official
if [ -n '$(patches)' ]; then \
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390 2005-07-20 20:50:37 UTC (rev 3601)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390 2005-07-20 21:13:54 UTC (rev 3602)
@@ -1,2 +1,3 @@
class="IBM S/390-class"
-desc="This kernel has support to IPL (boot) from a VM reader or DASD device."
+desc=" .
+ This kernel has support to IPL (boot) from a VM reader or DASD device."
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390x
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390x 2005-07-20 20:50:37 UTC (rev 3601)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390x 2005-07-20 21:13:54 UTC (rev 3602)
@@ -1,2 +1,3 @@
class="IBM zSeries-class"
-desc="This kernel has support to IPL (boot) from a VM reader or DASD device."
+desc=" .
+ This kernel has support to IPL (boot) from a VM reader or DASD device."
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/rules
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/rules 2005-07-20 20:50:37 UTC (rev 3601)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/rules 2005-07-20 21:13:54 UTC (rev 3602)
@@ -269,7 +269,6 @@
-e "s/@subarch@/$$sa/g" \
-e "s/@flavour@/$$3/g" \
-e "s#@class@#$$class#g" \
- -e "s#@desc@#$$desc#g" \
-e 's/@ltver@/$(ltver)/g' \
-e 's/@srcver@/$(srcver)/g' \
-e 's/@lt_depends@/$(lt_depends)/g' \
@@ -278,6 +277,7 @@
-e "s/@allheaders@/$$all_headers_pkgs/g" | \
sed '/^[[:space:]]*$$/d' | \
sed 's/^Package:/\n&/g'; \
+ [ -z "$$4" ] || printf "$$desc\n"; \
}; \
substitute source.in "" "" >> control.tmp; \
substitute main.in "" "" >> control.tmp; \
@@ -285,7 +285,7 @@
for a in $(archs); do \
for f in $$(list_flavours $$a); do \
substitute headers.flavour.in $$a $$f >> control.tmp; \
- substitute image.in $$a $$f >> control.tmp; \
+ substitute image.in $$a $$f "1" >> control.tmp; \
done; \
done
mv control.tmp debian/control
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in 2005-07-20 20:50:37 UTC (rev 3601)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in 2005-07-20 21:13:54 UTC (rev 3602)
@@ -10,4 +10,3 @@
Description: Linux kernel @version@ image on @class@ machines
This package provides the binary image and pre-built loadable modules for
Linux kernel @version@ on @class@ machines.
- @desc@
More information about the Kernel-svn-changes
mailing list