[Forensics-changes] [SCM] debian-forensics/reglookup branch, debian, updated. upstream/0.4.0-10-g9b61490

Daniel Baumann daniel at debian.org
Sat Feb 23 21:30:50 UTC 2008


The following commit has been merged in the debian branch:
commit 9b61490cc6c1e7030ea86aea8c17b62d563d5e65
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Feb 23 22:27:53 2008 +0100

    Overwriting variables in make call of rules rather than patching upstream makefile.

diff --git a/debian/control b/debian/control
index 7d853cc..bb22fa0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: David Paleino <d.paleino at gmail.com>
-Build-Depends: debhelper (>= 6), quilt
+Build-Depends: debhelper (>= 6)
 Standards-Version: 3.7.3
 Homepage: http://projects.sentinelchicken.org/reglookup/
 Vcs-Git: git://git.debian.org/git/forensics/reglookup.git
diff --git a/debian/patches/01-fix_Makefile.patch b/debian/patches/01-fix_Makefile.patch
deleted file mode 100644
index 490d6ab..0000000
--- a/debian/patches/01-fix_Makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- reglookup.orig/Makefile
-+++ reglookup/Makefile
-@@ -2,17 +2,17 @@
- 
- # Installation prefixes.  Change to install elsewhere.
- 
--PREFIX=/usr/local
-+PREFIX=$(DESTDIR)/usr
- BIN_PREFIX=$(PREFIX)/bin
- DOC_PREFIX=$(PREFIX)/share/doc/reglookup
--MAN_PREFIX=$(PREFIX)/man
-+MAN_PREFIX=$(PREFIX)/share/man
- 
- ################################################################################
- 
- CC=gcc
--OPTS=-std=gnu89 -pedantic -Wall
--INC=-I/usr/local/include
--LIB=-L/usr/local/lib
-+OPTS=-std=gnu89 -pedantic -Wall $(CFLAGS)
-+INC=-I/usr/include
-+LIB=-L/usr/lib
- 
- UNAME := $(shell uname)
- ifneq ($(UNAME),Linux) 	
---- reglookup.orig/doc/Makefile
-+++ reglookup/doc/Makefile
-@@ -14,7 +14,8 @@
- 
- install:
- 	cp -r $(BUILD_DOC)/* $(DOC_PREFIX)
--	ln -sf $(DOC_PREFIX)/man/man1/*  $(MAN_PREFIX)/man1
-+	mv $(DOC_PREFIX)/man/man1 $(MAN_PREFIX)/
-+	rm -rf $(DOC_PREFIX)/man
- 
- 
- #XXX: Used during release only
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9d93064..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-fix_Makefile.patch
diff --git a/debian/rules b/debian/rules
index b453f43..706934d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
 CFLAGS = -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -15,12 +13,12 @@ else
 endif
 
 build: build-stamp
-build-stamp: patch
+build-stamp:
 	dh_testdir
-	$(MAKE) CFLAGS="$(CFLAGS)"
+	$(MAKE) OPTS="-std=gnu89 -pedantic -Wall $(CFLAGS)" INC="-I/usr/include" LIB="-L/usr/lib"
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -35,7 +33,8 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/reglookup install
+	$(MAKE) PREFIX=$(CURDIR)/debian/reglookup/usr MAN_PREFIX=\$${PREFIX}/share/man install
+	mv debian/reglookup/usr/share/doc/reglookup/man debian/reglookup/usr/share/man
 
 binary-indep: build install
 binary-arch: build install

-- 
debian-forensics/reglookup



More information about the forensics-changes mailing list