[med-svn] r7431 - in trunk/packages/velvet/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-08-12 14:08:19 +0000 (Fri, 12 Aug 2011)
New Revision: 7431

Removed:
   trunk/packages/velvet/trunk/debian/patches/ld-as-needed.patch
Modified:
   trunk/packages/velvet/trunk/debian/changelog
   trunk/packages/velvet/trunk/debian/control
   trunk/packages/velvet/trunk/debian/rules
Log:
Build-Depends: texlive-latex-base


Modified: trunk/packages/velvet/trunk/debian/changelog
===================================================================
--- trunk/packages/velvet/trunk/debian/changelog	2011-08-12 13:36:05 UTC (rev 7430)
+++ trunk/packages/velvet/trunk/debian/changelog	2011-08-12 14:08:19 UTC (rev 7431)
@@ -1,3 +1,13 @@
+velvet (1.1.05~nozlibcopy-1) UNRELEASED; urgency=low
+
+  * New upstream version
+  * debian/copyright: Revised
+  * debian/get-orig-source: Do not remove MetaVelvet
+  * debian/control:
+     Build-Depends: texlive-latex-base
+
+ -- Andreas Tille <tille at debian.org>  Fri, 12 Aug 2011 15:36:22 +0200
+
 velvet (1.1.05-1ubuntu4) lucid; urgency=low
 
   * Moved from CDBS to DH 

Modified: trunk/packages/velvet/trunk/debian/control
===================================================================
--- trunk/packages/velvet/trunk/debian/control	2011-08-12 13:36:05 UTC (rev 7430)
+++ trunk/packages/velvet/trunk/debian/control	2011-08-12 14:08:19 UTC (rev 7431)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: cdbs, debhelper (>= 8), zlib1g-dev, help2man, quilt
+Build-Depends: debhelper (>= 8), zlib1g-dev, help2man, quilt, texlive-latex-base
 Standards-Version: 3.9.2
 Homepage: http://www.ebi.ac.uk/~zerbino/velvet/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/velvet/trunk/?rev=0&sc=0

Deleted: trunk/packages/velvet/trunk/debian/patches/ld-as-needed.patch
===================================================================
--- trunk/packages/velvet/trunk/debian/patches/ld-as-needed.patch	2011-08-12 13:36:05 UTC (rev 7430)
+++ trunk/packages/velvet/trunk/debian/patches/ld-as-needed.patch	2011-08-12 14:08:19 UTC (rev 7431)
@@ -1,25 +0,0 @@
-Author: Matthias Klose <doko at ubuntu.com>
-Description: Enable ld --as-needed (basically by using LIBS instead of LDFLAGS.
- Adding libraries in LDFLAGS is almost always a bad idea.
-Closes: #607582
-
---- velvet_1.1.02~nozlibcopy.orig/Makefile
-+++ velvet_1.1.02~nozlibcopy/Makefile
-@@ -1,14 +1,15 @@
- CC = gcc
- CFLAGS = -Wall
- DEBUG = -g
--LDFLAGS = -lm
-+LIBS = -lm
- OPT = -O3
- MAXKMERLENGTH=31
- CATEGORIES=2
- DEF = -D MAXKMERLENGTH=$(MAXKMERLENGTH) -D CATEGORIES=$(CATEGORIES)
- 
- Z_LIB_DIR=third-party/zlib-1.2.3
--Z_LIB_FILES=$(Z_LIB_DIR)/*.o
-+# In Debian we do not use local zlib copy, however, we need to add $(LIBS) to compile options and thus we tweak this in here:
-+Z_LIB_FILES=$(LIBS)
- 
- # Mac OS users: uncomment the following lines
- # Z_LIB_FILES=

Modified: trunk/packages/velvet/trunk/debian/rules
===================================================================
--- trunk/packages/velvet/trunk/debian/rules	2011-08-12 13:36:05 UTC (rev 7430)
+++ trunk/packages/velvet/trunk/debian/rules	2011-08-12 14:08:19 UTC (rev 7431)
@@ -31,8 +31,8 @@
 	         $(CURDIR)/velvetg_de > $(CURDIR)/debian/$(pkg)/usr/share/man/man1/velvetg_de.1
 	dh_install
 	#If the tarball is not being scrubbed we need this.
-	find $(CURDIR)/debian/$(pkg) -name '.DS_Store' -exec rm {} \;
-	rm -rf $(CURDIR)/debian/$(pkg)/usr/share/velvet/contrib/MetaVelvet*
+	# find $(CURDIR)/debian/$(pkg) -name '.DS_Store' -exec rm {} \;
+	# rm -rf $(CURDIR)/debian/$(pkg)/usr/share/velvet/contrib/MetaVelvet*
 
 #Prevent compression of user manual
 override_dh_compress :