Update to SPF 2.0.

Also rename to glib-2.0.

10 files changed, 17 insertions, 33 deletions

diff --git a/build b/build
index d229f60..2a40656 100755
--- a/build
+++ b/build
@@ -1,19 +1,6 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
 
-glib glibheaders: glib.buildstamp
+include ../source.mk
 
-.SILENT: glib.buildstamp
-glib.buildstamp:
-	cd src && ./configure --prefix=/usr --includedir=/usr/include &&\
-	make && make DESTDIR=$$(pwd)/../dest install
-	oh-strip -gl usr/lib/libglib-2.0.so.0.2000.0
-	oh-strip -gl usr/lib/libgobject-2.0.so.0.2000.0
-	oh-strip -gl usr/lib/libgmodule-2.0.so.0.2000.0
-	oh-strip -gl usr/lib/libgio-2.0.so.0.2000.0
-	oh-strip -gl usr/lib/libgthread-2.0.so.0.2000.0
-	bash
-	oh-installfiles glib glibheaders
-	oh-installdocs glib
-	oh-gencontrol glib glibheaders
-	oh-buildopk glib glibheaders
-	touch glib.buildstamp
+nop:
+	@:
diff --git a/changelog b/changelog
index d201181..0d6a12b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+glib-2.0 (2.40.0-1) trunk
+
+  * New upstream version.
+  * Update to SPF 2.0 and opkhelper 3.0.
+
+ -- "P. J. McDermott" <pj@pehjota.net>  Mon, 23 Jun 2014 12:53:53 -0400
+
 glib (2.20.0)
 	
 	*  Inital release.
diff --git a/control b/control
index 0d2c9ae..39cccd9 100644
--- a/control
+++ b/control
@@ -1,3 +1,5 @@
-Source: glib
-Version: 2.20.0
-Maintainer: Joseph Flynn <jjf22@njit.edu>
+Maintainer: "P. J. McDermott" <pj@pehjota.net>
+Build-Depends: opkhelper-3.0,
+ libffi-dev,
+ libpcre-dev,
+Homepage: https://developer.gnome.org/glib/
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0
diff --git a/glib-2.20.0.tar.gz b/glib-2.20.0.tar.gz
deleted file mode 100644
index 4e12c7f..0000000
--- a/glib-2.20.0.tar.gz
+++ /dev/null
diff --git a/glib.pkg/control b/glib.pkg/control
deleted file mode 100644
index e918eb6..0000000
--- a/glib.pkg/control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: glib
-Architecture: any
-Description: glib provides the core building blocks for applications.
- Glib provides the core object system in GNOME such as main loop implementation and utility functions. 
-
diff --git a/glib.pkg/install b/glib.pkg/install
deleted file mode 100644
index 1b91047..0000000
--- a/glib.pkg/install
+++ /dev/null
@@ -1 +0,0 @@
-usr/
diff --git a/glibheaders.pkg/control b/glibheaders.pkg/control
deleted file mode 100644
index 1435a6b..0000000
--- a/glibheaders.pkg/control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: glibheaders
-Architecture: any
-Description: Provides headers for glib.
- Glib headers that are used in glib. 
diff --git a/glibheaders.pkg/install b/glibheaders.pkg/install
deleted file mode 100644
index 41a1414..0000000
--- a/glibheaders.pkg/install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/*
diff --git a/install b/install
deleted file mode 100644
index 74e4e23..0000000
--- a/install
+++ /dev/null
@@ -1 +0,0 @@
-/usr