debian: produce a single binary package

diff --git a/debian/control b/debian/control
index d094784..6171ca8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,26 +7,14 @@ Build-Depends: debhelper (>= 5),
  libgtk2.0-dev, libhildondesktop1-dev, hildon-control-panel-dev, libosso-dev (>= 1), libgconf2-dev
 Standards-Version: 3.7.2
 
-Package: espeaktime-daemon
+Package: espeaktime
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, espeak, osso-af-utils
+Conflicts: espeaktime-daemon
+Replaces: espeaktime-daemon
 Description: Talking clock based on eSpeak
  This is a simple talking clock daemon.  Activate it by double-pressing
  the power button while the display is locked.
- .
- This package provides the long-running daemon responsible for
- monitoring power button events.
 XB-Maemo-Display-Name: eSpeakTime
 XSBC-Bugtracker: mailto:vamposdecampos@gmail.com
 
-Package: espeaktime-ui
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Talking clock based on eSpeak (UI)
- This is a simple talking clock daemon.  Activate it by double-pressing
- the power button while the display is locked.
- .
- This package provides the settings UI.
-XB-Maemo-Display-Name: eSpeakTime UI
-XSBC-Bugtracker: mailto:vamposdecampos@gmail.com
-

diff --git a/debian/espeaktime-daemon.install b/debian/espeaktime-daemon.install
deleted file mode 100644 (file)
index 74d5599..0000000
--- a/debian/espeaktime-daemon.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/espeaktimed
-usr/bin/espeaktime-now.sh
-etc/event.d/*

diff --git a/debian/espeaktime-daemon.postinst b/debian/espeaktime-daemon.postinst
deleted file mode 100644 (file)
index aeded95..0000000
--- a/debian/espeaktime-daemon.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-#DEBHELPER#
-
-start espeaktime
-
-exit 0
-

diff --git a/debian/espeaktime-daemon.prerm b/debian/espeaktime-daemon.prerm
deleted file mode 100644 (file)
index e6f90d6..0000000
--- a/debian/espeaktime-daemon.prerm
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-stop espeaktime
-
-#DEBHELPER#
-
-exit 0
-

diff --git a/debian/espeaktime-ui.install b/debian/espeaktime-ui.install
deleted file mode 100644 (file)
index 53f3f76..0000000
--- a/debian/espeaktime-ui.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/hildon-control-panel/*.so
-usr/share/applications/hildon-control-panel/*.desktop

diff --git a/debian/espeaktime.install b/debian/espeaktime.install
new file mode 100644 (file)
index 0000000..79323c0
--- /dev/null
+++ b/debian/espeaktime.install
@@ -0,0 +1,5 @@
+usr/bin/espeaktimed
+usr/bin/espeaktime-now.sh
+etc/event.d/*
+usr/lib/hildon-control-panel/*.so
+usr/share/applications/hildon-control-panel/*.desktop

diff --git a/debian/espeaktime.postinst b/debian/espeaktime.postinst
new file mode 100644 (file)
index 0000000..aeded95
--- /dev/null
+++ b/debian/espeaktime.postinst
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+#DEBHELPER#
+
+start espeaktime
+
+exit 0
+

diff --git a/debian/espeaktime.prerm b/debian/espeaktime.prerm
new file mode 100644 (file)
index 0000000..e6f90d6
--- /dev/null
+++ b/debian/espeaktime.prerm
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+stop espeaktime
+
+#DEBHELPER#
+
+exit 0
+