[Pkg-jed-commit] r40 - trunk/packages/jed/debian
Jörg Sommer
jo-guest@costa.debian.org
Thu, 05 May 2005 10:52:42 +0000
Author: jo-guest
Date: 2005-05-05 10:52:41 +0000 (Thu, 05 May 2005)
New Revision: 40
Modified:
trunk/packages/jed/debian/changelog
trunk/packages/jed/debian/jed-common.postinst
trunk/packages/jed/debian/jed-common.prerm
trunk/packages/jed/debian/rules
Log:
* jed/debian/rules:
+ changed installation strategy; Now we use upstreams makefile to install
into debian/tmp and copy from there the files into the packages. This
has the advantage, we have not to keep track of which files should be
installed and what not. version 0.99.16-5 installs vms_shell.com!
+ added new target to install the files into debian/tmp; this target
alters the files in debian/tmp to get a cleaner layout for
installation (create manpages, build html from jed.tex)
+ removed the target html; now this is done in debian/tmp
+ activated dh_clean for binary-indep and -arch, but made them more
restrictive to not remove debian/tmp and clean only indep or arch
files
* extended debian/changelog
* added dots after "Running .../jed-common" message in postinst and prerm
Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog 2005-05-03 16:49:25 UTC (rev 39)
+++ trunk/packages/jed/debian/changelog 2005-05-05 10:52:41 UTC (rev 40)
@@ -15,8 +15,8 @@
- jed-common Conflicts with and Replaces jed-sl
* debian/rules: Dropped stuff related to jed-sl
* debian/compile: New script to compile/remove he *.slc files.
- * debian/jed-common.postinst, debian/jed-common.prerm: Run files in
- /usr/share/jed/compile with the approprite arguments.
+ * debian/jed-common.postinst, debian/jed-common.prerm: Run
+ /usr/share/jed/compile/jed-common with the approprite arguments.
* debian/jed-sl.*: Removed files
+++ Changes by Jörg Sommer
@@ -26,6 +26,18 @@
* moved /u/s/j/l/jed.conf to /u/s/d/jed-common/examples (Closes: 287781)
* discribed the handling of ~/.jed/, if jed-extra is installed
(Closes: 210274)
+ * changed build strategy of installing files in packages, The old way
+ (copying the files from the source tree) had some problems. Files they
+ are excluded by upstream installation were installed (jed.conf,
+ vms_shell.com). Now, upstream Makefile installes in debian/tmp and
+ from there the packages become filled.
+ * build the executables without RPATH; lintian had warned
+ * added jed-script and a manpage for it to the package
+ * debian/control:
+ + removed jed-common dependency on slang
+ + added xjed to recommends of jed-common
+ + changed description of jed-common
+ * rewrote rules to make more use of debhelper
--
Modified: trunk/packages/jed/debian/jed-common.postinst
===================================================================
--- trunk/packages/jed/debian/jed-common.postinst 2005-05-03 16:49:25 UTC (rev 39)
+++ trunk/packages/jed/debian/jed-common.postinst 2005-05-05 10:52:41 UTC (rev 40)
@@ -8,7 +8,7 @@
TEMP=$(tempfile)
RET=0
- printf "Running /usr/share/jed/compile/jed-common"
+ printf "Running /usr/share/jed/compile/jed-common..."
/usr/share/jed/compile/jed-common install >$TEMP 2>&1 || RET=$?
if test "$RET" -ne 0 ; then
echo "failed (see $TEMP)"
Modified: trunk/packages/jed/debian/jed-common.prerm
===================================================================
--- trunk/packages/jed/debian/jed-common.prerm 2005-05-03 16:49:25 UTC (rev 39)
+++ trunk/packages/jed/debian/jed-common.prerm 2005-05-05 10:52:41 UTC (rev 40)
@@ -5,7 +5,7 @@
install-info --quiet --remove /usr/share/info/jed.info.gz
TEMP=$(tempfile)
-printf "Running /usr/share/jed/compile/jed-common"
+printf "Running /usr/share/jed/compile/jed-common..."
/usr/share/jed/compile/jed-common remove >$TEMP 2>&1 || RET=$?
if test "$RET" -ne 0 ; then
echo "failed (see $TEMP)"
Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules 2005-05-03 16:49:25 UTC (rev 39)
+++ trunk/packages/jed/debian/rules 2005-05-05 10:52:41 UTC (rev 40)
@@ -7,14 +7,13 @@
jed=$(PWD)/debian/jed
xjed=$(PWD)/debian/xjed
jed-common=$(PWD)/debian/jed-common
+temp=debian/tmp
-
clean: unpatch
dh_testdir
dh_clean
-make distclean
rm -f build-stamp install-stamp
- -rm -r html
build: build-stamp
build-stamp: patch-stamp
@@ -40,44 +39,63 @@
touch build-stamp
-html: doc/manual/jed.tex
+$(temp): build-stamp
dh_testdir
- -rm -r html/
- mkdir html/
- hevea -fix -o html/jed.hevea doc/manual/jed.tex
- cd html; hacha jed.hevea
- -rm html/jed.hevea html/jed.haux html/jed.hind html/jed.htoc
-binary-indep: html
+ make DESTDIR=$(PWD)/$(temp) install
+
+ hevea -fix -o $(temp)/usr/share/jed/doc/manual/jed.hevea \
+ $(temp)/usr/share/jed/doc/manual/jed.tex
+ cd $(temp)/usr/share/jed/doc/manual/; hacha jed.hevea
+ cd $(temp)/usr/share/jed/doc/manual/; \
+ rm jed.hevea jed.haux jed.htoc jed.tex
+
+ # rename README, because we install later a second README
+ mv $(temp)/usr/share/jed/doc/README $(temp)/usr/share/jed/doc/README.doc
+ # we install manual as html in doc/jed-common
+ mv $(temp)/usr/share/jed/doc/manual $(temp)/usr/share/jed/doc/html
+ # info files should be in /usr/share/info
+ mv $(temp)/usr/share/jed/info $(temp)/usr/share/info
+
+# mv $(temp)/usr/bin/rgrep $(temp)/usr/bin/jgrep
+# mv $(temp)/usr/share/man/man1/rgrep.1 $(temp)/usr/share/man/man1/jgrep.1
+
+ # create manpages for jed-script and xjed
+ ln -s jed.1 $(temp)/usr/share/man/man1/jed-script.1
+ cp $(temp)/usr/share/man/man1/jed.1 $(temp)/usr/share/man/man1/xjed.1
+
+binary-indep: $(temp)
dh_testdir
dh_testroot
-# dh_clean --dirs-only
+ # keep dh_install informations (debian/files) and debian/tmp
+ dh_clean -X$(temp) -i --keep
dh_installdirs -i
@echo
@echo --- JED-COMMON ---
@echo
# install *.sl files
- dh_install -pjed-common --exclude=jed.conf --exclude=update-colors \
- lib usr/share/jed/
+ dh_install -pjed-common --autodest $(temp)/usr/share/jed/lib/
# fill up /usr/share/doc/jed-common
dh_installchangelogs -pjed-common changes.txt
- dh_installdocs -pjed-common doc/txt doc/README
- mv $(jed-common)/usr/share/doc/jed-common/README \
- $(jed-common)/usr/share/doc/jed-common/README.doc
- dh_installdocs --noscripts -pjed-common README html/ \
- debian/init.d/README.Debian-startup
+ dh_installdocs -pjed-common $(temp)/usr/share/jed/doc/txt \
+ $(temp)/usr/share/jed/doc/README.doc $(temp)/usr/share/jed/doc/html \
+ README debian/init.d/README.Debian-startup
+ dh_link -pjed-common usr/share/doc/jed-common usr/share/jed/doc
+ # install some extra docs from the source
dh_installexamples -pjed-common lib/jed.conf doc/tm/
- dh_link -pjed-common usr/share/doc/jed-common usr/share/jed/doc
# install info files
#dh_installinfo -pjed-common info/jed.info info/jed.?in
- cp info/jed.info info/jed.?in $(jed-common)/usr/share/info
+ dh_install -pjed-common --autodest $(temp)/usr/share/info/jed.info \
+ $(temp)/usr/share/info/jed.1in \
+ $(temp)/usr/share/info/jed.2in \
+ $(temp)/usr/share/info/jed.3in
- # install compile script to build *.slc files after installation
+ # install compile script to build *.slc files after installation
dh_install -pjed-common debian/compile usr/share/jed/compile
mv $(jed-common)/usr/share/jed/compile/compile \
$(jed-common)/usr/share/jed/compile/jed-common
@@ -97,32 +115,29 @@
dh_md5sums -i
dh_builddeb -i
-binary-arch: build
+binary-arch: $(temp)
dh_testdir
dh_testroot
-# dh_clean --dirs-only
+ # keep dh_install informations (debian/files) and debian/tmp
+ dh_clean -X$(temp) -a --keep
dh_installdirs -a
@echo
@echo --- JED ---
@echo
- 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 --autodest \
+ $(temp)/usr/bin/jed $(temp)/usr/share/man/man1/jed.1 \
+ $(temp)/usr/bin/jed-script $(temp)/usr/share/man/man1/jed-script.1
+# $(temp)/usr/bin/jgrep $(temp)/usr/share/man/man1/jgrep.1
-# dh_install -pjed src/$(ARCH)objs/rgrep usr/bin
-# mv $(jed)/usr/bin/rgrep $(jed)/usr/bin/jgrep
-# dh_installman -pjed doc/manual/rgrep.1
-# mv $(jed)/usr/share/man/man1/rgrep.1 $(jed)/usr/share/man/man1/jgrep.1
dh_link -pjed usr/share/doc/jed-common usr/share/doc/jed
@echo
@echo --- XJED ---
@echo
- dh_install -pxjed src/$(ARCH)objs/xjed usr/bin/
- dh_installman -pxjed doc/manual/jed.1
- mv $(xjed)/usr/share/man/man1/jed.1 $(xjed)/usr/share/man/man1/xjed.1
+ dh_install -pxjed --autodest \
+ $(temp)/usr/bin/xjed $(temp)/usr/share/man/man1/xjed.1
+
dh_link -pxjed usr/share/doc/jed-common usr/share/doc/xjed
@echo