[Pkg-emboss-commits] r100 - emboss/trunk/debian
charles-guest at alioth.debian.org
charles-guest at alioth.debian.org
Mon Sep 17 05:00:53 UTC 2007
Author: charles-guest
Date: 2007-09-17 05:00:52 +0000 (Mon, 17 Sep 2007)
New Revision: 100
Added:
emboss/trunk/debian/libajax5-dev.dirs
emboss/trunk/debian/libnucleus5-dev.dirs
Modified:
emboss/trunk/debian/changelog
emboss/trunk/debian/control
emboss/trunk/debian/rules
Log:
More progresses in library packaging
Modified: emboss/trunk/debian/changelog
===================================================================
--- emboss/trunk/debian/changelog 2007-09-16 22:59:06 UTC (rev 99)
+++ emboss/trunk/debian/changelog 2007-09-17 05:00:52 UTC (rev 100)
@@ -13,10 +13,9 @@
* Removed inactive developer from the uploaders list.
[ Nelson A. de Oliveira ]
- * Fixed clean target to remove debian/libajax-5.0.0 and
- debian/libnucleus-5.0.0 (Closes: #442554).
+ * Checked and fixed clean target. (Closes: #442554).
- -- Nelson A. de Oliveira <naoliv at debian.org> Sun, 16 Sep 2007 19:05:37 -0300
+ -- Charles Plessy <charles-debian-nospam at plessy.org> Mon, 17 Sep 2007 13:07:07 +0900
emboss (5.0.0-1) unstable; urgency=low
Modified: emboss/trunk/debian/control
===================================================================
--- emboss/trunk/debian/control 2007-09-16 22:59:06 UTC (rev 99)
+++ emboss/trunk/debian/control 2007-09-17 05:00:52 UTC (rev 100)
@@ -7,6 +7,7 @@
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-emboss/emboss/trunk/debian
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-emboss/emboss/
Standards-Version: 3.7.2
+Homepage: http://www.emboss.org
Package: emboss
Architecture: any
@@ -27,8 +28,6 @@
Reference for EMBOSS: Rice,P. Longden,I. and Bleasby,A.
"EMBOSS: The European Molecular Biology Open Software Suite"
Trends in Genetics June 2000, vol 16, No 6. pp.276-277
- .
- Homepage: http://www.emboss.org
Package: emboss-data
Architecture: all
@@ -50,7 +49,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: EMBOSS Libraries
- This package is being emptied.
+ This package is being emptied. For the moment it contains a eplplot, an EMBOSS
+ fork of the plplot library.
Package: libajax5
Section: libs
Added: emboss/trunk/debian/libajax5-dev.dirs
===================================================================
--- emboss/trunk/debian/libajax5-dev.dirs (rev 0)
+++ emboss/trunk/debian/libajax5-dev.dirs 2007-09-17 05:00:52 UTC (rev 100)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include/ajax
Added: emboss/trunk/debian/libnucleus5-dev.dirs
===================================================================
--- emboss/trunk/debian/libnucleus5-dev.dirs (rev 0)
+++ emboss/trunk/debian/libnucleus5-dev.dirs 2007-09-17 05:00:52 UTC (rev 100)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include/nucleus
Modified: emboss/trunk/debian/rules
===================================================================
--- emboss/trunk/debian/rules 2007-09-16 22:59:06 UTC (rev 99)
+++ emboss/trunk/debian/rules 2007-09-17 05:00:52 UTC (rev 100)
@@ -5,6 +5,10 @@
VERSION := $(shell dpkg-parsechangelog | grep Ver | cut -d' ' -f2 | cut -d- -f1)
RENAMED := cons pscan
+EMBOSS-TMP = $(CURDIR)/debian/emboss_tmp
+AJAX = $(CURDIR)/debian/libajax5
+NUCLEUS = $(CURDIR)/debian/libnucleus5
+
config.status:
dh_testdir
./configure \
@@ -50,8 +54,6 @@
rm -rf nucleus/.libs/*
rm -rf debian/emboss_tmp
- rm -rf debian/libajax-5.0.0
- rm -rf debian/libnucleus-5.0.0
rm -rf config.status install-stamp
dh_clean debian/copyright
@@ -63,34 +65,47 @@
dh_clean -k
dh_installdirs
- $(MAKE) -C emboss install DESTDIR=$(CURDIR)/debian/emboss_tmp
- # Some binaries have a name already used in other Debian packages.
- if [ ! -d $(CURDIR)/debian/emboss_tmp/usr/lib/emboss ] ; \
- then mkdir -p $(CURDIR)/debian/emboss_tmp/usr/lib/emboss ; \
+ ### Binaries and data go to a temporary dir before being moved to their own package ###
+ $(MAKE) -C emboss install DESTDIR=$(EMBOSS-TMP)
+
+ ### Binaries will be in /usr/lib/emboss, and symlinks are provided in /usr/bin. ###
+ if [ ! -d $(EMBOSS-TMP)/usr/lib/emboss ] ; \
+ then mkdir -p $(EMBOSS-TMP)/usr/lib/emboss ; \
fi
- mv $(CURDIR)/debian/emboss_tmp/usr/bin/* $(CURDIR)/debian/emboss_tmp/usr/lib/emboss
- cd $(CURDIR)/debian/emboss_tmp/usr/lib/emboss/ ; \
+ mv $(EMBOSS-TMP)/usr/bin/* $(EMBOSS-TMP)/usr/lib/emboss
+ cd $(EMBOSS-TMP)/usr/lib/emboss/ ; \
for i in * ; \
do ln -sf ../lib/emboss/$$i ../../bin/$$i ; \
done
- # Renaming conflicting binaries (see also in binary-arch)
+ ### Renaming conflicting binaries (see also in binary-arch) ###
for i in $(RENAMED) ; \
- do mv $(CURDIR)/debian/emboss_tmp/usr/bin/$$i $(CURDIR)/debian/emboss_tmp/usr/bin/em_$$i ; \
+ do mv $(EMBOSS-TMP)/usr/bin/$$i $(EMBOSS-TMP)/usr/bin/em_$$i ; \
done
- $(MAKE) -C ajax install DESTDIR=$(CURDIR)/debian/libajax-$(VERSION)
- rm $(CURDIR)/debian/libajax-$(VERSION)/usr/include/pcre* # Not very elegant way to solve the conflict with libpcre-dev
- $(MAKE) -C nucleus install DESTDIR=$(CURDIR)/debian/libnucleus-$(VERSION)
+ ### Ajax library: lib and libdevel packages. ###
+ $(MAKE) -C ajax install DESTDIR=$(AJAX)
+ rm $(AJAX)/usr/include/pcre* # Not very elegant way to solve the conflict with libpcre-dev
+ mv $(AJAX)/usr/include/* $(AJAX)-dev/usr/include/ajax
+ mv $(AJAX)/usr/lib/*a $(AJAX)-dev/usr/lib
+
+ ### Nuleus library: lib and libdevel packages. ###
+ $(MAKE) -C nucleus install DESTDIR=$(NUCLEUS)
+ mv $(NUCLEUS)/usr/include/* $(NUCLEUS)-dev/usr/include/nucleus
+ mv $(NUCLEUS)/usr/lib/*a $(NUCLEUS)-dev/usr/lib
+
+ ### eplplot goes in emboss-lib, but lets'hope building on plplot some day. ###
$(MAKE) -C plplot install DESTDIR=$(CURDIR)/debian/emboss-lib
+
+ ### Documentation goes in emboss-doc. ###
$(MAKE) -C doc install DESTDIR=$(CURDIR)/debian/emboss-doc
+
+ ### Java is disabled until it becomes understandable. ###
#$(MAKE) -C jemboss install prefix=$(CURDIR)/debian/emboss-java/usr
-
-
# dangling LICEN[CS]E FILE
#-rm -f $(CURDIR)/debian/emboss-java/usr/share/EMBOSS/jemboss/LICENSE
- dh_makeshlibs
+ dh_makeshlibs # Should it be invoked now ?
touch install-stamp
More information about the Pkg-emboss-commits
mailing list