From: Matthias Klose <doko@cs.tu-berlin.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Date: Wed,  3 Jun 1998 15:32:45 +0200 (MET DST)
To: submit@bugs.debian.org
CC: munro@icf.llnl.gov
Subject: gist shared library needed
Message-ID: <13685.16570.781457.127811@gargleblaster>

Package: yorick
Version: 1.4-8
Severity: wishlist

I made some changes to the Debian yorick package and would ask to
include the changes into the Debian package. I am currently packaging
the Python gist module for dynamic loading and I need the gist files
compiled with the -fpic option. I made a shared library, which gets
included in yorick and yorick-gist. This includes changes in
Gist/Makefile.in, debian/rules, debian/changelog and the new files
debian/{,yorick-gist}.postinst.

Other changes:

- I compiled with -O2; -O2 is the most tested (used) optimization. At
  least the gist module works fine with this optimization.

- As I understand it, Debian policy wants the link libgist.so
  (pointing to libgist.so.1) only in the yorick0-dev package. However
  the debstd utility prevents this. I can do it with the debhelper
  utilities, but I didn't want to change the rules file to much.

The shared library isn't necessary for the gist module; a libgistpic.a
with the pic object files would be ok as well.

Thanks, Matthias

Btw: it's impossible to have yorick-gist and yorick-dev installed
     together. What if I only want to use the gist headers ;-)

Appended are the changes I made to the gist-1.4-8 package.

diff -c -r -P yorick-1.4/Gist/Makefile.in yorick-1.x/Gist/Makefile.in
*** yorick-1.4/Gist/Makefile.in	Fri Jan  3 19:22:49 1997
--- yorick-1.x/Gist/Makefile.in	Wed Jun  3 12:54:59 1998
***************
*** 149,160 ****
         gtext.h hlevel.h osys.h ps.h xbasic.h xfancy.h xfont.h xicky.h
  
  
! all:: libgist.a
  
  libgist.a: $(GISTOBJS) $(ENGINEOBJS) $(DISPOBJS) startup
  	ar rc libgist.a $(GISTOBJS) $(ENGINEOBJS) $(DISPOBJS)
  	$(RANLIB) libgist.a
  
  check: bench
  	./bench -check
  
--- 149,164 ----
         gtext.h hlevel.h osys.h ps.h xbasic.h xfancy.h xfont.h xicky.h
  
  
! all:: libgist.a libgist.so.1
  
  libgist.a: $(GISTOBJS) $(ENGINEOBJS) $(DISPOBJS) startup
  	ar rc libgist.a $(GISTOBJS) $(ENGINEOBJS) $(DISPOBJS)
  	$(RANLIB) libgist.a
  
+ SHAREDOBJS = $(GISTOBJS:.o=.pic_o) $(ENGINEOBJS:.o=.pic_o) $(DISPOBJS:.o=.pic_o)
+ libgist.so.1: $(SHAREDOBJS) startup
+ 	$(CC) -Wl,-h,$@ -shared -o $@ $(SHAREDOBJS)
+ 
  check: bench
  	./bench -check
  
***************
*** 191,200 ****
  	etags -twv *.h *.c >index
  
  clean: tidy
! 	$(RM) *.a bench
  
  tidy:
! 	$(RM) *.o *~ *.cgm core
  
  distclean: clean
  	$(RM) Makefile
--- 195,204 ----
  	etags -twv *.h *.c >index
  
  clean: tidy
! 	-$(RM) *.a *.so.? bench
  
  tidy:
! 	-$(RM) *.o *.pic_o *~ *.cgm core
  
  distclean: clean
  	$(RM) Makefile
***************
*** 204,209 ****
--- 208,216 ----
  # Remove TARGET_ARCH nonsense on Suns
  .c.o:
  	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+ 
+ %.pic_o: %.c
+ 	$(CC) -fpic -o $@ $(CPPFLAGS) $(CFLAGS) -c $<
  
  
  
