[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. milestone5-180-g5848db1

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 16aff7fb50fe9d6771bd2c69453a459e36a06d9c
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Feb 2 20:15:30 2009 +0100

    Remove wireless glue package

diff --git a/debian/changelog b/debian/changelog
index fdd55c0..374d215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 fso-frameworkd (0.8.4.9-20090130-1) UNRELEASED; urgency=low
 
   * New upstream release. This is milestone 5.
+  * This package does not contain any arch-specific parts. The wireless glue
+    package is removed.
   * Fix "debian/copyright: mention that copyright holder of
     decorator.py is Michele Simionato" (Closes: #511471)
 
diff --git a/debian/control b/debian/control
index e2717df..188d630 100644
--- a/debian/control
+++ b/debian/control
@@ -11,10 +11,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-fso/fso-frameworkd.git;a=summary
 
 Package: fso-frameworkd
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-serial, python-yaml, python-gst0.10, gstreamer0.10-alsa, python-dbus, gsm0710muxd, dbus, alsa-utils, fso-frameworkd-wireless-glue, ppp
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-serial, python-yaml, python-gst0.10, gstreamer0.10-alsa, python-dbus, gsm0710muxd, dbus, alsa-utils, ppp
 Recommends: fso-config, fso-sounds
-Conflicts: frameworkd, python2.5 (<< 2.5.2-13), openmoko-panel-plugin (<= 0.5-1.3)
-Replaces: frameworkd, fso-frameworkd (<< 0.2.0-git20080909-7)
+Conflicts: frameworkd, python2.5 (<< 2.5.2-13), openmoko-panel-plugin (<= 0.5-1.3), fso-frameworkd-wireless-glue
+Replaces: frameworkd, fso-frameworkd (<< 0.2.0-git20080909-7), fso-frameworkd-wireless-glue
 Provides: frameworkd
 Description: freemsmartphone.org Framework Daemon
  This packages provides the backend daemon of the freemsmartphone.org software
@@ -25,16 +25,6 @@ Description: freemsmartphone.org Framework Daemon
  This package is part of the freesmartphone.org software stack and is targeted
  for smartphones.
 
-Package: fso-frameworkd-wireless-glue
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, fso-frameworkd
-Description: freesmartphone.org Framework Daemon - wireless glue
- This package contains the architecture dependent parts of the fso-frameworkd
- package and is not useful on it’s own.
- .
- This package is part of the freesmartphone.org software stack and is targeted
- for smartphones.
-
 Package: fso-config-general
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, fso-frameworkd (>= 0.2.0-git20080909-7), fso-sounds-openmoko-nonfree | fso-sounds
diff --git a/debian/fso-frameworkd-wireless-glue.install b/debian/fso-frameworkd-wireless-glue.install
deleted file mode 100644
index 52b535a..0000000
--- a/debian/fso-frameworkd-wireless-glue.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2.5/site-packages/framework/subsystems/odeviced/wireless.so
diff --git a/debian/rules b/debian/rules
index 7a01127..2ec7f01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ build-stamp: $(QUILT_STAMPFN)
 	touch build-stamp
 
 clean: unpatch
-	rm -f framework/subsystems/odeviced/wireless.c
 	rm -f build-stamp
 	rm -f install-stamp
 	dh clean
@@ -17,12 +16,7 @@ clean: unpatch
 install: build install-stamp
 install-stamp:
 	# Run this first
-	dh install --until dh_auto_install
-	dh_install -pfso-config-general
-	dh_install -pfso-sounds-none
-	dh_install -pfso-frameworkd-wireless-glue
-	dh_install -pfso-frameworkd -X.so
-	dh install --after dh_install --before dh_compress
+	dh install
 	dh_compress -X.py
 	dh install --after dh_compress
 	touch install-stamp

-- 
FSO frameworkd Debian packaging