[Pkg-jed-commit] r38 - trunk/packages/jed/debian
Jörg Sommer
jo-guest@costa.debian.org
Mon, 02 May 2005 21:09:10 +0000
Author: jo-guest
Date: 2005-05-02 21:09:09 +0000 (Mon, 02 May 2005)
New Revision: 38
Removed:
trunk/packages/jed/debian/jed-common.docs
trunk/packages/jed/debian/jed-common.info
trunk/packages/jed/debian/jed-common.links
trunk/packages/jed/debian/jed.dirs
trunk/packages/jed/debian/jed.links
trunk/packages/jed/debian/xjed.dirs
trunk/packages/jed/debian/xjed.links
Modified:
trunk/packages/jed/debian/compile
trunk/packages/jed/debian/jed-common.dirs
trunk/packages/jed/debian/rules
Log:
jed:
* rewritten rules
+ to make more use of debhelper scripts
+ added a new target html to create the html documentation from
jed.tex; add code to clean to remove it
+ removed dh_testroot from clean, because root privileges aren't needed
for this task
+ clean should not remove .slc and .dfa files from lib/, because we
didn't created them there
+ binary-indep doesn't depend on build; added dependency on html
+ don't install lib/colors/update-colors with lib/ into jed-common,
because upstream does so too
+ removed patching of html files, because the string "Charl P. Botha"
isn't in them
+ removed dh_shlibdepends from build-indep, because there are no
library dependencies
+ changed to the long version of command option for some commands
+ disabled cleaning up before installing files. I didn't find any
problems, but have the advantage that the directories debian/jed,
debian/jed-common, debian/xjed are available after build
+ installed a symlink jed-script on jed, because the --help mesage of
jed includes it and the upstream makefile would install it
* removed jed-common.docs, jed-common.info, jed-common.links, jed.dirs,
jed.links, xjed.dirs, xjed.links, they aren't needed after this rewrite
* stripped down jed-common.dirs to what is necessary
* made debian/compile executable
Property changes on: trunk/packages/jed/debian/compile
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/jed/debian/jed-common.dirs
===================================================================
--- trunk/packages/jed/debian/jed-common.dirs 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/jed-common.dirs 2005-05-02 21:09:09 UTC (rev 38)
@@ -1,8 +1,4 @@
etc
etc/jed-init.d
-usr/share/doc/jed-common
-usr/share/doc/jed-common/examples
-usr/share/info
usr/share/jed/lib
usr/share/jed/compile
-usr/sbin
Deleted: trunk/packages/jed/debian/jed-common.docs
===================================================================
--- trunk/packages/jed/debian/jed-common.docs 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/jed-common.docs 2005-05-02 21:09:09 UTC (rev 38)
@@ -1 +0,0 @@
-README
Deleted: trunk/packages/jed/debian/jed-common.info
===================================================================
--- trunk/packages/jed/debian/jed-common.info 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/jed-common.info 2005-05-02 21:09:09 UTC (rev 38)
@@ -1 +0,0 @@
-info/jed.info
Deleted: trunk/packages/jed/debian/jed-common.links
===================================================================
--- trunk/packages/jed/debian/jed-common.links 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/jed-common.links 2005-05-02 21:09:09 UTC (rev 38)
@@ -1 +0,0 @@
-usr/share/doc/jed-common usr/share/jed/doc
Deleted: trunk/packages/jed/debian/jed.dirs
===================================================================
--- trunk/packages/jed/debian/jed.dirs 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/jed.dirs 2005-05-02 21:09:09 UTC (rev 38)
@@ -1,4 +0,0 @@
-etc
-usr/bin
-usr/share/jed/lib
-usr/share/man/man1
Deleted: trunk/packages/jed/debian/jed.links
===================================================================
--- trunk/packages/jed/debian/jed.links 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/jed.links 2005-05-02 21:09:09 UTC (rev 38)
@@ -1 +0,0 @@
-usr/share/doc/jed-common usr/share/doc/jed
Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/rules 2005-05-02 21:09:09 UTC (rev 38)
@@ -4,11 +4,18 @@
include /usr/share/dpatch/dpatch.make
-jed=`pwd`/debian/jed
-xjed=`pwd`/debian/xjed
-jed-common=`pwd`/debian/jed-common
+jed=$(PWD)/debian/jed
+xjed=$(PWD)/debian/xjed
+jed-common=$(PWD)/debian/jed-common
+clean: unpatch
+ dh_testdir
+ dh_clean
+ -make distclean
+ rm -f build-stamp install-stamp
+ -rm -r html
+
build: build-stamp
build-stamp: patch-stamp
dh_testdir
@@ -29,121 +36,100 @@
@echo
@echo --- MAKE ---
@echo
- make JED_ROOT=/usr/share/jed
- make xjed JED_ROOT=/usr/share/jed
-# make rgrep JED_ROOT=/usr/share/jed
- make getmail JED_ROOT=/usr/share/jed
- cd doc/manual/ && \
- rm -rf jed && \
- mkdir jed && \
- hevea -fix -o jed/jed.hevea jed.tex && \
- cd jed && \
- hacha jed.hevea && \
- rm -f jed.hevea *.haux *.hind *.htoc
+ make jed xjed # rgrep getmail
touch build-stamp
-
-clean: unpatch
+html: doc/manual/jed.tex
dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp
- find lib/ -name "*.slc" -exec rm {} \;
- find lib/ -name "*.dfa" -exec rm {} \;
- rm -f src/config.h config.log config.status
- rm -rf doc/manual/jed
- dh_clean
- -make distclean
+ -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: build
+binary-indep: html
dh_testdir
dh_testroot
- dh_clean -k
+# dh_clean --dirs-only
dh_installdirs -i
@echo
@echo --- JED-COMMON ---
@echo
- cp -r lib $(jed-common)/usr/share/jed/
- mv $(jed-common)/usr/share/jed/lib/jed.conf \
- $(jed-common)/usr/share/doc/jed-common/examples
- # install docs
- cp -r doc/* $(jed-common)/usr/share/doc/jed-common
+ # install *.sl files
+ dh_install -pjed-common --exclude=jed.conf --exclude=update-colors \
+ lib usr/share/jed/
+
+ # 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
- cp changes.txt \
- $(jed-common)/usr/share/doc/jed-common/changelog
- mkdir $(jed-common)/usr/share/doc/jed-common/examples
- mv $(jed-common)/usr/share/doc/jed-common/tm \
- $(jed-common)/usr/share/doc/jed-common/examples/tm
- cp info/jed* $(jed-common)/usr/share/info
- # make HTML from jed.tex
- mv $(jed-common)/usr/share/doc/jed-common/manual/jed \
- $(jed-common)/usr/share/doc/jed-common/html
- perl -w -i -p \
- -e 's/Charl P. Botha/John E. Davis/g' \
- $(jed-common)/usr/share/doc/jed-common/html/*
- # instal init.d
- install -m 644 debian/init.d/*.sl $(jed-common)/etc/jed-init.d
- # install jed.conf
- install -m 644 debian/init.d/jed.conf $(jed-common)/etc
- install -m 755 debian/compile \
- $(jed-common)/usr/share/jed/compile/jed-common
- #install -m 755 debian/init.d/jed-update-startup \
- # $(jed-common)/usr/sbin
- install -m 644 debian/init.d/README.Debian-startup \
- $(jed-common)/usr/share/doc/jed-common
- #install -m 644 debian/init.d/jed-update-startup.8 \
- # $(jed-common)/usr/share/man/man8
+ $(jed-common)/usr/share/doc/jed-common/README.doc
+ dh_installdocs --noscripts -pjed-common README html/ \
+ debian/init.d/README.Debian-startup
+ 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
+
+ # 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
+
+ # fill up /etc
+ dh_install -pjed-common debian/init.d/*.sl etc/jed-init.d/
+ dh_install -pjed-common debian/init.d/jed.conf etc/
+
@echo
@echo --- INSTALL-ARCH-INDEP ---
@echo
- dh_link -i
- dh_installdocs -i
- dh_installchangelogs -pjed-common
- dh_installinfo -i -n
- dh_compress -i -Xlibfuns -Xjedfuns -Xslangfun
+ dh_compress -i --exclude=libfuns --exclude=jedfuns --exclude=slangfun
+
dh_fixperms -i
- chmod a+x $(jed-common)/usr/share/doc/jed-common/examples/tm/rtl/whatelse.sl
- chmod a+x $(jed-common)/usr/share/doc/jed-common/examples/tm/rtl/tm-sort.sl
dh_installdeb -i
- dh_shlibdeps -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
-
binary-arch: build
dh_testdir
dh_testroot
- dh_clean -k
+# dh_clean --dirs-only
dh_installdirs -a
@echo
@echo --- JED ---
@echo
- install src/$(ARCH)objs/jed $(jed)/usr/bin
-# install src/$(ARCH)objs/rgrep $(jed)/usr/bin
+ 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_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
- install src/$(ARCH)objs/xjed $(xjed)/usr/bin
+ 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_link -pxjed usr/share/doc/jed-common usr/share/doc/xjed
@echo
@echo --- INSTALL-ARCH-DEP ---
@echo
dh_link -a
- install -m644 doc/manual/jed.1 $(xjed)/usr/share/man/man1/xjed.1
- gzip -9 $(xjed)/usr/share/man/man1/xjed.1
- install -m644 doc/manual/jed.1 $(jed)/usr/share/man/man1/jed.1
- gzip -9 $(jed)/usr/share/man/man1/jed.1
-# install -m644 doc/manual/rgrep.1 $(jed)/usr/share/man/man1/jgrep.1
-# gzip -9 $(jed)/usr/share/man/man1/jgrep.1
+
dh_installdocs -a # just for the /usr/doc link
- # only jed-common: dh_installchangelogs -a
dh_installmenu -a
dh_fixperms -a
dh_strip -a
@@ -151,10 +137,8 @@
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
- dh_makeshlibs -a
dh_md5sums -a
dh_builddeb -a
-
binary: binary-arch binary-indep
.PHONY: build clean binary binary-arch binary-indep
Deleted: trunk/packages/jed/debian/xjed.dirs
===================================================================
--- trunk/packages/jed/debian/xjed.dirs 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/xjed.dirs 2005-05-02 21:09:09 UTC (rev 38)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
Deleted: trunk/packages/jed/debian/xjed.links
===================================================================
--- trunk/packages/jed/debian/xjed.links 2005-05-02 21:07:28 UTC (rev 37)
+++ trunk/packages/jed/debian/xjed.links 2005-05-02 21:09:09 UTC (rev 38)
@@ -1 +0,0 @@
-usr/share/doc/jed-common usr/share/doc/xjed