[med-svn] r11267 - trunk/packages/beast-mcmc/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-06-07 19:03:39 +0000 (Thu, 07 Jun 2012)
New Revision: 11267

Modified:
   trunk/packages/beast-mcmc/trunk/debian/changelog
   trunk/packages/beast-mcmc/trunk/debian/control
   trunk/packages/beast-mcmc/trunk/debian/rules
Log:
Revert changes for version 1.7.2; additional build-depends needed


Modified: trunk/packages/beast-mcmc/trunk/debian/changelog
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/changelog	2012-06-07 19:02:33 UTC (rev 11266)
+++ trunk/packages/beast-mcmc/trunk/debian/changelog	2012-06-07 19:03:39 UTC (rev 11267)
@@ -1,4 +1,4 @@
-beast-mcmc (1.7.2-1) UNRELEASED; urgency=low
+beast-mcmc (1.6.2-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #552101)
 

Modified: trunk/packages/beast-mcmc/trunk/debian/control
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/control	2012-06-07 19:02:33 UTC (rev 11266)
+++ trunk/packages/beast-mcmc/trunk/debian/control	2012-06-07 19:03:39 UTC (rev 11267)
@@ -8,7 +8,8 @@
  ant, ant-optional, openjdk-6-jdk, default-jdk,
  libjebl2-java, libjam-java, figtree, liboptions-java, libhmsbeagle-java,
  libcolt-java, libmpj-java, r-cran-rjava, libcommons-math-java (>= 2.2),
- libjdom1-java, junit4, libmtj-java, libitext1-java, texlive-latex-base
+ libjdom1-java, junit4, libmtj-java, libitext1-java, texlive-latex-base,
+ texlive-latex-extra
 Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/beast-mcmc/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/beast-mcmc/trunk/

Modified: trunk/packages/beast-mcmc/trunk/debian/rules
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/rules	2012-06-07 19:02:33 UTC (rev 11266)
+++ trunk/packages/beast-mcmc/trunk/debian/rules	2012-06-07 19:03:39 UTC (rev 11267)
@@ -42,11 +42,11 @@
 	ant build
 	ant -buildfile build_tracer.xml all
 	# native/compileNativeLinux.sh does not create dynamic libraries
-	cd native ; $(MAKE) -f Makefile.Linux
-#		gcc $(CFLAGS) $(LDFLAGS) -Wall -funroll-loops -ffast-math -fstrict-aliasing -c -I/usr/lib/jvm/default-java/include/ NucleotideLikelihoodCore.c -o libNucleotideLikelihoodCore.o ; \
-#		gcc -shared -Wl,-soname,libNucleotideLikelihoodCore.so.0 -o libNucleotideLikelihoodCore.so.0 libNucleotideLikelihoodCore.o -lc ; \
-#		gcc $(CFLAGS) $(LDFLAGS) -Wall -funroll-loops -ffast-math -fstrict-aliasing -c -I/usr/lib/jvm/default-java/include/ AminoAcidLikelihoodCore.c -o libAminoAcidLikelihoodCore.o ; \
-#		gcc -shared -Wl,-soname,libAminoAcidLikelihoodCore.so.0 -o libAminoAcidLikelihoodCore.so libAminoAcidLikelihoodCore.o -lc
+	cd native ; \
+		gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -funroll-loops -ffast-math -fstrict-aliasing -c -I/usr/lib/jvm/default-java/include/ NucleotideLikelihoodCore.c -o libNucleotideLikelihoodCore.o ; \
+		gcc -shared -Wl,-soname,libNucleotideLikelihoodCore.so.0 -o libNucleotideLikelihoodCore.so.0 libNucleotideLikelihoodCore.o -lc ; \
+		gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -funroll-loops -ffast-math -fstrict-aliasing -c -I/usr/lib/jvm/default-java/include/ AminoAcidLikelihoodCore.c -o libAminoAcidLikelihoodCore.o ; \
+		gcc -shared -Wl,-soname,libAminoAcidLikelihoodCore.so.0 -o libAminoAcidLikelihoodCore.so libAminoAcidLikelihoodCore.o -lc
 	#
 	# Build extra LaTeX documentation
 	#