[Pkg-utopia-commits] r339 - packages/experimental/hal/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2005-10-28 12:36:23 +0000 (Fri, 28 Oct 2005)
New Revision: 339

Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/control
   packages/experimental/hal/debian/hal-device-manager.desktop
   packages/experimental/hal/debian/hal.install
   packages/experimental/hal/debian/hal.preinst
Log:
* Sync with ubuntu (Thanks Martin Pitt) 
  + Make libhal-storage-dev depend libhal-dev
  + Fix rm_conffile in hal.preinst
  + Install hal-find-by-capability and hal-find-by-property
  + Translation updates for hal-device-manager.desktop 



Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2005-10-28 12:15:12 UTC (rev 338)
+++ packages/experimental/hal/debian/changelog	2005-10-28 12:36:23 UTC (rev 339)
@@ -1,3 +1,13 @@
+hal (0.5.4-3) experimental; urgency=low
+
+  * Sync with ubuntu (Thanks Martin Pitt) 
+    + Make libhal-storage-dev depend libhal-dev
+    + Fix rm_conffile in hal.preinst
+    + Install hal-find-by-capability and hal-find-by-property
+    + Translation updates for hal-device-manager.desktop 
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 28 Oct 2005 14:29:35 +0200
+
 hal (0.5.4-2) experimental; urgency=low
 
   * Hal doesn't include hal.dev anymore, so don't try to execute it in the

Modified: packages/experimental/hal/debian/control
===================================================================
--- packages/experimental/hal/debian/control	2005-10-28 12:15:12 UTC (rev 338)
+++ packages/experimental/hal/debian/control	2005-10-28 12:36:23 UTC (rev 339)
@@ -98,7 +98,7 @@
 Package: libhal-storage-dev
 Section: libdevel
 Architecture: any
-Depends: libhal-storage1 (= ${Source-Version}), libdbus-1-dev
+Depends: libhal-storage1 (= ${Source-Version}), libdbus-1-dev, libhal-dev
 Suggests: hal-doc
 Description: Hardware Abstraction Layer - development files
  HAL provides an abstract view on hardware.

Modified: packages/experimental/hal/debian/hal-device-manager.desktop
===================================================================
--- packages/experimental/hal/debian/hal-device-manager.desktop	2005-10-28 12:15:12 UTC (rev 338)
+++ packages/experimental/hal/debian/hal-device-manager.desktop	2005-10-28 12:36:23 UTC (rev 339)
@@ -1,15 +1,29 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Device Manager
+Name[ca]=Gestor de dispositius
 Name[da]=Enhedshåndtering
 Name[de]=Gerätemanager
+Name[fa]=مدیر سخت افزار
 Name[fi]=Laitehallinta
-Name[it]=Gestore periferiche
+Name[fr]=Gestionnaire de périphériques
+Name[hu]=Eszközkezelő
+Name[it]=Gestore Periferiche
+Name[nl]=Apparaatbeheer
+Name[pt]=Gestor de dispositivos
+Name[pt_BR]=Gerenciador de Dispositivos
 Comment=HAL Device Manager
+Comment[ca]=Gestor de dispositius HAL
 Comment[da]=HAL - enhedshåndtering
 Comment[de]=HAL Gerätemanager
+Comment[fa]=مدیر سخت افزار HAL
 Comment[fi]=HAL-laitehallinta
+Comment[fr]=Gestionnaire de périphériques HAL
+Comment[hu]=HAL eszközkezelő
 Comment[it]=Gestore delle periferiche HAL
+Comment[nl]=HAL apparaatbeheer
+Comment[pt]=Gestor de dispositivos HAL
+Comment[pt_BR]=Gerenciador de dispositivos HAL
 Exec=hal-device-manager
 Icon=hwbrowser
 StartupNotify=true

Modified: packages/experimental/hal/debian/hal.install
===================================================================
--- packages/experimental/hal/debian/hal.install	2005-10-28 12:15:12 UTC (rev 338)
+++ packages/experimental/hal/debian/hal.install	2005-10-28 12:36:23 UTC (rev 339)
@@ -2,6 +2,8 @@
 debian/tmp/usr/bin/lshal
 debian/tmp/usr/bin/hal-get-property
 debian/tmp/usr/bin/hal-set-property
+debian/tmp/usr/bin/hal-find-by-capability
+debian/tmp/usr/bin/hal-find-by-property
 debian/tmp/usr/sbin/
 debian/tmp/usr/lib/hal/
 debian/tmp/usr/share/hal/fdi

Modified: packages/experimental/hal/debian/hal.preinst
===================================================================
--- packages/experimental/hal/debian/hal.preinst	2005-10-28 12:15:12 UTC (rev 338)
+++ packages/experimental/hal/debian/hal.preinst	2005-10-28 12:36:23 UTC (rev 339)
@@ -3,6 +3,7 @@
 set -e
 
 rm_conffile() {
+  CONFFILE="$1"
   if [ -e "$CONFFILE" ]; then
    md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
    old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"