[Pkg-utopia-commits] r133 - in packages/hal/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2004-12-02 05:59:44 -0700 (Thu, 02 Dec 2004)
New Revision: 133

Removed:
   packages/hal/trunk/debian/patches/device-manager-glade.patch
   packages/hal/trunk/debian/patches/device-manager.patch
Modified:
   packages/hal/trunk/debian/changelog
Log:
Preperation for new upstream release

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-11-29 16:16:36 UTC (rev 132)
+++ packages/hal/trunk/debian/changelog	2004-12-02 12:59:44 UTC (rev 133)
@@ -1,8 +1,11 @@
-hal (0.4.1-3) UNRELEASED; urgency=low
+hal (0.4.2-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release
+  * Remove patches that have been merged upstream:
+    + debian/patches/device-manager-glade.patch
+    + debian/patches/device-manager.patch
 
- -- Sjoerd Simons <sjoerd@debian.org>  Fri, 26 Nov 2004 22:46:20 +0100
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu,  2 Dec 2004 13:13:50 +0100
 
 hal (0.4.1-2) unstable; urgency=low
 

Deleted: packages/hal/trunk/debian/patches/device-manager-glade.patch
===================================================================
--- packages/hal/trunk/debian/patches/device-manager-glade.patch	2004-11-29 16:16:36 UTC (rev 132)
+++ packages/hal/trunk/debian/patches/device-manager-glade.patch	2004-12-02 12:59:44 UTC (rev 133)
@@ -1,55 +0,0 @@
-Index: tools/device-manager/hal-device-manager.glade
-===================================================================
-RCS file: /cvs/hal/hal/tools/device-manager/hal-device-manager.glade,v
-retrieving revision 1.2
-diff -u -r1.2 hal-device-manager.glade
---- tools/device-manager/hal-device-manager.glade	4 Jan 2004 17:48:37 -0000	1.2
-+++ tools/device-manager/hal-device-manager.glade	6 Nov 2004 13:43:24 -0000
-@@ -173,9 +173,9 @@
- 		      <property name="use_underline">False</property>
- 		      <property name="use_markup">True</property>
- 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
--		      <property name="wrap">True</property>
-+		      <property name="wrap">False</property>
- 		      <property name="selectable">False</property>
--		      <property name="xalign">0.5</property>
-+		      <property name="xalign">1</property>
- 		      <property name="yalign">0.5</property>
- 		      <property name="xpad">0</property>
- 		      <property name="ypad">0</property>
-@@ -199,9 +199,9 @@
- 		      <property name="use_underline">False</property>
- 		      <property name="use_markup">True</property>
- 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
--		      <property name="wrap">True</property>
-+		      <property name="wrap">False</property>
- 		      <property name="selectable">False</property>
--		      <property name="xalign">0.5</property>
-+		      <property name="xalign">1</property>
- 		      <property name="yalign">0.5</property>
- 		      <property name="xpad">0</property>
- 		      <property name="ypad">0</property>
-@@ -251,9 +251,9 @@
- 		      <property name="use_underline">False</property>
- 		      <property name="use_markup">True</property>
- 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
--		      <property name="wrap">True</property>
-+		      <property name="wrap">False</property>
- 		      <property name="selectable">False</property>
--		      <property name="xalign">0.5</property>
-+		      <property name="xalign">1</property>
- 		      <property name="yalign">0.5</property>
- 		      <property name="xpad">0</property>
- 		      <property name="ypad">0</property>
-@@ -329,9 +329,9 @@
- 		      <property name="use_underline">False</property>
- 		      <property name="use_markup">True</property>
- 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
--		      <property name="wrap">True</property>
-+		      <property name="wrap">False</property>
- 		      <property name="selectable">False</property>
--		      <property name="xalign">0.5</property>
-+		      <property name="xalign">1</property>
- 		      <property name="yalign">0.5</property>
- 		      <property name="xpad">0</property>
- 		      <property name="ypad">0</property>

Deleted: packages/hal/trunk/debian/patches/device-manager.patch
===================================================================
--- packages/hal/trunk/debian/patches/device-manager.patch	2004-11-29 16:16:36 UTC (rev 132)
+++ packages/hal/trunk/debian/patches/device-manager.patch	2004-12-02 12:59:44 UTC (rev 133)
@@ -1,27 +0,0 @@
-Index: tools/device-manager/DeviceManager.py
-===================================================================
-RCS file: /cvs/hal/hal/tools/device-manager/DeviceManager.py,v
-retrieving revision 1.15
-diff -u -r1.15 DeviceManager.py
---- tools/device-manager/DeviceManager.py	1 Sep 2004 17:38:59 -0000	1.15
-+++ tools/device-manager/DeviceManager.py	6 Nov 2004 12:44:24 -0000
-@@ -355,9 +355,16 @@
-             product.set_label("Unknown")
-             vendor.set_label("Unknown")
- 
--        # clear category, capabilities
--        category.set_label("Unknown")
--        capabilities.set_label("Unknown")
-+        # set category, capabilities
-+        if device.properties.has_key("info.category"):
-+            category.set_label("%s"%device.properties["info.category"])
-+        else:
-+            category.set_label("Unknown")
-+
-+        if device.properties.has_key("info.capabilities"):
-+            capabilities.set_label("%s"%device.properties["info.capabilities"])
-+        else:
-+            capabilities.set_label("Unknown")
- 
-     def update_tab_usb(self, device):
-         """Updates the 'USB' tab given a Device object; may hide it"""