diff -c -r -P yorick-1.4/debian/changelog yorick-1.x/debian/changelog
*** yorick-1.4/debian/changelog	Wed Jun  3 14:20:17 1998
--- yorick-1.x/debian/changelog	Wed Jun  3 13:19:26 1998
***************
*** 1,3 ****
--- 1,10 ----
+ yorick (1.4-8.1) unstable; urgency=low
+ 
+   * non maintainer changes.
+   * build shared gist library needed for the python gist module.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed,  3 Jun 1998 13:17:32 +0200
+ 
  yorick (1.4-8) unstable; urgency=low
  
    * added copyright for yorick-dev, upstream bug fixes
diff -c -r -P yorick-1.4/debian/postinst yorick-1.x/debian/postinst
*** yorick-1.4/debian/postinst	Thu Jan  1 01:00:00 1970
--- yorick-1.x/debian/postinst	Wed Jun  3 13:10:49 1998
***************
*** 0 ****
--- 1,3 ----
+ #!/bin/sh -e
+ 
+ ldconfig
diff -c -r -P yorick-1.4/debian/rules yorick-1.x/debian/rules
*** yorick-1.4/debian/rules	Wed Jun  3 14:20:17 1998
--- yorick-1.x/debian/rules	Wed Jun  3 14:13:21 1998
***************
*** 17,22 ****
--- 17,23 ----
  # passed along by make, e.g.-  HOSTTYPE=i386
  	FC=g77 ./configure --prefix=/usr --disable-share --with-gcc \
  	            --enable-suffix=$(HOSTTYPE)-debian-linux
+ 	make optimize O_FLAGS=-O2
  	make
  	make docs
  	strip Browser/gist
***************
*** 45,50 ****
--- 46,53 ----
  Y_SITE=usr/lib/yorick/`cat VERSION`
  Y_GIST=$(Y_SITE)/gist
  Y_HOME=$(Y_SITE)/$(HOSTTYPE)-debian-linux
+ SOLIB=libgist.so.1
+ SOLINK=libgist.so
  
  binary-arch:	checkroot build
  	$(checkdir)
***************
*** 74,80 ****
  	cp gist.1 debian/yorick-gist/usr/man/man1
  	cp debian/tmp/usr/bin/gist debian/yorick-gist/usr/bin
  	cp debian/tmp/$(Y_GIST)/ps.ps debian/yorick-gist/$(Y_GIST)
! # continue with the generic debmstd
  	debstd ANNOUNCE NEWS
  	dpkg-gencontrol -p$(package)
  	chown -R root.root debian/tmp
--- 77,88 ----
  	cp gist.1 debian/yorick-gist/usr/man/man1
  	cp debian/tmp/usr/bin/gist debian/yorick-gist/usr/bin
  	cp debian/tmp/$(Y_GIST)/ps.ps debian/yorick-gist/$(Y_GIST)
! # install the shared library by hand; the $(SOLIB) goes to yorick
! # and yorick-gist, the $(SOLINK) goes to yorick-dev
! 	cd debian/yorick-dev/usr/lib; ln -s $(SOLIB) $(SOLINK)
! 	install -m 644 Gist/$(SOLIB) debian/tmp/usr/lib/
! 	install -m 644 Gist/$(SOLIB) debian/yorick-gist/usr/lib/
! # continue with the generic debstd
  	debstd ANNOUNCE NEWS
  	dpkg-gencontrol -p$(package)
  	chown -R root.root debian/tmp
diff -c -r -P yorick-1.4/debian/yorick-gist.postinst yorick-1.x/debian/yorick-gist.postinst
*** yorick-1.4/debian/yorick-gist.postinst	Thu Jan  1 01:00:00 1970
--- yorick-1.x/debian/yorick-gist.postinst	Wed Jun  3 13:10:49 1998
***************
*** 0 ****
--- 1,3 ----
+ #!/bin/sh -e
+ 
+ ldconfig