diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-13 07:11:09 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-13 07:11:09 +0000 |
commit | c4198c0a4330347a88583da3dd7cc0c1e7b9a0d0 (patch) | |
tree | 2ecfe3a5cc3bf4860ba926926ae49f7955e2a765 | |
parent | 4db3cf0ae1688007779db00019287084f6b063b6 (diff) | |
parent | 43232a233516b72942e47ee650221c64c331f13e (diff) |
merge of '0b31bda390691b7d9e15f77a2ea3e3705bbf2f12'
and '5bcded2dc238545b2379f23a18eda0fc75732a6b'
-rw-r--r-- | packages/pimlico/dates.inc | 1 | ||||
-rw-r--r-- | packages/pimlico/dates_0.4.1.bb (renamed from packages/pimlico/dates_0.3.1.bb) | 2 | ||||
-rw-r--r-- | packages/pimlico/dates_svn.bb | 4 | ||||
-rw-r--r-- | packages/pimlico/files/tasks-single.diff | 9 | ||||
-rw-r--r-- | packages/pimlico/tasks_0.4.bb | 5 |
5 files changed, 15 insertions, 6 deletions
diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index 4f92b2c767..d4debfd28d 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -8,6 +8,7 @@ RCONFLICTS_${PN} = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache # EXTRA_OECONF = "--disable-debug" +EXTRA_OECONF = "--enable-owl=true" FILES_${PN} += "${datadir}/pixmaps/dates.png" diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.4.1.bb index 176d2b9077..d7f0185b86 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.4.1.bb @@ -1,5 +1,3 @@ require dates.inc -PR = "r3" - SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index cac0eb4fae..cfac6630b4 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,10 +1,8 @@ require dates.inc -PR = "r2" - DEFAULT_PREFERENCE = "-1" -PV = "0.3.1+svn${SRCDATE}" +PV = "0.4.1+svn${SRCDATE}" S = "${WORKDIR}/trunk" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" diff --git a/packages/pimlico/files/tasks-single.diff b/packages/pimlico/files/tasks-single.diff new file mode 100644 index 0000000000..dd807ea256 --- /dev/null +++ b/packages/pimlico/files/tasks-single.diff @@ -0,0 +1,9 @@ +Index: tasks/data/tasks.desktop.in +=================================================================== +--- tasks/data/tasks.desktop.in (revision 115) ++++ tasks/data/tasks.desktop.in (working copy) +@@ -9,3 +9,4 @@ + Categories=GTK;Application;Office;ProjectManagement; + Terminal=false + StartupNotify=true ++SingleInstance=true diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb index 679dedf9da..068579ef9c 100644 --- a/packages/pimlico/tasks_0.4.bb +++ b/packages/pimlico/tasks_0.4.bb @@ -1,3 +1,6 @@ require tasks.inc -SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz" +PR = "r1" + +SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz \ + file://tasks-single.diff;patch=1" |