[PATCH 1/2] gypsy: fix packaging

[PATCH 1/2] gypsy: fix packaging

[Steffen Sledz]

A wrong path had avoided the packaging of the dbus starter script
/usr/share/dbus-1/system-services/org.freedesktop.Gypsy.service.

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
---
 recipes/gypsy/gypsy.inc    |    4 +++-
 recipes/gypsy/gypsy_0.7.bb |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc
index eab062c..964e336 100644
--- a/recipes/gypsy/gypsy.inc
+++ b/recipes/gypsy/gypsy.inc
@@ -3,6 +3,8 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
 
+INC_PR = "r1"
+
 inherit autotools pkgconfig
 
 do_configure_prepend () {
@@ -14,6 +16,6 @@ PACKAGES += "libgypsy libgypsy-dev libgypsy-dbg"
 FILES_lib${PN} = "${libdir}/lib*.so*"
 FILES_lib${PN}-dev = "${includedir}/* ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
 FILES_lib${PN}-dbg = "${libdir}/.debug"
-FILES_${PN} = "${datadir}/dbus-1/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
+FILES_${PN} = "${datadir}/dbus-1/system-services/* ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
 FILES_${PN}-dbg ="${libexecdir}/.debug*"
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.d/Gypsy.conf"
diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
index 8cd8760..a10cd6e 100644
--- a/recipes/gypsy/gypsy_0.7.bb
+++ b/recipes/gypsy/gypsy_0.7.bb
@@ -1,5 +1,7 @@
 require gypsy.inc
 
+PR = "${INC_PR}.1"
+
 SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
            file://docs-reference-am.patch \
            file://remove-werror.patch \
-- 
1.7.7

[PATCH 2/2] gypsy: update to latest upstream version 0.8

[Steffen Sledz]

Bug fixes, enhanced logging, a new debugging system, enhanced device
discovery.

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
---
 recipes/gypsy/gypsy.inc    |    2 ++
 recipes/gypsy/gypsy_0.7.bb |    2 +-
 recipes/gypsy/gypsy_0.8.bb |    6 ++++++
 3 files changed, 9 insertions(+), 1 deletions(-)
 create mode 100644 recipes/gypsy/gypsy_0.8.bb

diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc
index 964e336..6c7c942 100644
--- a/recipes/gypsy/gypsy.inc
+++ b/recipes/gypsy/gypsy.inc
@@ -5,6 +5,8 @@ DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
 
 INC_PR = "r1"
 
+SRC_URI = "http://gypsy.freedesktop.org/releases/${PN}-${PV}.tar.gz;name=gypsy"
+
 inherit autotools pkgconfig
 
 do_configure_prepend () {
diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
index a10cd6e..c95f380 100644
--- a/recipes/gypsy/gypsy_0.7.bb
+++ b/recipes/gypsy/gypsy_0.7.bb
@@ -2,7 +2,7 @@ require gypsy.inc
 
 PR = "${INC_PR}.1"
 
-SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
+SRC_URI += " \
            file://docs-reference-am.patch \
            file://remove-werror.patch \
 "
diff --git a/recipes/gypsy/gypsy_0.8.bb b/recipes/gypsy/gypsy_0.8.bb
new file mode 100644
index 0000000..7c84ef9
--- /dev/null
+++ b/recipes/gypsy/gypsy_0.8.bb
@@ -0,0 +1,6 @@
+require gypsy.inc
+
+PR = "${INC_PR}.1"
+
+SRC_URI[gypsy.md5sum] = "32b8db24db86d2dac87b391dd255f4bf"
+SRC_URI[gypsy.sha256sum] = "1986a58189614a950725c3bc7d05faa3b84695f35cb696326f340ef87fc3acaa"
-- 
1.7.7

Re: [PATCH 2/2] gypsy: update to latest upstream version 0.8

[Steffen Sledz]

On 24.11.2011 15:47, Steffen Sledz wrote:
> Bug fixes, enhanced logging, a new debugging system, enhanced device
> discovery.
> 
> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>

Ping!

If there are no NAKs i'll push both patches tomorrow.

Steffen

-- 
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sledz@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058

Re: [PATCH 2/2] gypsy: update to latest upstream version 0.8

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1867 bytes --]

Am Donnerstag, den 24.11.2011, 15:47 +0100 schrieb Steffen Sledz:
> Bug fixes, enhanced logging, a new debugging system, enhanced device
> discovery.
> 
> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> ---
>  recipes/gypsy/gypsy.inc    |    2 ++
>  recipes/gypsy/gypsy_0.7.bb |    2 +-

Can this be removed after this upgrade?

>  recipes/gypsy/gypsy_0.8.bb |    6 ++++++
>  3 files changed, 9 insertions(+), 1 deletions(-)
>  create mode 100644 recipes/gypsy/gypsy_0.8.bb
> 
> diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc
> index 964e336..6c7c942 100644
> --- a/recipes/gypsy/gypsy.inc
> +++ b/recipes/gypsy/gypsy.inc
> @@ -5,6 +5,8 @@ DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
>  
>  INC_PR = "r1"
>  
> +SRC_URI = "http://gypsy.freedesktop.org/releases/${PN}-${PV}.tar.gz;name=gypsy"

Separate patch would have been nice.

> +
>  inherit autotools pkgconfig
>  
>  do_configure_prepend () {
> diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
> index a10cd6e..c95f380 100644
> --- a/recipes/gypsy/gypsy_0.7.bb
> +++ b/recipes/gypsy/gypsy_0.7.bb
> @@ -2,7 +2,7 @@ require gypsy.inc
>  
>  PR = "${INC_PR}.1"
>  
> -SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
> +SRC_URI += " \
>             file://docs-reference-am.patch \
>             file://remove-werror.patch \
>  "
> diff --git a/recipes/gypsy/gypsy_0.8.bb b/recipes/gypsy/gypsy_0.8.bb
> new file mode 100644
> index 0000000..7c84ef9
> --- /dev/null
> +++ b/recipes/gypsy/gypsy_0.8.bb
> @@ -0,0 +1,6 @@
> +require gypsy.inc
> +
> +PR = "${INC_PR}.1"

`${INC_PR}.0` please.

> +
> +SRC_URI[gypsy.md5sum] = "32b8db24db86d2dac87b391dd255f4bf"
> +SRC_URI[gypsy.sha256sum] = "1986a58189614a950725c3bc7d05faa3b84695f35cb696326f340ef87fc3acaa"


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/2] gypsy: fix packaging

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 2070 bytes --]

