[med-svn] r10515 - trunk/packages/plink/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-04-22 18:57:48 +0000 (Sun, 22 Apr 2012)
New Revision: 10515

Modified:
   trunk/packages/plink/trunk/debian/changelog
   trunk/packages/plink/trunk/debian/control
   trunk/packages/plink/trunk/debian/rules
Log:
Rewritten debian/rules to short dh


Modified: trunk/packages/plink/trunk/debian/changelog
===================================================================
--- trunk/packages/plink/trunk/debian/changelog	2012-04-22 17:24:40 UTC (rev 10514)
+++ trunk/packages/plink/trunk/debian/changelog	2012-04-22 18:57:48 UTC (rev 10515)
@@ -3,12 +3,14 @@
   * debian/control:
      - Standards-Version: 3.9.3 (no changes needed)
      - Fixed Vcs fields
+     - Removed quilt from Build-Depends
   * debian/upstream: Added citation information
   * debian/source/format: 3.0 (quilt)
   * debian/get-orig-source: Better chances to get a unique upstream
     tarball after repackaging
   * debian/copyright: Rewritten to match DEP5 and verified using
      cme fix dpkg-copyright
+  * debian/rules: Rewritten to use short dh
 
  -- Andreas Tille <tille at debian.org>  Sun, 22 Apr 2012 18:55:34 +0200
 

Modified: trunk/packages/plink/trunk/debian/control
===================================================================
--- trunk/packages/plink/trunk/debian/control	2012-04-22 17:24:40 UTC (rev 10514)
+++ trunk/packages/plink/trunk/debian/control	2012-04-22 18:57:48 UTC (rev 10515)
@@ -5,7 +5,7 @@
 Uploaders: Steffen Moeller <moeller at debian.org>,
  Andreas Tille <tille at debian.org>,
  Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 7), quilt, zlib1g-dev
+Build-Depends: debhelper (>= 7), zlib1g-dev
 Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/plink/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/plink/trunk/

Modified: trunk/packages/plink/trunk/debian/rules
===================================================================
--- trunk/packages/plink/trunk/debian/rules	2012-04-22 17:24:40 UTC (rev 10514)
+++ trunk/packages/plink/trunk/debian/rules	2012-04-22 18:57:48 UTC (rev 10515)
@@ -1,75 +1,26 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/quilt/quilt.make
+pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 
-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 := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
 CXXFLAGS += -DWITH_R_PLUGINS
 # This would be added by Upstream makefile, but we override CXXFLAGS…
 CXXFLAGS += -DUNIX
 
-build: patch build-stamp
-build-stamp:
-	$(MAKE) CXXFLAGS='$(CXXFLAGS)' FORCE_DYNAMIC=1
-	touch $@
+%:
+	dh $@
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	$(MAKE) clean
-	dh_clean build-stamp install-stamp plink
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f plink
 
-install: install-stamp
-install-stamp:
-	# nothing to do, the single binary is taken directly
-	touch $@
+override_dh_auto_build:
+	$(MAKE) CXXFLAGS='$(CXXFLAGS)' FORCE_DYNAMIC=1
 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
+override_dh_installexamples:
 	dh_installexamples
 	chmod 644 debian/$(pkg)/usr/share/doc/$(pkg)/examples/*
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary-indep:
-
-binary: binary-indep binary-arch
-
 get-orig-source:
 	. debian/get-orig-source
-
-.PHONY: build clean binary-indep binary-arch binary