Commit 20c32183 authored by Axel Beckert's avatar Axel Beckert Committed by Axel Beckert

Imported Debian patch 1.1-3

parent d8e48888
since (1.1-3) unstable; urgency=low
* Bump debhelper compatibility to 9
- Update versioned debhelper build-dependency
* Patch upstream Makefile to
- don't overwrite already set variables
- pass additional variables (CPPFLAGS, LDFLAGS)
* Streamline debian/rules
- use dh_auto_{build,clean}
- use debian/since.manpages instead of dh_installman parameter
- switch to minimal dh7 style debian/rules, but don't run dh_auto_install
* Fixes the following lintian warnings:
- hardening-no-relro
- hardening-no-fortify-functions
- vcs-field-not-canonical
- debian-rules-missing-recommended-target
* Rename debian/since.* to debian/*
* Bump Standards-Version to 3.9.4 (no further changes)
-- Axel Beckert <abe@debian.org> Fri, 17 May 2013 01:27:31 +0200
since (1.1-2) unstable; urgency=low
* Fix FTBFS on GNU/Hurd
......
......@@ -2,10 +2,10 @@ Source: since
Section: text
Priority: optional
Maintainer: Axel Beckert <abe@debian.org>
Build-Depends: debhelper (>= 7)
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/collab-maint/since.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/since.git
Build-Depends: debhelper (>= 9~)
Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/collab-maint/since.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/since.git
Homepage: http://welz.org.za/projects/since
Package: since
......
Description: Properly pass dpkg-buildflags variables
* Don't overwrite already set variables
* Pass additional variables (CPPFLAGS, LDFLAGS)
Fixes lintian warnings hardening-no-{relro,fortify-functions}
Author: Axel Beckert <abe@debian.org>
Index: since/Makefile
===================================================================
--- since.orig/Makefile 2013-05-17 00:44:51.922569312 +0200
+++ since/Makefile 2013-05-17 00:59:42.954851043 +0200
@@ -4,18 +4,18 @@
NAME = since
VERSION = 1.1
-CFLAGS = -Wall -O2 -DVERSION=\"$(VERSION)\"
+CFLAGS += -DVERSION=\"$(VERSION)\"
# disable/enable as desired
CFLAGS += $(shell test -f /usr/include/sys/inotify.h && echo -DUSE_INOTIFY)
CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
#CFLAGS += -DDEBUG
-CC = gcc
+CC ?= gcc
RM = rm -f
INSTALL = install -D
$(NAME): $(NAME).c
- $(CC) $(CFLAGS) -o $@ $^
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^
install: $(NAME)
$(INSTALL) $(NAME) $(prefix)/bin/$(NAME)
hurd-path-max.patch
optimize-makefile.patch
#!/usr/bin/make -f
# Made with the aid of dh_make, by Craig Small
# GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Cristoph Lameter.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
DESTDIR=$(CURDIR)/debian/since
%:
dh $@
build: build-stamp
build-stamp:
dh_testdir
$(MAKE)
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp since
# Clean up after the build process
[ ! -f Makefile ] || $(MAKE) clean
dh_clean
install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
dh_prep
dh_installdirs
dh_install
touch install-stamp
binary-indep: build install
# We have nothing to do by default.
binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs
dh_installman since.1
dh_installchangelogs
dh_strip
dh_compress
dh_fixperms
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
# Deliberately empty targets
override_dh_auto_install:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment