From: David S. <ds...@sc...> - 2002-09-04 03:08:41
|
I recently uploaded plplot-5.1.0 to Debian/unstable, since Rafael was on vacation. And more recently, I merged all the past uploads into the debian directory on the DEBIAN branch in CVS. There's a bit of patching left in the Debian packaging, attached below. The first looks like a hack, the second is a python-2.1 fix. (I don't remember if I wrote them or not. =) ) dave... Index: cf/configure.in =================================================================== RCS file: /cvsroot/plplot/plplot/cf/configure.in,v retrieving revision 1.142 diff -u -r1.142 configure.in --- cf/configure.in 28 Jul 2002 22:41:15 -0000 1.142 +++ cf/configure.in 4 Sep 2002 02:25:53 -0000 @@ -570,7 +570,8 @@ # around this potential problem by just defining caddr_t to 'char *' on all # systems (unless it is set already), whether it will be needed or not. -AC_CHECK_TYPE(caddr_t, char *) +# This check is busted. Since linux has caddr_t, just turn off the check. +#AC_CHECK_TYPE(caddr_t, char *) # ---------------------------------------------------------------------------- # If you don't know what this is for you shouldn't be using it. Index: cf/sysloc.in =================================================================== RCS file: /cvsroot/plplot/plplot/cf/sysloc.in,v retrieving revision 1.108 diff -u -r1.108 sysloc.in --- cf/sysloc.in 20 Aug 2002 10:57:06 -0000 1.108 +++ cf/sysloc.in 4 Sep 2002 02:25:54 -0000 @@ -962,6 +962,10 @@ if test "$with_dbmalloc" = "yes"; then if test -z "$DBMALLOCINCDIR"; then incdirs="\ + $prefix/include/python2.1 \ + /usr/include/python2.1 \ + $prefix/include/python2.1/Numeric \ + /usr/include/python2.1/Numeric \ $prefix/include \ $HOME/local/include \ $HOME/local/dbmalloc/include \ |
From: Alan W. I. <ir...@be...> - 2002-09-04 04:18:54
|
Thanks, Dave, for working on this. I am fairly ignorant of the mechanics of working with branches, but I presume that the DEBIAN tag I see on your CVS changes in the debian subdirectory refers to changes on the DEBIAN branch that Rafael set up some time ago. Is it also true that the rest of the DEBIAN branch is indistinguishable from 5.1.0 except for the minor patch below? If so, I would appreciate you copying the debian subdirectory to CVS HEAD (including the minor patch which you could keep as a special file in the debian subdirectory.) I am assuming here that all changes would be confined to the debian subdirectory. BTW, this is exactly how the KDE debs are maintained. KDE CVS HEAD includes a debian subdirectory which is updated from time to time by the Debian package maintainer so that anybody can build their own KDE debs directly from KDE CVS HEAD. Of course, the big advantage of making Debian buildable from CVS HEAD is you don't perpetually have to play catch-up with all the rest of the CVS HEAD changes that currently have to be migrated to the DEBIAN branch. Furthermore, if the debian subdirectory exists for CVS HEAD, I could always test on my Debian system that the debs remain at least buildable with all our CVS HEAD changes. If you follow up on my request, I suspect you will not need the second part of the patch for current CVS HEAD. BTW, some of my current linking changes have messed up relocatibility of the install location (required for both rpm and deb packaging). I am working on fixing that at the moment, but once that is done, it would be most interesting to see if debs could be built from CVS HEAD. Alan email: ir...@be... phone: 250-727-2902 FAX: 250-721-7715 snail-mail: Dr. Alan W. Irwin Department of Physics and Astronomy, University of Victoria, P.O. Box 3055, Victoria, British Columbia, Canada, V8W 3P6 __________________________ Linux-powered astrophysics __________________________ On Tue, 3 Sep 2002, David Schleef wrote: > > I recently uploaded plplot-5.1.0 to Debian/unstable, since Rafael > was on vacation. And more recently, I merged all the past > uploads into the debian directory on the DEBIAN branch in CVS. > There's a bit of patching left in the Debian packaging, attached > below. The first looks like a hack, the second is a python-2.1 > fix. (I don't remember if I wrote them or not. =) ) > > > > dave... > > > Index: cf/configure.in > =================================================================== > RCS file: /cvsroot/plplot/plplot/cf/configure.in,v > retrieving revision 1.142 > diff -u -r1.142 configure.in > --- cf/configure.in 28 Jul 2002 22:41:15 -0000 1.142 > +++ cf/configure.in 4 Sep 2002 02:25:53 -0000 > @@ -570,7 +570,8 @@ > # around this potential problem by just defining caddr_t to 'char *' on all > # systems (unless it is set already), whether it will be needed or not. > > -AC_CHECK_TYPE(caddr_t, char *) > +# This check is busted. Since linux has caddr_t, just turn off the check. > +#AC_CHECK_TYPE(caddr_t, char *) > > # ---------------------------------------------------------------------------- > # If you don't know what this is for you shouldn't be using it. > Index: cf/sysloc.in > =================================================================== > RCS file: /cvsroot/plplot/plplot/cf/sysloc.in,v > retrieving revision 1.108 > diff -u -r1.108 sysloc.in > --- cf/sysloc.in 20 Aug 2002 10:57:06 -0000 1.108 > +++ cf/sysloc.in 4 Sep 2002 02:25:54 -0000 > @@ -962,6 +962,10 @@ > if test "$with_dbmalloc" = "yes"; then > if test -z "$DBMALLOCINCDIR"; then > incdirs="\ > + $prefix/include/python2.1 \ > + /usr/include/python2.1 \ > + $prefix/include/python2.1/Numeric \ > + /usr/include/python2.1/Numeric \ > $prefix/include \ > $HOME/local/include \ > $HOME/local/dbmalloc/include \ > > > ------------------------------------------------------- > This sf.net email is sponsored by: OSDN - Tired of that same old > cell phone? Get a new here for FREE! > https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390 > _______________________________________________ > Plplot-devel mailing list > Plp...@li... > https://lists.sourceforge.net/lists/listinfo/plplot-devel > |
From: Alan W. I. <ir...@be...> - 2002-09-04 20:42:14
|
On Tue, 3 Sep 2002, Alan W. Irwin wrote: > BTW, some of my current linking changes have messed up relocatibility of the > install location (required for both rpm and deb packaging). I am working on > fixing that at the moment, but once that is done, it would be most > interesting to see if debs could be built from CVS HEAD. I believe I now have this relocatibility issue completely solved. For example, the remaining itcl issue that is blocking me from building RH 7.3 rpm's from current CVS does not seem to be related to relocatibility. To test this, however, I would like to try to build the debs from CVS HEAD. David, can you make the debian subdirectory available to CVS HEAD so I can try the build or is there some reason why the debian subdirectory should remain isolated in its own CVS branch? Alan |
From: David S. <ds...@sc...> - 2002-09-11 21:31:16
|
On Wed, Sep 04, 2002 at 01:42:01PM -0700, Alan W. Irwin wrote: > David, can you make the debian subdirectory available to CVS HEAD so I can > try the build or is there some reason why the debian subdirectory should > remain isolated in its own CVS branch? I was just following what Rafael did. The reason for having a separate branch (I think) is because there were patches applied to other parts of the tree. So technically, the DEBIAN branch is a fork of the 5.1.0 release, not HEAD. It is occasionally difficult to make Debian packaging scripts work with both HEAD and a release, but it is usually worth the effort. I'm still under the assumption that Rafael is going to return to the Debian packages =), but I'll continue to work slowly on them until that time. dave... |