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

Jörg Sommer jo-guest at costa.debian.org
Sun Apr 30 00:48:05 UTC 2006 

Author: jo-guest
Date: 2006-04-30 00:48:04 +0000 (Sun, 30 Apr 2006)
New Revision: 267

Modified:
   trunk/packages/jed/debian/changelog
   trunk/packages/jed/debian/control
   trunk/packages/jed/debian/rules
Log:
* jed/debian/control:
  + the Policy forces to have a version for essential packages in the
    dependency field; added the version of the sarge package to findutils

* jed/debian/control, jed/debian/rules:
  + split the build process into an architecture dependent and an
    architecture independent part; because the independent part is not
    nneded for architectures other than i386 on the buildds this new
    version should decrease the load on buildds for architectures like
    arm.

  + removed all rgrep stuff, because we will never include it in the
    package #231329 -- what should happen with getmail?

  + split the build-dep field in control and reduced the build
    dependencies for the arch-indep target to those what's necessary


Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog	2006-04-29 16:19:53 UTC (rev 266)
+++ trunk/packages/jed/debian/changelog	2006-04-30 00:48:04 UTC (rev 267)
@@ -18,7 +18,7 @@
     + added the Homepage pseudo header as the developers reference
       suggests it in section 6.2.4. [JS]
 
-    + dropped the version from the findutils dependency and replaced the
+    + decreased the version from the findutils dependency and replaced the
       -delete option in the compile script in jed-common; this makes
       backporting of the package easier. [JS]
 
@@ -54,7 +54,7 @@
   [GM] Guenter Milde
   [RL] Rafael Laboissiere
 
- -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>  Sat, 29 Apr 2006 18:04:56 +0200
+ -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>  Sun, 30 Apr 2006 01:38:51 +0200
 
 jed (0.99.17.135-1) experimental; urgency=low
 

Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control	2006-04-29 16:19:53 UTC (rev 266)
+++ trunk/packages/jed/debian/control	2006-04-30 00:48:04 UTC (rev 267)
@@ -4,7 +4,8 @@
 Maintainer: Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper, hevea, libgpmg1-dev [!hurd-i386 !kfreebsd-i386], libslang2-dev, libxft-dev, libxt-dev, dpatch
+Build-Depends-Indep: debhelper, dpatch, hevea
+Build-Depends: debhelper, dpatch, libgpmg1-dev [!hurd-i386 !kfreebsd-i386], libslang2-dev, libxft-dev, libxt-dev
 
 Package: jed
 Architecture: any
@@ -55,7 +56,7 @@
 Replaces: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl
 Conflicts: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl, jed-extra (<= 1.0-1)
 Recommends: jed | xjed
-Depends: debconf | debconf-2.0, findutils
+Depends: debconf | debconf-2.0, findutils (>= 4.1.20-6)
 Description: S-Lang runtime files for jed and xjed
  This package provides the S-Lang runtime files that are needed by both
  jed and xjed.

Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules	2006-04-29 16:19:53 UTC (rev 266)
+++ trunk/packages/jed/debian/rules	2006-04-30 00:48:04 UTC (rev 267)
@@ -13,7 +13,9 @@
 	dh_testdir
 	dh_clean
 	-make distclean
-	rm -f src/config.h build-stamp install-stamp
+	rm -f build-stamp install-stamp
+	# fixme-upstream
+	rm -f src/config.h
 
 build: build-stamp
 build-stamp: patch-stamp
@@ -23,64 +25,57 @@
 	#
 	# --- MAKE ---
 	#
-	make jed xjed # rgrep getmail
+	make jed xjed # getmail
 
 	touch build-stamp
 
-$(temp): build-stamp
+binary-indep: patch-stamp
 	dh_testdir
-
-	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
-
-	# 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
 	# keep dh_install informations (debian/files) and debian/tmp
-	dh_clean -X$(temp) -i --keep
+	dh_clean -i --keep
 	dh_installdirs -i
 
+	if ! [ -e src/objs/jed ]; then > src/objs/jed; fi
+	make DESTDIR=$(jed-common) install
+	if ! [ -s src/objs/jed ]; then rm src/objs/jed; fi
+	rm -r $(jed-common)/usr/bin/ \
+	# fixme-upstream
+	rm -r $(jed-common)/usr/share/jed/bin/ $(jed-common)/usr/share/man/man1/rgrep.1
+
 	#
 	# --- JED-COMMON ---
 	#
