Import changes by Andrew Fleckenstein

dbus-1.8.0.orig.tar.gz is excluded.

15 files changed, 51 insertions, 10 deletions

diff --git a/build b/build
index 9c37b34..f7a171c 100755
--- a/build
+++ b/build
@@ -13,3 +13,15 @@ dbus.buildstamp:
 	oh-gencontrol $(PKGS)
 	oh-buildopk $(PKGS)
 	touch dbus.buildstamp
+
+nop:
+	@:
+
+build:
+	oh-autoconfigure
+	oh-autobuild
+	touch $@
+
+install: build
+	oh-autoinstall
+	oh-installfiles
diff --git a/changelog b/changelog
index 5d790ba..f72d0e8 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,8 @@
+dbus (1.8.0-1) trunk
+  * New upstream version
+  * Upgrade to SPF 2.0 and opkhelper 3.0
+ -- Andrew Fleckenstein <andrew.fleckenstein@gmail.com>  Tue, 25 Mar 2014 20:20:27 -0400
+
 D-Bus (1.4.20)
   * Initial Release
  -- Kurt Meyer <kem2@njit.edu> Sat, 28 Apr 2012 17:31:49 -0400
diff --git a/control b/control
index 98adb07..a84d472 100644
--- a/control
+++ b/control
@@ -1,5 +1,3 @@
-Source: dbus
-Version: 1.4.20-1
-Maintainer: "Kurt Meyer" <kem2@njit.edu>
+Maintainer: "Andrew Fleckenstein" <andrew.fleckenstein@gmail.com>
 Build-Depends: make, gcc-4.6, expat, libexpat.1-dev
 Homepage: http://www.freedesktop.org/wiki/Software/dbus
diff --git a/dbus-doc.pkg/control b/dbus-doc.pkg/control
index e03dbb9..2313db7 100644
--- a/dbus-doc.pkg/control
+++ b/dbus-doc.pkg/control
@@ -1,6 +1,6 @@
 Package: dbus
 Architecture: any
-Depends: expat
+Depends: todo expat
 Description: D-Bus is a message bus system for applications to talk to each
   other.
   .
diff --git a/dbus-doc.pkg/files b/dbus-doc.pkg/files
new file mode 100644
index 0000000..a501361
--- /dev/null
+++ b/dbus-doc.pkg/files
@@ -0,0 +1 @@
+/usr/share
\ No newline at end of file
diff --git a/dbus.pkg/control b/dbus.pkg/control
index a55057b..1151a2c 100644
--- a/dbus.pkg/control
+++ b/dbus.pkg/control
@@ -1,7 +1,7 @@
-Package: dbus
 Architecture: any
+Platform: all
 Depends: expat
-Description: D-Bus is a message bus system for applications to talk to each
-  other.
-  .
-  This package installs the dbus application.
+Description: D-Bus is a message bus system for applications to talk to
+ each other.
+ .
+ This package installs the dbus application and related configuration files.
diff --git a/dbus.pkg/files b/dbus.pkg/files
new file mode 100644
index 0000000..631e93f
--- /dev/null
+++ b/dbus.pkg/files
@@ -0,0 +1,2 @@
+/usr/bin/
+/etc/
\ No newline at end of file
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0
diff --git a/libdbus-1.3-dev.pkg/control b/libdbus-1.3-dev.pkg/control
new file mode 100644
index 0000000..fb703ad
--- /dev/null
+++ b/libdbus-1.3-dev.pkg/control
@@ -0,0 +1,8 @@
+Architecture: any
+Platform: all
+Depends: libdbus-1.3 (= 1.8.0-1) todo
+Description: D-Bus message bus system - development files.
+  D-Bus is a message bus system for applications to talk to each
+  other.
+  .
+  This package provides development files for D-Bus
\ No newline at end of file
diff --git a/libdbus-1.3-dev.pkg/files b/libdbus-1.3-dev.pkg/files
new file mode 100644
index 0000000..f3e0fc4
--- /dev/null
+++ b/libdbus-1.3-dev.pkg/files
@@ -0,0 +1,4 @@
+/usr/include
+/usr/lib/*/libdbus-1.so
+/usr/lib/*/libdbus-1.a
+/usr/lib/*/dbus-1.0/include
\ No newline at end of file
diff --git a/libdbus-1.3.pkg/#files# b/libdbus-1.3.pkg/#files#
new file mode 100644
index 0000000..2b723f5
--- /dev/null
+++ b/libdbus-1.3.pkg/#files#
@@ -0,0 +1 @@
+/usr/lib/
\ No newline at end of file
diff --git a/libdbus-1.3.pkg/.#files b/libdbus-1.3.pkg/.#files
new file mode 120000
index 0000000..c1914cc
--- /dev/null
+++ b/libdbus-1.3.pkg/.#files
@@ -0,0 +1 @@
+andrew@ajax.fleckhome.29277:1395784892
\ No newline at end of file
diff --git a/libdbus-1.3.pkg/control b/libdbus-1.3.pkg/control
new file mode 100644
index 0000000..dc49f61
--- /dev/null
+++ b/libdbus-1.3.pkg/control
@@ -0,0 +1,7 @@
+Architecture: any
+Platform: all
+Depends: expat, libexpat.1
+Description: D-Bus is a message bus system for applications to talk to each
+  other.
+  .
+  This package installs the dbus library files.
diff --git a/libdbus-1.3.pkg/files b/libdbus-1.3.pkg/files
new file mode 100644
index 0000000..2b723f5
--- /dev/null
+++ b/libdbus-1.3.pkg/files
@@ -0,0 +1 @@
+/usr/lib/
\ No newline at end of file
diff --git a/libdbus-1.3.pkg/files~ b/libdbus-1.3.pkg/files~
new file mode 100644
index 0000000..650fd21
--- /dev/null
+++ b/libdbus-1.3.pkg/files~
@@ -0,0 +1 @@
+/usr/lib/*/libdbus-1.so.*
\ No newline at end of file