Author: charles-guest
Date: 2007-07-04 13:16:16 +0000 (Wed, 04 Jul 2007)
New Revision: 54
Modified:
emboss/trunk/debian/README.debian
emboss/trunk/debian/changelog
emboss/trunk/debian/emboss.dirs
emboss/trunk/debian/emboss.install
emboss/trunk/debian/rules
Log:
Moving binaries to /usr/lib/emboss, renaming pscan and cons
Modified: emboss/trunk/debian/README.debian
===================================================================
--- emboss/trunk/debian/README.debian 2007-07-04 13:00:59 UTC (rev 53)
+++ emboss/trunk/debian/README.debian 2007-07-04 13:16:16 UTC (rev 54)
@@ -1,5 +1,25 @@
-Experimental packages for EMBOSS.
+EMBOSS for Debian
+=================
+Some programs renamed
+---------------------
+
+Some programs in EMBOSS have a name which is also used by other programs from
+other packages. The Debian distribution does not allow two packages to conflict
+in this way. Therfore 'cons' has been renamed 'em_cons' and 'pscan has been
+renamed 'em_scan'.
+
+There is a directory in which the program names are guaranteed to be always
+unchanged, /usr/lib/emboss. You can prepend it to your PATH, with a command
+such as 'PATH = /usr/lib/emboss:$PATH' with Bourne shells, so that when you run
+'cons' or 'pscan', it is always the EMBOSS program. Other programs could be
+renamed in the future, so it is strongly recommended to use this paht in your
+scripts.
+
+
+This is an experimental package
+-------------------------------
+
The Debian EMBOSS packaging team is currently preparing high quality packages
for EMBOSS and EMBASSY, and makes preliminary versions such as this one
available to the public in the experimental section of Debian.
@@ -7,4 +27,4 @@
WE DO NOT RECOMMEND TO USE EXPERIMENTAL PACKAGES IN A PRODUCTION ENVIRONMENT.
- -- Charles Plessy <charles-debian-nospam at plessy.org> Sun, 11 Mar 2007 21:10:51 +0900
+ -- Charles Plessy <charles-debian-nospam at plessy.org> Sun, 05 Jul 2007 08:03:29 +0900
Modified: emboss/trunk/debian/changelog
===================================================================
--- emboss/trunk/debian/changelog 2007-07-04 13:00:59 UTC (rev 53)
+++ emboss/trunk/debian/changelog 2007-07-04 13:16:16 UTC (rev 54)
@@ -1,8 +1,13 @@
-emboss (4.1.0-2) experimental; urgency=low
+emboss (4.1.0-2) unstable; urgency=low
+ * Renaming cons and pscan to em_cons and em_pscan, see README.Debian
+ for more information.
+ * Moved all the binaries to /usr/lib/emboss. /usr/bin contains only
+ symbolic links.
+ * Makes sure that there is a Makefile befor invoking the clean rule.
* Added /etc/emboss/embossrc.d directory for future modular
configuration.
- * Swiched from dpatch to quilt
+ * Swiched from dpatch to quilt.
* Applying latest fixes from ftp://emboss.open-bio.org/pub/EMBOSS/fixes
- Solves a display problem with abiview.
- Solves a display problem with banana and prettyplot.
@@ -10,7 +15,7 @@
http://lists.open-bio.org/pipermail/emboss/2007-May/002941.html
to inded lowercase IDs in EMBL-formatted databases.
- -- Charles Plessy <charles-debian-nospam at plessy.org> Mon, 4 Jun 2007 13:28:33 +0900
+ -- Charles Plessy <charles-debian-nospam at plessy.org> Wed, 4 Jul 2007 22:14:29 +0900
emboss (4.1.0-1) experimental; urgency=low
Modified: emboss/trunk/debian/emboss.dirs
===================================================================
--- emboss/trunk/debian/emboss.dirs 2007-07-04 13:00:59 UTC (rev 53)
+++ emboss/trunk/debian/emboss.dirs 2007-07-04 13:16:16 UTC (rev 54)
@@ -1,4 +1,5 @@
usr/bin
+usr/lib
etc/emboss/embossrc.d
usr/share/lintian/overrides
usr/share/linda/overrides
Modified: emboss/trunk/debian/emboss.install
===================================================================
--- emboss/trunk/debian/emboss.install 2007-07-04 13:00:59 UTC (rev 53)
+++ emboss/trunk/debian/emboss.install 2007-07-04 13:16:16 UTC (rev 54)
@@ -1,3 +1,4 @@
debian/emboss_tmp/usr/bin usr
+debian/emboss_tmp/usr/lib usr
debian/lintian/* usr/share/lintian/overrides
debian/linda/* usr/share/linda/overrides
Modified: emboss/trunk/debian/rules
===================================================================
--- emboss/trunk/debian/rules 2007-07-04 13:00:59 UTC (rev 53)
+++ emboss/trunk/debian/rules 2007-07-04 13:16:16 UTC (rev 54)
@@ -22,21 +22,20 @@
cat "AUTHORS" >> $@
cat "THANKS" >> $@
-clean: unpatch
+clean: unpatch config.status
dh_testdir
dh_testroot
+ $(MAKE) distclean
- -if [ -f Makefile ]; then $(MAKE) distclean ; fi
-
find jemboss/ -type f -name "*.class" | xargs -r rm -f
- -rm -rf ajax/.libs/*
- -rm -rf emboss/.libs/*
- -rm -rf plplot/.libs/*
- -rm -rf nucleus/.libs/*
+ rm -rf ajax/.libs/*
+ rm -rf emboss/.libs/*
+ rm -rf plplot/.libs/*
+ rm -rf nucleus/.libs/*
- rm -f config.status install-stamp
- dh_clean debian/copyright
+ rm -rf config.status install-stamp
+ dh_clean debian/copyright debian/emboss_tmp
install: install-stamp
install-stamp: build-stamp
@@ -48,6 +47,12 @@
dh_installchangelogs ChangeLog
$(MAKE) -C emboss install DESTDIR=`pwd`/debian/emboss_tmp
+ # Some binaries have a name already used in other Debian packages.
+ if [ ! -d `pwd`/debian/emboss_tmp/usr/lib/emboss ] ; then mkdir -p `pwd`/debian/emboss_tmp/usr/lib/emboss ; fi
+ mv `pwd`/debian/emboss_tmp/usr/bin/* `pwd`/debian/emboss_tmp/usr/lib/emboss
+ cd `pwd`/debian/emboss_tmp/usr/lib/emboss/ ; for i in * ; do ln -sf /usr/lib/emboss/$$i ../../bin/$$i ; done
+ for i in cons pscan ; do mv `pwd`/debian/emboss_tmp/usr/bin/$$i `pwd`/debian/emboss_tmp/usr/bin/em_$$i ; done
+
$(MAKE) -C ajax install DESTDIR=`pwd`/debian/emboss-lib
$(MAKE) -C nucleus install DESTDIR=`pwd`/debian/emboss-lib
$(MAKE) -C plplot install DESTDIR=`pwd`/debian/emboss-lib
@@ -83,8 +88,5 @@
dh_md5sums
dh_builddeb
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary