On 08/05/2011 04:05 PM, Pascal de Bruijn wrote:
On Fri, Aug 5, 2011 at 2:05 PM, Till Kamppeter<[email protected]> wrote:
Hi,
I am introducing Color Management in Ubuntu and therefore I have updated the
Argyll package. There I have discovered, that there are two source Debian
packages, argyll and libicc which are based on the same source tarball. I
want to merge these two packages to make maintenance easier.
Problem is that the version number used for libicc is the API/ABI version
number 2.12 which is much higher than the 1.3.3 of the upstream tarball. Ho
should I proceed to make the resulting package being well accepted by
Debian? Should I introduce an epoch?
Hmmm, to prevent some possible confusion, my Argyll-1.3.3 package is
loosely based on Roland's Argyll-1.3.0. Roland used to autotool
argyll, which I didn't, I just motivated Graeme Gill to fixup Jam a
bit, so it would be workable.
I have seen it and I think to stay with Jam from upstream is the correct
solution. Stay as close to upstream as possible to keep maintainability
easy.
To make the code building under Oneiric I had to do some small fixes in
the Jamtop file: The "-l..." arguments to dynamically link with system
libraries have to go into STDLIBS and not into LINKFLAGS, so that they
go into the end of the linker command line. Otherwise some of the
libraries do not get considered for the linking and errors about missing
symbols occur. See the attached patch.
Now Pascal's argyll package builds perfectly for me and I have uploaded
it to Ubuntu.
As a next step I wanted to merge this package with libicc. So I looked
into libicc and it is merely the icc/ directory of argyll and a very
simple autoconf/automake environment added. Unfortunately, ArgyllCMS
upstream does not support compiling libicc as a dynamic library.
Probably therefore there is this simple autoconf/automake environment in
the libicc package.
My plan for the merged package now is to leave the argyll build with Jam
and use the autoconf/automake files for the libicc.so library.
WDYT? And WDYT about the merger in general?
Till
--- a/Jamtop
+++ b/Jamtop
@@ -64,7 +64,7 @@
if $(OS) = FREEBSD {
LINKFLAGS += -L$(LibWinD) -g -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -lusb ;
} else {
- LINKFLAGS += -L$(LibWinD) -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ;
+ STDLIBS += -L$(LibWinD) -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ;
}
# HDRS += $(LibWinH) ;
}
@@ -76,7 +76,7 @@
echo "Using system TIFF library" ;
TIFFLIB = ;
TIFFINC = ;
- LINKFLAGS += $(LINKFLAG)tiff ;
+ STDLIBS += $(LINKFLAG)tiff ;
HAVE_TIFF = true ;
}
}
