[med-svn] r3627 - in trunk/packages/plink/trunk/debian: . patches

Tue Jul 14 23:57:07 UTC 2009

Author: plessy
Date: 2009-07-14 23:57:07 +0000 (Tue, 14 Jul 2009)
New Revision: 3627

Removed:
   trunk/packages/plink/trunk/debian/patches/dynamic.patch
Modified:
   trunk/packages/plink/trunk/debian/README.source
   trunk/packages/plink/trunk/debian/changelog
   trunk/packages/plink/trunk/debian/control
   trunk/packages/plink/trunk/debian/copyright
   trunk/packages/plink/trunk/debian/patches/series
   trunk/packages/plink/trunk/debian/rules
Log:
Build plink with Debian?\226?\128?\153s default -O2 to see if it avoids the GCC bug on MIPS.

 plink (1.06-4) unstable; urgency=low
 .
   * debian/rules:
     - Add support for DEB_BUILD_OPTIONS (Policy ?\194?\167 4.9.1).
     - Set FORCE_DYNAMIC=1 instead of patching the Makefile
       (deleted debian/patches/dynamic.patch).
   * debian/control:
     - Added myself to the uploaders.
     - Incremented Standards-Version to reflect conformance with
       Policy 3.8.2 (no changes needed).
   * documented in README.source how to find help with quilt.


Modified: trunk/packages/plink/trunk/debian/README.source
===================================================================

--- trunk/packages/plink/trunk/debian/README.source	2009-07-13 13:53:30 UTC (rev 3626)
+++ trunk/packages/plink/trunk/debian/README.source	2009-07-14 23:57:07 UTC (rev 3627)
@@ -1,3 +1,6 @@
+Upstream file deletion
+----------------------
+
 Mark of the ftpmasters has requested the gPLINK.jar to disappear.
 
 This removal will be automatically done if you are using the
@@ -3,2 +6,10 @@
     debian/get-orig-source
 script to obtain the upstream tarball.
+
+
+Upstream source patching
+------------------------
+
+This packages uses the program ‘quilt’ to apply patch from the ‘debian/patches’
+directory. You can find instructions on how to use quilt in the following file:
+‘/usr/share/doc/quilt/README.source’.

Modified: trunk/packages/plink/trunk/debian/changelog
===================================================================
--- trunk/packages/plink/trunk/debian/changelog	2009-07-13 13:53:30 UTC (rev 3626)
+++ trunk/packages/plink/trunk/debian/changelog	2009-07-14 23:57:07 UTC (rev 3627)
@@ -1,3 +1,17 @@
+plink (1.06-4) unstable; urgency=low
+
+  * debian/rules:
+    - Add support for DEB_BUILD_OPTIONS (Policy § 4.9.1).
+    - Set FORCE_DYNAMIC=1 instead of patching the Makefile
+      (deleted debian/patches/dynamic.patch).
+  * debian/control:
+    - Added myself to the uploaders.
+    - Incremented Standards-Version to reflect conformance with
+      Policy 3.8.2 (no changes needed).
+  * documented in README.source how to find help with quilt.
+
+ -- Charles Plessy <plessy at debian.org>  Wed, 15 Jul 2009 08:08:15 +0900
+
 plink (1.06-3) unstable; urgency=low
 
   * Now really applying the patch to fix 64bit problems

Modified: trunk/packages/plink/trunk/debian/control
===================================================================
--- trunk/packages/plink/trunk/debian/control	2009-07-13 13:53:30 UTC (rev 3626)
+++ trunk/packages/plink/trunk/debian/control	2009-07-14 23:57:07 UTC (rev 3627)
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>,
- Andreas Tille <tille at debian.org>
+ Andreas Tille <tille at debian.org>,
+ Charles Plessy <plessy at debian.org>
 Build-Depends: debhelper (>= 5), quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/plink/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/plink/trunk/
 Homepage: http://pngu.mgh.harvard.edu/~purcell/plink/

Modified: trunk/packages/plink/trunk/debian/copyright
===================================================================
--- trunk/packages/plink/trunk/debian/copyright	2009-07-13 13:53:30 UTC (rev 3626)
+++ trunk/packages/plink/trunk/debian/copyright	2009-07-14 23:57:07 UTC (rev 3627)
@@ -1,7 +1,7 @@
 This package was debianized by Steffen Moeller <moeller at debian.org> on
 Mon, 14 Jul 2008 17:30:41 +0200
 
-It was downloaded from http://pngu.mgh.harvard.edu/~purcell/plink
+It was downloaded from http://pngu.mgh.harvard.edu/~purcell/plink/dist/plink-1.06-src.zip
 
 Upstream Author: 
 

Deleted: trunk/packages/plink/trunk/debian/patches/dynamic.patch
===================================================================
--- trunk/packages/plink/trunk/debian/patches/dynamic.patch	2009-07-13 13:53:30 UTC (rev 3626)
+++ trunk/packages/plink/trunk/debian/patches/dynamic.patch	2009-07-14 23:57:07 UTC (rev 3627)
@@ -1,15 +0,0 @@
-Author: Andreas Tille
-Puropose: Make sure plink will be statically linked and use option provided by
- upstream to acomplish this
-License: same as plink itself.
---- plink-1.06-src.orig/Makefile
-+++ plink-1.06-src/Makefile
-@@ -27,7 +27,7 @@
- FORCE_32BIT = 
- WITH_ZLIB = 
- WITH_LAPACK = 
--FORCE_DYNAMIC = 
-+FORCE_DYNAMIC = 1
- 
- # Put C++ compiler here; Windows has it's own specific version
- CXX_UNIX = g++

Modified: trunk/packages/plink/trunk/debian/patches/series
===================================================================
--- trunk/packages/plink/trunk/debian/patches/series	2009-07-13 13:53:30 UTC (rev 3626)
+++ trunk/packages/plink/trunk/debian/patches/series	2009-07-14 23:57:07 UTC (rev 3627)
@@ -1,3 +1,2 @@
-dynamic.patch
 20_plink-1.06-gcc4.4.patch
 30_endiandetection.patch

Modified: trunk/packages/plink/trunk/debian/rules
===================================================================
--- trunk/packages/plink/trunk/debian/rules	2009-07-13 13:53:30 UTC (rev 3626)
+++ trunk/packages/plink/trunk/debian/rules	2009-07-14 23:57:07 UTC (rev 3627)
@@ -5,9 +5,34 @@
 
 pkg=plink
 
+# DEB_BUILD_OPTIONS from Policy § 4.9.1
+CXXFLAGS = -Wall -g
+INSTALL = install
+INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+    CXXFLAGS += -O0
+else
+    CXXFLAGS += -O2
+endif
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+    INSTALL_PROGRAM += -s
+endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+CXXFLAGS += -DWITH_R_PLUGINS
+# This would be added by Upstream makefile, but we override CXXFLAGS…
+CXXFLAGS += -DUNIX
+
 build: patch build-stamp
 build-stamp:
-	$(MAKE) CXX_UNIX=g++ WITH_R_PLUGINS=1
+	$(MAKE) CXXFLAGS='$(CXXFLAGS)' FORCE_DYNAMIC=1
 	touch $@
 
 clean: unpatch