-	# install *.sl files
-	dh_install -pjed-common -Xjed.rc --autodest $(temp)/usr/share/jed/lib/
-	dh_install -pjed-common debian/defaults.sl usr/share/jed/lib/
-
 	# fill up /usr/share/doc/jed-common
 	dh_installchangelogs -pjed-common changes.txt
 
-	dh_installdocs -pjed-common $(temp)/usr/share/jed/doc/* \
-            debian/init.d/README.Debian-startup debian/Debian-Jed-Policy.txt
+	mv $(jed-common)/usr/share/jed/doc/* \
+	    $(jed-common)/usr/share/doc/jed-common
+	rmdir $(jed-common)/usr/share/jed/doc
 	dh_link -pjed-common usr/share/doc/jed-common usr/share/jed/doc
+	dh_installdocs -pjed-common debian/init.d/README.Debian-startup \
+	    debian/Debian-Jed-Policy.txt
 
+	mv $(jed-common)/usr/share/doc/jed-common/manual \
+	    $(jed-common)/usr/share/doc/jed-common/html
+	hevea -fix -o $(jed-common)/usr/share/doc/jed-common/html/jed.hevea \
+	    $(jed-common)/usr/share/doc/jed-common/html/jed.tex
+	cd $(jed-common)/usr/share/doc/jed-common/html/; hacha jed.hevea
+	cd $(jed-common)/usr/share/doc/jed-common/html/; \
+	    rm jed.hevea jed.haux jed.htoc jed.tex
+
 	# install some extra docs from the source
 	dh_installexamples -pjed-common lib/jed.conf doc/tm/ \
-	    $(temp)/usr/share/jed/lib/jed.rc
+	    $(jed-common)/usr/share/jed/lib/jed.rc
 
+	# install *.sl files
+	dh_install -pjed-common debian/defaults.sl usr/share/jed/lib/
+	rm $(jed-common)/usr/share/jed/lib/jed.rc # it's moved to examples above
+
 	# install info files
-	#dh_installinfo -pjed-common info/jed.info info/jed.?in
-	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
+	mv $(jed-common)/usr/share/jed/info $(jed-common)/usr/share
+	rm $(jed-common)/usr/share/jed/dir.info \
+	    $(jed-common)/usr/share/jed/info.info
 
 	# install compile script to build *.slc files after installation
 	dh_install -pjed-common debian/compile usr/share/jed/compile
@@ -90,7 +85,7 @@
 
 	# fill up /etc
 	dh_install -pjed-common debian/init.d/*.sl etc/jed.d/
-	dh_link usr/share/doc/jed-common/README.Debian-startup etc/jed.d/README
+	dh_link -i usr/share/doc/jed-common/README.Debian-startup etc/jed.d/README
 
 	dh_installdebconf -i
 
@@ -105,35 +100,31 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: $(temp)
+binary-arch: build-stamp
 	dh_testdir
 	dh_testroot
 	# keep dh_install informations (debian/files) and debian/tmp
-	dh_clean -X$(temp) -a --keep
+	dh_clean -a
 	dh_installdirs -a
 
 	#
 	# --- JED ---
 	#
-	dh_install -pjed --autodest \
-	    $(temp)/usr/bin/jed $(temp)/usr/share/man/man1/jed.1
-#	    $(temp)/usr/bin/jgrep $(temp)/usr/share/man/man1/jgrep.1
-
+	dh_install -pjed src/objs/jed usr/bin/
+	dh_installman -pjed doc/manual/jed.1
 	dh_link -pjed usr/share/doc/jed-common usr/share/doc/jed
 
 	#
 	# --- XJED ---
 	#
-	dh_install -pxjed --autodest \
-	    $(temp)/usr/bin/xjed $(temp)/usr/share/man/man1/xjed.1
-
+	dh_install -pxjed src/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
 
 	#
 	# --- INSTALL-ARCH-DEP ---
 	#
-	dh_link -a
-
 	dh_installmenu -a
 	dh_fixperms -a
 	dh_strip -a

More information about the Pkg-jed-commit mailing list