[kernel] r15646 - dists/trunk/linux-2.6/debian
Ben Hutchings
benh at alioth.debian.org
Sat May 8 21:03:33 UTC 2010
Author: benh
Date: Sat May 8 21:02:55 2010
New Revision: 15646
Log:
Prepare debconf templates for translation (Closes: #576758)
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/rules.real
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Sat May 8 20:49:50 2010 (r15645)
+++ dists/trunk/linux-2.6/debian/changelog Sat May 8 21:02:55 2010 (r15646)
@@ -2,8 +2,12 @@
* New upstream release
+ [ maximilian attems ]
* topconfig enable IPV6_SIT_6RD, NETFILTER_XT_TARGET_CT, IP_VS_PROTO_SCTP,
NF_CONNTRACK_ZONES, CAN_PLX_PCI, TI_DAC7512.
+
+ [ Ben Hutchings ]
+ * Prepare debconf templates for translation (Closes: #576758)
-- maximilian attems <maks at debian.org> Wed, 05 May 2010 22:57:24 +0200
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real Sat May 8 20:49:50 2010 (r15645)
+++ dists/trunk/linux-2.6/debian/rules.real Sat May 8 21:02:55 2010 (r15646)
@@ -145,6 +145,7 @@
install-base:
dh_installchangelogs
dh_installdocs
+ dh_installdebconf
dh_strip
dh_compress
dh_fixperms
@@ -338,7 +339,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)'
@@ -393,7 +394,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' \
@@ -408,10 +408,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