[med-svn] r1891 - in trunk/packages/glam2/trunk/debian: . patches

[plessy at alioth.debian.org]

Author: plessy
Date: 2008-05-19 09:51:04 +0000 (Mon, 19 May 2008)
New Revision: 1891

Removed:
   trunk/packages/glam2/trunk/debian/patches/CFLAGS-support.patch
   trunk/packages/glam2/trunk/debian/patches/series
Modified:
   trunk/packages/glam2/trunk/debian/README.Debian
   trunk/packages/glam2/trunk/debian/changelog
   trunk/packages/glam2/trunk/debian/rules
Log:
New upstream release in which CFLAGS-support.patch was merged.

Modified: trunk/packages/glam2/trunk/debian/README.Debian
===================================================================
--- trunk/packages/glam2/trunk/debian/README.Debian	2008-05-19 05:26:58 UTC (rev 1890)
+++ trunk/packages/glam2/trunk/debian/README.Debian	2008-05-19 09:51:04 UTC (rev 1891)
@@ -3,4 +3,7 @@
 
 We renamed purge glam2-purge, to avoid namespace collision.
 
+glam2 is compiled with -O2 optimisation level. Please contact us if you notice
+performance issues compared to -O3. 
+
  -- Steffen Moeller <moeller at debian.org>  Tue, 13 Nov 2007 00:35:50 +0100

Modified: trunk/packages/glam2/trunk/debian/changelog
===================================================================
--- trunk/packages/glam2/trunk/debian/changelog	2008-05-19 05:26:58 UTC (rev 1890)
+++ trunk/packages/glam2/trunk/debian/changelog	2008-05-19 09:51:04 UTC (rev 1891)
@@ -1,19 +1,18 @@
-glam2 (1062-1) UNRELEASED; urgency=low
+glam2 (1064-1) unstable; urgency=low
 
   [ Charles Plessy ]
-  * New upstream release (one paragraph added to the tutorial).
+  * New upstream release
+    - One paragraph added to the tutorial.
+    - Uses CFLAGS in makefiles (thanks Martin!)
   * Changed the doc-base section according to the new policy.
   * Updated my email address.
   * Added a get-orig-source target in debian/rules.
-  * debian/patches/Makefiles:
-    - does not rename the binaries anymore (it is done in debian/rules).
-    - does not change the default optimisation level anymore.
-    - is renamed debian/patches/CFLAGS-support.patch as it is only doing this.
+  * debian/patches/Makefiles removed because obsoleted.
 
   [ Andreas Tille ]
   * Better formatting of long description.
 
- -- Charles Plessy <plessy at debian.org>  Sun, 27 Apr 2008 16:58:37 +0900
+ -- Charles Plessy <plessy at debian.org>  Mon, 19 May 2008 18:46:20 +0900
 
 glam2 (1058-1) unstable; urgency=low
 

Deleted: trunk/packages/glam2/trunk/debian/patches/CFLAGS-support.patch
===================================================================
--- trunk/packages/glam2/trunk/debian/patches/CFLAGS-support.patch	2008-05-19 05:26:58 UTC (rev 1890)
+++ trunk/packages/glam2/trunk/debian/patches/CFLAGS-support.patch	2008-05-19 09:51:04 UTC (rev 1891)
@@ -1,53 +0,0 @@
-Description: Introduces support for the CFLAGS variables in glam2's Makefiles,
- so that the Debian building system can modify the optimisation levels.
-Author: Charles Plessy <plessy at debian.org>
-Forwared: Mon, 19 May 2008 04:01:11 +0900
---- a/purge/Makefile
-+++ b/purge/Makefile
-@@ -1,3 +1,4 @@
- # Command for compiling purge:
-+CFLAGS = -Wall -O3
- purge: *.c *.h Makefile
--	cc -Wall -O3 -o purge *.c -lm
-+	cc $(CFLAGS) -o purge *.c -lm
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -6,6 +6,7 @@
- # -Wall means turn on compiler warnings (optional)
- # -O3 means optimization level 3 (the maximum for gcc)
- # -lm means include the math library
-+CFLAGS = -Wall -O3
- 
- # Source files for glam2:
- GSRC = alphabet.c args.c column_sample.c dirichlet.c dna_prior.c	\
-@@ -28,25 +29,25 @@
- 
- # Command for compiling glam2:
- glam2: $(GSRC) *.h Makefile
--	cc -Wall -O3 -o glam2 $(GSRC) -lm
-+	cc $(CFLAGS) -o glam2 $(GSRC) -lm
- 
- # Command for compiling glam2scan:
- glam2scan: $(SSRC) *.h Makefile
--	cc -Wall -O3 -o glam2scan $(SSRC) -lm
-+	cc $(CFLAGS) -o glam2scan $(SSRC) -lm
- 
- # Command for compiling glam2format:
- glam2format: $(FSRC) *.h Makefile
--	cc -Wall -O3 -o glam2format $(FSRC) -lm
-+	cc $(CFLAGS) -o glam2format $(FSRC) -lm
- 
- # Command for compiling glam2mask:
- glam2mask: $(MSRC) *.h Makefile
--	cc -Wall -O3 -o glam2mask $(MSRC) -lm
-+	cc $(CFLAGS) -o glam2mask $(MSRC) -lm
- 
- # Here follow commands for compiling special versions of the programs
- 
- # Compile glam2 including FFT algorithm (requires FFTW to be installed):
- glam2fft: $(GSRC) convolve.c *.h Makefile
--	cc -Wall -O3 -DFFT -o glam2fft $(GSRC) convolve.c -lm -lfftw3
-+	cc $(CFLAGS) -DFFT -o glam2fft $(GSRC) convolve.c -lm -lfftw3
- 
- # Compile for debugging with gdb or valgrind, with extra compiler warnings:
- glam2_d: $(GSRC) *.h Makefile

Deleted: trunk/packages/glam2/trunk/debian/patches/series
===================================================================
--- trunk/packages/glam2/trunk/debian/patches/series	2008-05-19 05:26:58 UTC (rev 1890)
+++ trunk/packages/glam2/trunk/debian/patches/series	2008-05-19 09:51:04 UTC (rev 1891)
@@ -1 +0,0 @@
-CFLAGS-support.patch

Modified: trunk/packages/glam2/trunk/debian/rules
===================================================================
--- trunk/packages/glam2/trunk/debian/rules	2008-05-19 05:26:58 UTC (rev 1890)
+++ trunk/packages/glam2/trunk/debian/rules	2008-05-19 09:51:04 UTC (rev 1891)
@@ -22,6 +22,7 @@
 
 get-orig-source:
 	# The unzip command from the unzip package is needed for this one.
+	# Please update debian/changelog before calling this target.
 	[ -f ../glam2-$(DEB_UPSTREAM_VERSION).zip ] || uscan --force-download
 	unzip ../glam2-$(DEB_UPSTREAM_VERSION).zip -d..
 	tar --create --gzip --file ../glam2_$(DEB_UPSTREAM_VERSION).orig.tar.gz ../glam2-$(DEB_UPSTREAM_VERSION)