From: Dinko Korunic <kreator@carnet.hr>
Date: Mon, 1 Jun 2009 12:18:40 +0000 (+0200)
Subject: - updateovi da paket radi i na i386 i na amd64
X-Git-Tag: debian/2.6.26-4~9
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=kernel-cn.git;a=commitdiff_plain;h=3381137bc9be8302e6274ea0fc2454a878cfe1cd

- updateovi da paket radi i na i386 i na amd64
---

diff --git a/debian/changelog b/debian/changelog
index 9961791..7157341 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 kernel-2.6-cn (3:2.6.26-1) stable; urgency=high
 
-  * novi upstream kernel (linux-image-2.6.26-2+cn1-686-bigmem)
+  * novi upstream kernel (linux-image-2.6.26-2+cn1-*)
   * prvo izdanje za Lenny
+  * paket koji radi na amd64 i na i386 arhitekturi
 
- -- Dinko Korunic <kreator@carnet.hr>  Sat, 30 May 2009 15:50:35 +0200
+ -- Dinko Korunic <kreator@carnet.hr>  Mon, 01 Jun 2009 14:17:52 +0200
 
 kernel-2.6-cn (3:2.6.24-2) stable; urgency=high
 
diff --git a/debian/control b/debian/control
index fa6e6b3..9fde4c7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,13 @@ Build-Depends: debhelper (>= 4)
 Standards-Version: 3.7.2
 
 Package: kernel-2.6-cn
-Architecture: i386
+Architecture: all
 Section: base
-Depends: grub (>= 0.97-47lenny2), procps (>= 1:3.2.7-11), udev (>= 0.125-7+lenny1), perl-base, carnet-tools-cn (>= 2.8.2), module-init-tools (>= 3.4-1), mount (>= 2.13.1.1-1), e2fsprogs (>= 1.41.3-1), microcode.ctl (>= 1.17-9), irqbalance (>= 0.55-2.4lenny1), mdadm (>= 2.6.7.2-1), linux-image-2.6.26-2+cn1-686-bigmem (>= 2.6.26-15lenny2+cn1)
+Depends: grub (>= 0.97-47lenny2), procps (>= 1:3.2.7-11), udev (>= 0.125-7+lenny1), perl-base, carnet-tools-cn (>= 2.8.2), module-init-tools (>= 3.4-1), mount (>= 2.13.1.1-1), e2fsprogs (>= 1.41.3-1), microcode.ctl (>= 1.17-9), irqbalance (>= 0.55-2.4lenny1), mdadm (>= 2.6.7.2-1), linux-image-2.6.26-2+cn1-686-bigmem (>= 2.6.26-15lenny2+cn1) | linux-image-2.6.26-2+cn1-amd64 (>= 2.6.26-15lenny2+cn1)
 Conflicts: iplogger, kernel-cn, kernel-2.4-cn (<< 2.4.33-2)
 Replaces: kernel-cn, kernel-2.4-cn
 Provides: kernel-cn
-Recommends: memtest86+, linux-headers-2.6.26-2+cn1-686-bigmem
+Recommends: memtest86+, linux-headers-2.6.26-2+cn1-686-bigmem | linux-headers-2.6.26-2+cn1-amd64
 Description: Linux kernel virtual package for CARNet Linux servers
  This package is virtual package providing correct Linux kernel environment
  for CARNet Debian Linux servers.
diff --git a/debian/postinst b/debian/postinst
index fd8dbf6..b413e81 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -109,8 +109,12 @@ echo -n " kernel-img.conf"
 # generate initial grub loaders
 if [ ! -d "$grub_dir" ]; then
     mkdir -p "$grub_dir"
+    # x86
     if [ -d /usr/lib/grub/i386-pc ]; then
         cp -a /usr/lib/grub/i386-pc/* "$grub_dir"
+    # x86_64
+    elif [ -d /usr/lib/grub/x86_64-pc ]; then
+        cp -a /usr/lib/grub/x86_64-pc/* "$grub_dir"
     fi
 fi
 echo -n " grub1"