[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: cctbx debian package



On Wed, 18 Jul 2012 01:44:32 +0200
Radostan Riedel <raybuntu@googlemail.com> wrote:

Hello

> Hi,
> 
> I tried to merge Baptiste's work into the git. I changed some little things
> and finally reworked the rules file to use dh tiny rules.
> Anyway, there's still a lot to do but with the latest commit we can at least
> get some packages to build and we getting some shape of what we're trying to get
> ;). This is more of a "proof-of-concept". 

Wait a minute the patch is around 8000 lines. Ho my god !!!

picca@ORD03037:~/Debian/sponsor/cctbx/cctbx$ git pull
Enter passphrase for key '/home/picca/.ssh/id_rsa': 
remote: Counting objects: 22, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 16 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (16/16), done.
From git+ssh://git.debian.org/git/debian-science/packages/cctbx
   fb9ce20..8de5d0c  master     -> origin/master
Updating fb9ce20..8de5d0c
Fast-forward
 debian/control                            |   48 +
 debian/libcctbx0.install                  |    1 +
 debian/libiotbx0.install                  |    1 +
 debian/libmmtbx0.install                  |    1 +
 debian/libomptbx0.install                 |    1 +
 debian/librstbx0.install                  |    1 +
 debian/libscitbx0.install                 |    1 +
 debian/libsmtbx0.install                  |    1 +
 debian/libspotfinder0.install             |    1 +
 debian/patches/0004-adding-setup_py.patch | 7984 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 debian/python-cctbx.install               |    1 +
 debian/rules                              |   84 +-
 12 files changed, 8015 insertions(+), 110 deletions(-)
 create mode 100644 debian/libcctbx0.install
 create mode 100644 debian/libiotbx0.install
 create mode 100644 debian/libmmtbx0.install
 create mode 100644 debian/libomptbx0.install
 create mode 100644 debian/librstbx0.install
 create mode 100644 debian/libscitbx0.install
 create mode 100644 debian/libsmtbx0.install
 create mode 100644 debian/libspotfinder0.install
 create mode 100644 debian/python-cctbx.install 


this 0004 patch contains modifications of 4 files

---
 cctbx_sources/pycbf.py  | 7734 +++++++++++++++++++++++++++++++++++++++++++++++
 cctbx_sources/stdlib.py |    4 +
 sconsutils.py           |  100 +
 setup.py                |  111 +
 4 files changed, 7949 insertions(+)
 create mode 100755 cctbx_sources/pycbf.py
 create mode 100755 cctbx_sources/stdlib.py
 create mode 100644 sconsutils.py
 create mode 100755 setup.py

can you explaine a little bit what is going on, the name of the patch
says adding setup.py but there is this massif cctbx_sources/pycbf.py


> Full acknowledgment goes to Baptiste and his work!

Yes thanks a lot.


> BTW: I'm thinking how I should include the "includes" into the dev packages.
> Every header files are just allocated in the cctbx_source dir between python
> and cpp files. I'm thinking about a simple "find" command to install the files
> into debian/tmp/usr/include first and then split them up. Or we could just do a
> cctbx-dev package (like libboost1.49-dev) there we could also include the
> dispatcher scripts, tests etc. What do you think?

create mode 100644 debian/libcctbx0.install
create mode 100644 debian/libiotbx0.install
create mode 100644 debian/libmmtbx0.install
create mode 100644 debian/libomptbx0.install
create mode 100644 debian/librstbx0.install
create mode 100644 debian/libscitbx0.install
create mode 100644 debian/libsmtbx0.install
create mode 100644 debian/libspotfinder0.install

so we need the libxxx-dev package and also the libxxx-dbg packages.

usually with the dh syntax you just need to add [1]
--dbg-package=libxxx-dev --dbg-package=libyyy-dev ...

now indeed we miss an install target which put all the .h library etc
at the right place DESTDIR.

Indeed it is possible to move things around from the rule file but it
would be better for other distributions to beneficiate from your work
and work with the upstream for an install target which suit our needs.


now In the xxx.install files I see

debian/tmp/usr/lib/libscitbx*.so.*

you can just write

usr/lib/libscitbx*.so.*

by default with dh compat leverl 8 it looks into debian/tmp

keep in your mind that we will switch at the end to level 9 and multiarch the package [2] ;)

Cheers

Frederic

[1] http://wiki.debian.org/DebugPackage
[2] http://wiki.debian.org/Multiarch/Implementation

-- 
GPG public key 4096R/4696E015 2011-02-14
    fingerprint = E92E 7E6E 9E9D A6B1 AA31  39DC 5632 906F 4696 E015
uid  Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>

GPG public key 1024D/A59B1171 2009-08-11
    fingerprint = 1688 A3D6 F0BD E4DF 2E6B  06AA B6A9 BA6A A59B 1171
uid  Picca Frédéric-Emmanuel <picca@debian.org>


Reply to: