[Pkg-emboss-commits] r102 - emboss/trunk/debian

[charles-guest at alioth.debian.org]

Author: charles-guest
Date: 2007-09-25 17:09:53 +0000 (Tue, 25 Sep 2007)
New Revision: 102

Modified:
   emboss/trunk/debian/changelog
   emboss/trunk/debian/control
   emboss/trunk/debian/rules
Log:
Preparing the arrival of embassy packages

Modified: emboss/trunk/debian/changelog
===================================================================
--- emboss/trunk/debian/changelog	2007-09-21 14:37:18 UTC (rev 101)
+++ emboss/trunk/debian/changelog	2007-09-25 17:09:53 UTC (rev 102)
@@ -4,6 +4,8 @@
   * Building the manpages offline to save buildd time, therefore not
     depending anymore on the XML toolchain.
   * Gave their own packages to the AJAX and NUCL libraries.
+    - Header files are in /usr/include/ajax and /usr/include/nucleus.
+    - The private pcre files are kept under /usr/include/ajax. (Closes: #433316)
   * Removed the extra Tag field in debian/control.
   * Using a emboss/psiphi.c file fixed by upstream
     ftp://emboss.open-bio.org/pub/EMBOSS/fixes/psiphi.c
@@ -11,11 +13,14 @@
   * Tightened the Depends: relationship between emboss and
     emboss-lib (Closes: #435232).
   * Removed inactive developer from the uploaders list.
+  * Added libgdchart-gd2-noxpm-dev as an alternative to libgdchart-gd2-xpm-dev
+    in the build dependancies.
+  * Suggests: embassy.
 
   [ Nelson A. de Oliveira ]
   * Checked and fixed clean target. (Closes: #442554).
 
- -- Charles Plessy <charles-debian-nospam at plessy.org>  Mon, 17 Sep 2007 13:07:07 +0900
+ -- Charles Plessy <charles-debian-nospam at plessy.org>  Tue, 25 Sep 2007 13:44:53 +0900
 
 emboss (5.0.0-1) unstable; urgency=low
 

Modified: emboss/trunk/debian/control
===================================================================
--- emboss/trunk/debian/control	2007-09-21 14:37:18 UTC (rev 101)
+++ emboss/trunk/debian/control	2007-09-25 17:09:53 UTC (rev 102)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian EMBOSS Packaging Team <pkg-emboss-devel at lists.alioth.debian.org>
 Uploaders: Charles Plessy <charles-debian-nospam at plessy.org>, Nelson A. de Oliveira <naoliv at debian.org>
-Build-Depends: debhelper (>= 5), quilt, libx11-dev, x-dev, libgdchart-gd2-xpm-dev, zlib1g-dev, libpng12-dev, libpcre3-dev
+Build-Depends: debhelper (>= 5), quilt, libx11-dev, x-dev, libgdchart-gd2-xpm-dev | libgdchart-gd2-noxpm-dev, zlib1g-dev, libpng12-dev, libpcre3-dev
 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
@@ -13,7 +13,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, emboss-data (= ${source:Version}), csh | c-shell
 Recommends: primer3
-Suggests: emboss-doc (= ${source:Version}), clustalw
+Suggests: emboss-doc (= ${source:Version}), embassy, clustalw
 Description: The European Molecular Biology Open Software Suite
  EMBOSS is a free Open Source software analysis package specially developed for
  the needs of the molecular biology (e.g. EMBnet) user community. The software

Modified: emboss/trunk/debian/rules
===================================================================
--- emboss/trunk/debian/rules	2007-09-21 14:37:18 UTC (rev 101)
+++ emboss/trunk/debian/rules	2007-09-25 17:09:53 UTC (rev 102)
@@ -85,7 +85,7 @@
 
 	### 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
+#	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)/usr/lib/*so 	$(AJAX)-dev/usr/lib