[kernel] r15491 - dists/sid/linux-2.6/debian
Ben Hutchings
benh at alioth.debian.org
Tue Apr 6 02:50:23 UTC 2010
Author: benh
Date: Tue Apr 6 02:50:18 2010
New Revision: 15491
Log:
Use debhelper to install control files for linux-image-*
debhelper automatically includes debconf translations so we won't have
to worry about the details. It also sets permissions correctly for
the control files.
Modified:
dists/sid/linux-2.6/debian/rules.real
Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real Tue Apr 6 01:04:08 2010 (r15490)
+++ dists/sid/linux-2.6/debian/rules.real Tue Apr 6 02:50:18 2010 (r15491)
@@ -142,6 +142,7 @@
install-base:
dh_installchangelogs
dh_installdocs
+ dh_installdebconf
dh_strip
dh_compress
dh_fixperms
@@ -333,7 +334,7 @@
endif
+$(MAKE_SELF) \
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates \
- PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
+ PACKAGE_NAME='$(PACKAGE_NAME)' PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
+$(MAKE_SELF) \
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \
PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
@@ -388,7 +389,6 @@
install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = zipl
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
- install -d $(PACKAGE_DIR)/DEBIAN
for i in $(wildcard debian/templates/temp.image.plain/*); do \
sed \
-e 's,=D,/boot,g' \
@@ -403,10 +403,8 @@
-e 's/=V/$(REAL_VERSION)/g' \
-e 's/=M//g' \
-e 's/=S//g' \
- $$i > $(PACKAGE_DIR)/DEBIAN/$$(basename $$i); \
+ $$i > debian/$(PACKAGE_NAME).$$(basename $$i); \
done
- chmod 755 $(PACKAGE_DIR)/DEBIAN/{pre,post}*
- chmod 644 $(PACKAGE_DIR)/DEBIAN/templates
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug:
dh_installdirs usr/share/bug/$(PACKAGE_NAME)
More information about the Kernel-svn-changes
mailing list