debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge /dists/sid/linux-2.6. 

svn path=/dists/trunk/linux-2.6/; revision=6490
This commit is contained in:
Bastian Blank 2006-04-28 22:01:54 +00:00
parent b47523b093
commit 4027080008
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/arch/amd64/defines vendored
View File

@ -13,8 +13,9 @@ subarches:
xen-vserver
[image]
conflicts: grub (<= 0.95+cvs20040624-17)
depends: e2fsprogs (>= 1.35-7)
suggests: grub | lilo (>= 19.1)
suggests: grub (>= 0.97-3) | lilo (>= 19.1)
[amd64-generic]
class: all x86-64

3
debian/arch/i386/defines vendored
View File

@ -13,7 +13,8 @@ subarches:
xen-vserver
[image]
suggests: grub | lilo (>= 19.1)
conflicts: grub (<= 0.95+cvs20040624-17)
suggests: grub (>= 0.97-3) | lilo (>= 19.1)
[686]
class: PPro/Celeron/PII/PIII/P4

3
debian/changelog vendored
View File

@ -13,8 +13,9 @@ linux-2.6 (2.6.16-11) UNRELEASED; urgency=low
* Update vserver patch to 2.0.2-rc18.
- Limit ccaps to root inside a guest
* Conflict with known broken grub versions. (closes: #361308)
-- Bastian Blank <waldi@debian.org> Fri, 28 Apr 2006 16:08:01 +0200
-- Bastian Blank <waldi@debian.org> Fri, 28 Apr 2006 22:52:13 +0200
linux-2.6 (2.6.16-10) unstable; urgency=low

2
debian/rules vendored
View File

@ -37,7 +37,7 @@ $(BUILD_DIR) $(STAMPS_DIR):
@[ -d $@ ] || mkdir $@
orig: ../orig/linux-$(MAJOR)-$(VERSION)
rsync --delete --exclude debian --exclude .svn --link-dest=../orig/linux-$(MAJOR)-$(VERSION)/ -av ../orig/linux-$(MAJOR)-$(VERSION)/ .
rsync --delete --exclude debian --exclude .svn --link-dest=../orig/linux-$(MAJOR)-$(VERSION)/ -a ../orig/linux-$(MAJOR)-$(VERSION)/ .
../orig/linux-$(MAJOR)-$(VERSION):
if [ -f "../linux-$(MAJOR)_$(VERSION).orig.tar.gz" ]; then \