build: add lpia support back in

diff --git a/debian/changelog b/debian/changelog
index abac3791f483f35aabb8eac6628fe258353bf71d..b9487f6502bae0ba34440950dfa897da5898fc4b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+util-linux (2.13~rc3-3) unstable; urgency=low
+
+  * Merge lpia support from ubuntu.
+
+ -- LaMont Jones <lamont@debian.org>  Thu,  9 Aug 2007 08:50:42 -0600
+
+util-linux (2.13~rc3-2ubuntu2) gutsy; urgency=low
+
+  * Add lpia support back in.  sorry.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Thu,  9 Aug 2007 08:48:21 -0600
+
+util-linux (2.13~rc3-2ubuntu1) gutsy; urgency=low
+
+  * New debian version.  Remaining ubuntu changes:
+    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
+      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
+      + debian/rules: Install those.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Wed,  8 Aug 2007 13:22:04 -0600
+
 util-linux (2.13~rc3-2) unstable; urgency=low
 
   * mount should Suggest nfs-common, not Recommend it.

diff --git a/debian/control b/debian/control
index 9691855bba204fcc9a4405865afbd0346bbc07a3..4b16760cd9ab95cb4910408da0bf0281bd3b3240 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Description: Locales files for util-linux
  messages in other languages than English.
 
 Package: mount
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m32r m68k mips mipsel powerpc ppc64 sh s390 sparc sparc64
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh s390 sparc sparc64
 Essential: yes
 Section: admin
 Pre-Depends: ${mount:Depends}
@@ -59,7 +59,7 @@ Description: Basic utilities from 4.4BSD-Lite
  Included are: logger, renice, replay, script, wall
 
 Package: fdisk-udeb
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m32r mips mipsel powerpc ppc64 hurd-i386 sparc s390
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sparc s390
 Priority: extra
 Section: debian-installer
 Depends: ${fdisk-udeb:Depends}
@@ -67,7 +67,7 @@ Description: Partition a hard drive (manual)
  fdisk package
 
 Package: cfdisk-udeb
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m32r mips mipsel powerpc ppc64 hurd-i386 s390
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 s390
 Priority: extra
 Section: debian-installer
 Depends: ${cfdisk-udeb:Depends}

diff --git a/debian/rules b/debian/rules
index b9b514c0c6fa233914bec7b0bbc29c26f32073d2..f8fb0065d2a9b61bad3151fd4525c171957d3ee9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,8 @@ endif
 export arch = $(DEB_HOST_ARCH)
 version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog)
 
-fdisk_arch = $(findstring $(arch),alpha i386 powerpc ppc64 arm armeb armel m32r mips mipsel hppa ia64 hurd-i386 amd64 s390)
-rdev_arch = $(findstring $(arch),i386 amd64)
+fdisk_arch = $(findstring $(arch),alpha i386 powerpc ppc64 arm armeb armel m32r mips mipsel hppa ia64 hurd-i386 amd64 s390 lpia)
+rdev_arch = $(findstring $(arch),i386 amd64 lpia)
 sparc = $(findstring $(arch),sparc sparc64)
 nohwclock = $(findstring $(arch),s390)