[kernel] r5915 - in dists/trunk/linux-2.6: . debian debian/bin
debian/lib/python/debian_linux
Bastian Blank
waldi at costa.debian.org
Fri Feb 17 15:50:40 UTC 2006
Author: waldi
Date: Fri Feb 17 15:50:39 2006
New Revision: 5915
Removed:
dists/trunk/linux-2.6/debian/bin/touch
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py
dists/trunk/linux-2.6/debian/rules.real
Log:
r5566: waldi | 2006-01-22 21:27:35 +0100
debian/lib/python/debian_linux/utils.py: Remove old class.
r5694: waldi | 2006-02-03 01:03:03 +0100
debian/lib/python/debian_linux/utils.py: Fix class name.
r5827: waldi | 2006-02-11 23:21:50 +0100
* debian/bin/touch: Remove.
* debian/rules.real: Remove touch.orig setup.
r5828: waldi | 2006-02-11 23:24:10 +0100
debian/rules.real: Don't overwrite parts of the kernel source.
r5873: waldi | 2006-02-13 23:09:59 +0100
debian/rules.real: Always call dh_installdocs and dh_installchangelogs.
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py Fri Feb 17 15:50:39 2006
@@ -1,19 +1,24 @@
import debian, re, textwrap
-class _sorted_dict(dict):
- __slots__ = ('_list')
+class sorted_dict(dict):
+ __slots__ = '_list',
def __init__(self, entries = None):
- super(_sorted_dict, self).__init__()
+ super(sorted_dict, self).__init__()
self._list = []
if entries is not None:
for key, value in entries:
self[key] = value
def __delitem__(self, key):
- super(_sorted_dict, self).__delitem__(key)
+ super(sorted_dict, self).__delitem__(key)
self._list.remove(key)
+ def __setitem__(self, key, value):
+ super(sorted_dict, self).__setitem__(key, value)
+ if key not in self._list:
+ self._list.append(key)
+
def iterkeys(self):
for i in iter(self._list):
yield i
@@ -26,14 +31,6 @@
for i in iter(self._list):
yield self[i]
-class sorted_dict(_sorted_dict):
- __slots__ = ()
-
- def __setitem__(self, key, value):
- super(sorted_dict, self).__setitem__(key, value)
- if key not in self._list:
- self._list.append(key)
-
class field_list(list):
TYPE_WHITESPACE = object()
TYPE_COMMATA = object()
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Fri Feb 17 15:50:39 2006
@@ -100,11 +100,6 @@
mkdir -p '$(DIR)'
cp -al $(srcfiles) '$(DIR)'
$(patch_cmd)
- #make-kpkg does this when building kernel-source.
- mv '$(DIR)/scripts/package/Makefile' '$(DIR)/scripts/package/Makefile.dist'
- mv '$(DIR)/scripts/package/builddeb' '$(DIR)/scripts/package/builddeb.dist'
- echo "# Dummy Makefile" > '$(DIR)/scripts/package/Makefile'
- echo "all:" >> '$(DIR)/scripts/package/Makefile'
touch '$@'
$(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/source
@@ -126,7 +121,6 @@
#
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
- ln -fs "$$(command -v touch)" debian/build/touch.orig
cd '$(DIR)'; $(setup_env) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
touch '$@'
@@ -140,6 +134,8 @@
touch '$@'
install-base:
+ dh_installchangelogs
+ dh_installdocs
dh_compress
dh_fixperms
dh_installdeb
@@ -172,8 +168,6 @@
dh_testdir
dh_testroot
dh_clean -d -k
- dh_installchangelogs
- dh_installdocs
$(MAKE) -f debian/rules.real install-base
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -303,8 +297,6 @@
dh_testdir
dh_testroot
dh_install $(DH_OPTIONS) debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
- dh_installdocs $(DH_OPTIONS)
- dh_installchangelogs $(DH_OPTIONS)
dh_python $(DH_OPTIONS) -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
@@ -329,8 +321,6 @@
chmod 755 '$(pfull)/apply/debian' '$(pfull)/unpatch/debian'
chmod 644 '$(pfull)/debian/'*.patch
bzip2 -9 '$(pfull)/debian/'*.patch
- dh_installdocs $(DH_OPTIONS)
- dh_installchangelogs $(DH_OPTIONS)
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
install-source: DH_OPTIONS = -plinux-source-$(VERSION)
@@ -338,8 +328,6 @@
dh_testdir
dh_testroot
dh_install $(DH_OPTIONS) '$<' /usr/src
- dh_installdocs $(DH_OPTIONS) README
- dh_installchangelogs $(DH_OPTIONS)
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
install-tree: DH_OPTIONS = -plinux-tree-$(VERSION)
More information about the Kernel-svn-changes
mailing list