[Pkg-jed-commit] r39 - trunk/packages/jed/debian

[Jörg Sommer]

Author: jo-guest
Date: 2005-05-03 16:49:25 +0000 (Tue, 03 May 2005)
New Revision: 39

Modified:
   trunk/packages/jed/debian/jed-common.dirs
   trunk/packages/jed/debian/jed-common.postinst
   trunk/packages/jed/debian/jed-common.prerm
   trunk/packages/jed/debian/rules
Log:
jed:

* lintian warns about RPATH in jed and xjed
  W: xjed: binary-or-shlib-defines-rpath ./usr/bin/xjed /usr/lib
  N:
  N:   The binary or shared library defines the `RPATH'. Usually this is a
  N:   bad thing. Most likely you will find a Makefile with a line like:
  N:       gcc test.o -o test -Wl,--rpath
  N:   or
  N:       gcc test.o -o test -R/usr/local/lib
  N:   Please contact debian-devel@lists.debian.org if you have questions
  N:   about this.
  
  I found no way to avoid setting this variable in src/Makefile by
  configure. The only way is to overwrite it when calling make.

* Debian policy expect a manpage for every file in $PATH, I added one for
  jed-scipt as a link on jed

* Redirected the stdout and stderr of /u/s/j/compile/jed-common in
  postinst and prerm of jed-common

* added usr/share/info to jed-common.dirs, because we must install the
  info page by hand, because dh_installinfo can't deal with this page

* now lintian says nothing about the package


Modified: trunk/packages/jed/debian/jed-common.dirs
===================================================================
--- trunk/packages/jed/debian/jed-common.dirs	2005-05-02 21:09:09 UTC (rev 38)
+++ trunk/packages/jed/debian/jed-common.dirs	2005-05-03 16:49:25 UTC (rev 39)
@@ -1,4 +1,5 @@
 etc
 etc/jed-init.d
+usr/share/info
 usr/share/jed/lib
 usr/share/jed/compile

Modified: trunk/packages/jed/debian/jed-common.postinst
===================================================================
--- trunk/packages/jed/debian/jed-common.postinst	2005-05-02 21:09:09 UTC (rev 38)
+++ trunk/packages/jed/debian/jed-common.postinst	2005-05-03 16:49:25 UTC (rev 39)
@@ -9,7 +9,7 @@
 	RET=0
 
 	printf "Running /usr/share/jed/compile/jed-common"
-	/usr/share/jed/compile/jed-common install 2>$TEMP || RET=$?
+	/usr/share/jed/compile/jed-common install >$TEMP 2>&1 || RET=$?
 	if test "$RET" -ne 0 ; then
 		echo "failed (see $TEMP)"
 		exit $RET

Modified: trunk/packages/jed/debian/jed-common.prerm
===================================================================
--- trunk/packages/jed/debian/jed-common.prerm	2005-05-02 21:09:09 UTC (rev 38)
+++ trunk/packages/jed/debian/jed-common.prerm	2005-05-03 16:49:25 UTC (rev 39)
@@ -6,7 +6,7 @@
 
 TEMP=$(tempfile)
 printf "Running /usr/share/jed/compile/jed-common"
-/usr/share/jed/compile/jed-common remove 2>$TEMP || RET=$?
+/usr/share/jed/compile/jed-common remove >$TEMP 2>&1 || RET=$?
 if test "$RET" -ne 0 ; then
 	echo "failed (see $TEMP)"
 	exit $RET

Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules	2005-05-02 21:09:09 UTC (rev 38)
+++ trunk/packages/jed/debian/rules	2005-05-03 16:49:25 UTC (rev 39)
@@ -36,7 +36,7 @@
 	@echo
 	@echo --- MAKE ---
 	@echo
-	make jed xjed  # rgrep getmail
+	make RPATH= jed xjed # rgrep getmail
 
 	touch build-stamp
 
@@ -109,6 +109,7 @@
 	dh_install -pjed src/$(ARCH)objs/jed usr/bin/
 	dh_link -pjed usr/bin/jed usr/bin/jed-script
 	dh_installman -pjed doc/manual/jed.1
+	dh_link -pjed usr/share/man/man1/jed.1 usr/share/man/man1/jed-script.1
 
 #	dh_install -pjed src/$(ARCH)objs/rgrep usr/bin
 #	mv $(jed)/usr/bin/rgrep $(jed)/usr/bin/jgrep