Am 24.02.2010 14:06, schrieb Stefan Kisdaroczi:
> Hi Philippe,
> 
> Am 23.02.2010 18:46, schrieb Philippe Gerum:
>> On Tue, 2010-02-23 at 17:52 +0100, Stefan Kisdaroczi wrote:
>>> Hi,
>>>
>>> Am 14.02.2010 10:38, schrieb Philippe Gerum:
>>>>
>>>> <snip>
>>>> In the future, maybe we could simply provide a wrapper script accepting
>>>> sub-commands, such as "xeno latency, xeno sigtest" etc, to be put
>>>> into /usr/bin by distros, which would hide the actual location of those
>>>> binaries?
>>>>
>>>> In any case, thanks for your work so far. We probably need to discuss
>>>> the packaging issues on this list, so that we get both consistency and
>>>> usability in the future.
>>>>
>>>> Gilles and Roland, if this is fine with you, I'll handle the liaison
>>>> role with upstream packagers, so please CC me explicitly on those mails.
>>>> We'll sort out this issue, it doesn't look that bad anyway.
>>>
>>> Roland added a xeno wrapper to the debian.org xenomai package 2.5.1-3.
>>>
>>> I synced now the debian/ directories from debian.org and xenomai.org:
>>>  - For debian.org I sent patches to the Debian bugtracker [1] [2].
>>>    Another patch for dpkg-cross support [3] I sent to Roland privately.
>>>  - For xenomai.org I attached patches to this mail (against -2.5.git).
>>>
>>> If both parties apply the patches the debian directories are in sync,
>>> except some minor differences in the debian/control file, see patch
>>> do-not-commit-please.patch. I would like to keep these changes out so
>>> that the xenomai.org packages are compatible with Debian 5.0 Lenny.
>>> The debian.org packages are for Debian 6.0 Squeeze.
>>>
>>
>> Merged into my queue (except the last one as mentioned). This will be
>> pushed upstream to Gilles for 2.5.2. Thanks.
> 
> I took a look at your branch for-upstream. Your commit
>   scripts: add wrapper script to run standard Xenomai commands
>   6e0574791f48cbf8b3421a68c5789254e7d084b7
> adds the same wrapper as my patch 
> 0005-debian-wrapper-script-usr-bin-xeno-to-call-executa.patch
>   debian: wrapper script /usr/bin/xeno to call executables in 
> /usr/lib/xenomai/
>   fbe86cc50d3a65cd23e93d43adba4ed369fe70b1
> Please revert the commit of my patch, we need another fix for debian/rules 
> for "your" wrapper.

Thanks for reverting. Roland has uploaded 2.5.1-4 yesterday.
Attached a patch to stay in sync. Based on your for-upstream branch this time.

kisda

> How do I call configure to install the wrapper in /usr/bin and
> the programs like latency, switchtest etc. to /usr/lib/xenomai ?
> 
> Stefan
> 
>>
>>> Thanks
>>> kisda
>>>
>>> [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571099
>>> [2] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571104
>>> [3] 
>>> http://git.xenomai.org/?p=xenomai-2.5.git;a=commitdiff;h=5bcd18f714f4cbeaaac0cc4a08e6c9f375aa3b77
>>
>>
> 
> 
> 
> 
> _______________________________________________
> Xenomai-core mailing list
> Xenomai-core@gna.org
> https://mail.gna.org/listinfo/xenomai-core

From f6b7a0115f3f785f08f8d085e66c8bf8d7057f88 Mon Sep 17 00:00:00 2001
From: Stefan Kisdaroczi <ki...@hispeed.ch>
Date: Thu, 25 Feb 2010 13:27:31 +0100
Subject: [PATCH] debian: sync 2.5.1-4 from debian.org

---
 debian/changelog        |    9 +++++++++
 debian/libxenomai1.dirs |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45736a4..6d2d3cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xenomai (2.5.1-4) unstable; urgency=low
+
+  * Added patches by Stefan Kisdaroczi <ki...@hispeed.ch>:
+    - debian/copyright: Typo and email address (Closes: #571099)
+    - debian/control: ia64 support removed (Closes: #571104)
+    - debian/rules: Added dpkg-cross support
+
+ -- Roland Stigge <sti...@antcom.de>  Wed, 24 Feb 2010 22:20:10 +0100
+
 xenomai (2.5.1-3) unstable; urgency=low
 
   * xenomai-runtime: Replaced "xenomai-" prefixed executables with
diff --git a/debian/libxenomai1.dirs b/debian/libxenomai1.dirs
index d5bb34f..1737ea1 100644
--- a/debian/libxenomai1.dirs
+++ b/debian/libxenomai1.dirs
@@ -1,2 +1,2 @@
-etc/udev
+etc/udev/rules.d
 usr/share/lintian/overrides
-- 
1.5.6.5

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core

Reply via email to