Am Donnerstag, den 24.11.2011, 15:47 +0100 schrieb Steffen Sledz:
> A wrong path had avoided the packaging of the dbus starter script
> /usr/share/dbus-1/system-services/org.freedesktop.Gypsy.service.

So why not use

    gypsy: fix packaging of DBus starter script

as the commit summary?

> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> ---
>  recipes/gypsy/gypsy.inc    |    4 +++-
>  recipes/gypsy/gypsy_0.7.bb |    2 ++
>  2 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc
> index eab062c..964e336 100644
> --- a/recipes/gypsy/gypsy.inc
> +++ b/recipes/gypsy/gypsy.inc
> @@ -3,6 +3,8 @@ LICENSE = "GPL"
>  SECTION = "x11"
>  DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
>  
> +INC_PR = "r1"
> +
>  inherit autotools pkgconfig
>  
>  do_configure_prepend () {
> @@ -14,6 +16,6 @@ PACKAGES += "libgypsy libgypsy-dev libgypsy-dbg"
>  FILES_lib${PN} = "${libdir}/lib*.so*"
>  FILES_lib${PN}-dev = "${includedir}/* ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
>  FILES_lib${PN}-dbg = "${libdir}/.debug"
> -FILES_${PN} = "${datadir}/dbus-1/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
> +FILES_${PN} = "${datadir}/dbus-1/system-services/* ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
>  FILES_${PN}-dbg ="${libexecdir}/.debug*"
>  CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.d/Gypsy.conf"
> diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
> index 8cd8760..a10cd6e 100644
> --- a/recipes/gypsy/gypsy_0.7.bb
> +++ b/recipes/gypsy/gypsy_0.7.bb
> @@ -1,5 +1,7 @@
>  require gypsy.inc
>  
> +PR = "${INC_PR}.1"
> +

Since `INC_PR` is increased, `${INC_PR}.0` should be fine.

>  SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
>             file://docs-reference-am.patch \
>             file://remove-werror.patch \

With the changes above this recipe is

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

[PATCH v2 0/3] gypsy update and fix

[Steffen Sledz]

This is the update patch set according to the annotations of Paul Menzel.

Steffen Sledz (3):
  gypsy: fix packaging of DBus starter script
  gypsy: move generic SRC_URI part to gypsy.inc
  gypsy: update to latest upstream version 0.8, and remove version 0.7

 recipes/gypsy/gypsy.inc    |    6 +++++-
 recipes/gypsy/gypsy_0.7.bb |   10 ----------
 recipes/gypsy/gypsy_0.8.bb |    6 ++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 recipes/gypsy/gypsy_0.7.bb
 create mode 100644 recipes/gypsy/gypsy_0.8.bb

-- 
1.7.7

[PATCH v2 1/3] gypsy: fix packaging of DBus starter script

[Steffen Sledz]

A wrong path had avoided the packaging of the dbus starter script
/usr/share/dbus-1/system-services/org.freedesktop.Gypsy.service.

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 recipes/gypsy/gypsy.inc    |    4 +++-
 recipes/gypsy/gypsy_0.7.bb |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc
index eab062c..964e336 100644
--- a/recipes/gypsy/gypsy.inc
+++ b/recipes/gypsy/gypsy.inc
@@ -3,6 +3,8 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
 
+INC_PR = "r1"
+
 inherit autotools pkgconfig
 
 do_configure_prepend () {
@@ -14,6 +16,6 @@ PACKAGES += "libgypsy libgypsy-dev libgypsy-dbg"
 FILES_lib${PN} = "${libdir}/lib*.so*"
 FILES_lib${PN}-dev = "${includedir}/* ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
 FILES_lib${PN}-dbg = "${libdir}/.debug"
-FILES_${PN} = "${datadir}/dbus-1/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
+FILES_${PN} = "${datadir}/dbus-1/system-services/* ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
 FILES_${PN}-dbg ="${libexecdir}/.debug*"
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.d/Gypsy.conf"
diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
index 8cd8760..054c784 100644
--- a/recipes/gypsy/gypsy_0.7.bb
+++ b/recipes/gypsy/gypsy_0.7.bb
@@ -1,5 +1,7 @@
 require gypsy.inc
 
+PR = "${INC_PR}.0"
+
 SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
            file://docs-reference-am.patch \
            file://remove-werror.patch \
-- 
1.7.7

Re: [PATCH v2 1/3] gypsy: fix packaging of DBus starter script

[Steffen Sledz]

On 28.11.2011 12:07, Steffen Sledz wrote:
> A wrong path had avoided the packaging of the dbus starter script
> /usr/share/dbus-1/system-services/org.freedesktop.Gypsy.service.
> 
> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>

pushed to oe-classic master

[PATCH v2 2/3] gypsy: move generic SRC_URI part to gypsy.inc

[Steffen Sledz]

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 recipes/gypsy/gypsy.inc    |    2 ++
 recipes/gypsy/gypsy_0.7.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc
index 964e336..6c7c942 100644
--- a/recipes/gypsy/gypsy.inc
+++ b/recipes/gypsy/gypsy.inc
@@ -5,6 +5,8 @@ DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
 
 INC_PR = "r1"
 
+SRC_URI = "http://gypsy.freedesktop.org/releases/${PN}-${PV}.tar.gz;name=gypsy"
+
 inherit autotools pkgconfig
 
 do_configure_prepend () {
diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
index 054c784..6636961 100644
--- a/recipes/gypsy/gypsy_0.7.bb
+++ b/recipes/gypsy/gypsy_0.7.bb
@@ -2,7 +2,7 @@ require gypsy.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
+SRC_URI += " \
            file://docs-reference-am.patch \
            file://remove-werror.patch \
 "
-- 
1.7.7

Re: [PATCH v2 2/3] gypsy: move generic SRC_URI part to gypsy.inc

[Steffen Sledz]

On 28.11.2011 12:07, Steffen Sledz wrote:
> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>

pushed to oe-classic master

[PATCH v2 3/3] gypsy: update to latest upstream version 0.8, and remove version 0.7

[Steffen Sledz]

Bug fixes, enhanced logging, a new debugging system, enhanced device
discovery.

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 recipes/gypsy/gypsy_0.7.bb |   12 ------------
 recipes/gypsy/gypsy_0.8.bb |    6 ++++++
 2 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 recipes/gypsy/gypsy_0.7.bb
 create mode 100644 recipes/gypsy/gypsy_0.8.bb

diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
deleted file mode 100644
index 6636961..0000000
--- a/recipes/gypsy/gypsy_0.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require gypsy.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += " \
-           file://docs-reference-am.patch \
-           file://remove-werror.patch \
-"
-
-SRC_URI[gypsy.md5sum] = "cde52c121693014efa75d9098fd7de22"
-SRC_URI[gypsy.sha256sum] = "60d9f9ada77c832899df4a164718895addc5015fa48f45fd58dc4bc8a983f205"
-
diff --git a/recipes/gypsy/gypsy_0.8.bb b/recipes/gypsy/gypsy_0.8.bb
new file mode 100644
index 0000000..c5813db
--- /dev/null
+++ b/recipes/gypsy/gypsy_0.8.bb
@@ -0,0 +1,6 @@
+require gypsy.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[gypsy.md5sum] = "32b8db24db86d2dac87b391dd255f4bf"
+SRC_URI[gypsy.sha256sum] = "1986a58189614a950725c3bc7d05faa3b84695f35cb696326f340ef87fc3acaa"
-- 
1.7.7

Re: [PATCH v2 3/3] gypsy: update to latest upstream version 0.8, and remove version 0.7

[Steffen Sledz]

On 28.11.2011 12:07, Steffen Sledz wrote:
> Bug fixes, enhanced logging, a new debugging system, enhanced device
> discovery.
> 
> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>

pushed to oe-classic master