Author: plessy Date: 2009-08-04 12:58:35 +0000 (Tue, 04 Aug 2009) New Revision: 3731
Added: trunk/packages/emboss/trunk/debian/patch/ Removed: trunk/packages/emboss/trunk/debian/patches/ Modified: trunk/packages/emboss/trunk/debian/changelog trunk/packages/emboss/trunk/debian/rules Log: Deleted a conflicting file and moved the patches. Modified: trunk/packages/emboss/trunk/debian/changelog =================================================================== --- trunk/packages/emboss/trunk/debian/changelog 2009-08-04 12:34:11 UTC (rev 3730) +++ trunk/packages/emboss/trunk/debian/changelog 2009-08-04 12:58:35 UTC (rev 3731) @@ -1,3 +1,11 @@ +emboss (6.1.0-3) UNRELEASED; urgency=low + + * Moved patches to debian/patch (Closes: #485330). + * Delete /usr/share/EMBOSS/doc/programs/text/frestdist.txt, that + should belong to embassy-phylip (PHYLIPNEW). (debian/rules) + + -- Charles Plessy <[email protected]> Tue, 04 Aug 2009 21:56:45 +0900 + emboss (6.1.0-2) unstable; urgency=low * New upstream patch (patch-1-1): Property changes on: trunk/packages/emboss/trunk/debian/patch ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/packages/emboss/trunk/debian/rules =================================================================== --- trunk/packages/emboss/trunk/debian/rules 2009-08-04 12:34:11 UTC (rev 3730) +++ trunk/packages/emboss/trunk/debian/rules 2009-08-04 12:58:35 UTC (rev 3731) @@ -28,6 +28,7 @@ ./configure $(CONFFLAGS) include /usr/share/quilt/quilt.make +QUILT_PATCH_DIR = debian/patch build: config.status patch debian/copyright build-stamp build-stamp: @@ -104,6 +105,9 @@ antiword $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/manuals/domainatrix.doc > $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/manuals/domainatrix.txt # Remove this file when the relicenced file becomes part of the upstream tarball. uudecode -o $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/manuals/EMBOSS_qg.pdf $(CURDIR)/debian/EMBOSS_qg_new.pdf.uu + # Remove this file, that belongs to the PHYLIPNEW EMBASSY package (embassy-phylip in Debian). + # See EMBOSS bug ‘https://sourceforge.net/support/tracker.php?aid=2831977’. + rm $(CURDIR)/debian/emboss-doc/usr/share/EMBOSS/doc/programs/text/frestdist.txt $(MAKE) -C jemboss install DESTDIR=$(CURDIR)/debian/jemboss bindir=/usr/bin # dangling LICEN[CS]E FILE _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
