Source: apt-watch
Severity: wishlist
Tags: patch
User: debian...@lists.debian.org
Usertags: build-arch-target

Hi,

Please see attached patch as an example of how to do this.

Please note that the buildds are still using "build" followed by
"binary-arch".

For more information, please see [1].

~Niels

[1] https://wiki.debian.org/ReleaseGoals/BuildArchTarget
diff -Nru apt-watch-0.4.0/debian/changelog apt-watch-0.4.0/debian/changelog
--- apt-watch-0.4.0/debian/changelog	2011-10-18 04:40:59.000000000 +0200
+++ apt-watch-0.4.0/debian/changelog	2011-11-12 09:57:38.000000000 +0100
@@ -1,3 +1,13 @@
+apt-watch (0.4.0-2.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Added build-arch and build-indep targets to debian/rules.
+  * Use buildflags.mk from dpkg-dev to set default buildflags.
+    - Enables hardening flags.
+  * Removed unused INSTALL_PROGRAM variable from debian/rules.
+
+ -- Niels Thykier <ni...@thykier.net>  Sat, 12 Nov 2011 09:54:01 +0100
+
 apt-watch (0.4.0-2) unstable; urgency=low
 
   * Bump debian release for unstable
diff -Nru apt-watch-0.4.0/debian/control apt-watch-0.4.0/debian/control
--- apt-watch-0.4.0/debian/control	2011-10-18 04:40:59.000000000 +0200
+++ apt-watch-0.4.0/debian/control	2011-11-12 09:55:45.000000000 +0100
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: John Lightsey <light...@debian.org>
-Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7~), libpam0g-dev | libpam-dev, libfam-dev, libpanel-applet-4-dev, libapt-pkg-dev
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7~), libpam0g-dev | libpam-dev, libfam-dev, libpanel-applet-4-dev, libapt-pkg-dev, dpkg-dev (>= 1.16.1~)
 Standards-Version: 3.9.2.0
 Vcs-Git: http://nixnuts.net/git/apt-watch.git
 Homepage: http://nixnuts.net/apt-watch/
diff -Nru apt-watch-0.4.0/debian/rules apt-watch-0.4.0/debian/rules
--- apt-watch-0.4.0/debian/rules	2011-10-18 04:40:59.000000000 +0200
+++ apt-watch-0.4.0/debian/rules	2011-11-12 09:57:14.000000000 +0100
@@ -13,25 +13,19 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+DEB_CFLAGS_MAINT_APPEND = -Wall
+DPKG_EXPORT_BUILDFLAGS=1
+include /usr/share/dpkg/buildflags.mk
 
 config.status: configure
 	dh_quilt_patch
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --libexecdir=\$${prefix}/lib/apt-watch --datadir=\$${prefix}/share
-
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --libexecdir=\$${prefix}/lib/apt-watch --datadir=\$${prefix}/share
 
-build: build-stamp
 
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:  config.status
 	dh_testdir
 
@@ -102,4 +96,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install 

Reply via email to