~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian/etc.disorder.config: Remove bogus `trust root' line.
[disorder]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index
c2c2df6
..
def2d53
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-1,6
+1,6
@@
#! /usr/bin/make -f
#
#! /usr/bin/make -f
#
-# Copyright (C) 2004-2008 Richard Kettlewell
+# Copyright (C) 2004-2008
, 2015
Richard Kettlewell
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-20,17
+20,15
@@
cgiexecdir=/usr/lib/cgi-bin
httpdir=/var/www
browser=x-www-browser
httpdir=/var/www
browser=x-www-browser
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+
# Options to configure. This can be overridden by the caller if necessary.
CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=${browser} cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
# Options to configure. This can be overridden by the caller if necessary.
CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=${browser} cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
-# Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS=-O0 -g
-else
-CFLAGS=-O2 -g
-endif
-export CFLAGS
-
# Install commands. You wouldn't normally override these.
INSTALL=install
INSTALL_DATA=$(INSTALL) -p -o root -g root -m 644
# Install commands. You wouldn't normally override these.
INSTALL=install
INSTALL_DATA=$(INSTALL) -p -o root -g root -m 644
@@
-69,13
+67,7
@@
build:
echo ./autogen.sh;\
./autogen.sh;\
fi
echo ./autogen.sh;\
./autogen.sh;\
fi
- @set -e;if test ! -f config.status; then \
- echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
- ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
- else\
- echo ./config.status;\
- ./config.status;\
- fi
+ ./configure ${CONFIGURE} ${CONFIGURE_EXTRA}
$(MAKE) SENDMAIL=${SENDMAIL} ${PARALLEL}
pkg-disorder: build
$(MAKE) SENDMAIL=${SENDMAIL} ${PARALLEL}
pkg-disorder: build
@@
-83,12
+75,13
@@
pkg-disorder: build
$(MKDIR) debian/disorder
$(MKDIR) debian/disorder/DEBIAN
$(MKDIR) debian/disorder/usr/share/doc/disorder
$(MKDIR) debian/disorder
$(MKDIR) debian/disorder/DEBIAN
$(MKDIR) debian/disorder/usr/share/doc/disorder
+ $(MKDIR) debian/disorder/usr/share/lintian/overrides
$(MKDIR) debian/disorder/etc/bash_completion.d
$(INSTALL_DATA) debian/copyright \
debian/disorder/usr/share/doc/disorder/copyright
$(INSTALL_DATA) debian/changelog \
debian/disorder/usr/share/doc/disorder/changelog
$(MKDIR) debian/disorder/etc/bash_completion.d
$(INSTALL_DATA) debian/copyright \
debian/disorder/usr/share/doc/disorder/copyright
$(INSTALL_DATA) debian/changelog \
debian/disorder/usr/share/doc/disorder/changelog
- gzip -9 debian/disorder/usr/share/doc/disorder/changelog*
+ gzip -9
n
debian/disorder/usr/share/doc/disorder/changelog*
@for f in conffiles templates; do\
if test -e debian/$$f.disorder; then\
echo $(INSTALL_DATA) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
@for f in conffiles templates; do\
if test -e debian/$$f.disorder; then\
echo $(INSTALL_DATA) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
@@
-101,6
+94,8
@@
pkg-disorder: build
$(INSTALL_SCRIPT) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
fi;\
done
$(INSTALL_SCRIPT) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
fi;\
done
+ $(INSTALL_DATA) debian/overrides.disorder \
+ debian/disorder/usr/share/lintian/overrides/disorder
$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C doc
$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C clients
strip --remove-section=.comment debian/disorder/usr/bin/disorder
$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C doc
$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C clients
strip --remove-section=.comment debian/disorder/usr/bin/disorder
@@
-125,7
+120,7
@@
pkg-disorder: build
$(INSTALL_DATA) CHANGES.html README debian/README.Debian \
BUGS README.* docs.css \
debian/disorder/usr/share/doc/disorder/.
$(INSTALL_DATA) CHANGES.html README debian/README.Debian \
BUGS README.* docs.css \
debian/disorder/usr/share/doc/disorder/.
- gzip -9f debian/disorder/usr/share/doc/disorder/README \
+ gzip -9
n
f debian/disorder/usr/share/doc/disorder/README \
debian/disorder/usr/share/doc/disorder/README.* \
debian/disorder/usr/share/doc/disorder/BUGS \
debian/disorder/usr/share/man/man*/*
debian/disorder/usr/share/doc/disorder/README.* \
debian/disorder/usr/share/doc/disorder/BUGS \
debian/disorder/usr/share/man/man*/*
@@
-150,7
+145,7
@@
pkg-disorder-server: build
debian/disorder-server/usr/share/doc/disorder-server/copyright
$(INSTALL_DATA) debian/changelog \
debian/disorder-server/usr/share/doc/disorder-server/changelog
debian/disorder-server/usr/share/doc/disorder-server/copyright
$(INSTALL_DATA) debian/changelog \
debian/disorder-server/usr/share/doc/disorder-server/changelog
- gzip -9 debian/disorder-server/usr/share/doc/disorder-server/changelog*
+ gzip -9
n
debian/disorder-server/usr/share/doc/disorder-server/changelog*
@for f in preinst postinst prerm postrm config; do\
if test -e debian/$$f.disorder-server; then\
echo $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
@for f in preinst postinst prerm postrm config; do\
if test -e debian/$$f.disorder-server; then\
echo $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
@@
-199,7
+194,7
@@
pkg-disorder-server: build
$(INSTALL_SCRIPT) debian/disorder.daily debian/disorder-server/etc/cron.daily/disorder
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
$(shell pwd)/debian/disorder-server${cgiexecdir}/disorder
$(INSTALL_SCRIPT) debian/disorder.daily debian/disorder-server/etc/cron.daily/disorder
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
$(shell pwd)/debian/disorder-server${cgiexecdir}/disorder
- gzip -9f debian/disorder-server/usr/share/man/man*/*
+ gzip -9
n
f debian/disorder-server/usr/share/man/man*/*
dpkg-shlibdeps -Tdebian/substvars.disorder-server \
debian/disorder-server${cgiexecdir}/disorder \
debian/disorder-server/usr/sbin/* \
dpkg-shlibdeps -Tdebian/substvars.disorder-server \
debian/disorder-server${cgiexecdir}/disorder \
debian/disorder-server/usr/sbin/* \
@@
-224,17
+219,20
@@
pkg-disorder-playrtp: build
$(MKDIR) debian/disorder-playrtp
$(MKDIR) debian/disorder-playrtp/DEBIAN
$(MKDIR) debian/disorder-playrtp/usr/share/doc/disorder-playrtp
$(MKDIR) debian/disorder-playrtp
$(MKDIR) debian/disorder-playrtp/DEBIAN
$(MKDIR) debian/disorder-playrtp/usr/share/doc/disorder-playrtp
+ $(MKDIR) debian/disorder-playrtp/usr/share/lintian/overrides
$(INSTALL_DATA) debian/copyright \
debian/disorder-playrtp/usr/share/doc/disorder-playrtp/copyright
$(INSTALL_DATA) debian/changelog \
debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog
$(INSTALL_DATA) debian/copyright \
debian/disorder-playrtp/usr/share/doc/disorder-playrtp/copyright
$(INSTALL_DATA) debian/changelog \
debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog
- gzip -9 debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog*
+ gzip -9
n
debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog*
@for f in preinst postinst prerm postrm conffiles templates config; do\
if test -e debian/$$f.disorder-playrtp; then\
echo $(INSTALL_SCRIPT) debian/$$f.disorder-playrtp debian/disorder-playrtp/DEBIAN/$$f; \
$(INSTALL_SCRIPT) debian/$$f.disorder-playrtp debian/disorder-playrtp/DEBIAN/$$f; \
fi;\
done
@for f in preinst postinst prerm postrm conffiles templates config; do\
if test -e debian/$$f.disorder-playrtp; then\
echo $(INSTALL_SCRIPT) debian/$$f.disorder-playrtp debian/disorder-playrtp/DEBIAN/$$f; \
$(INSTALL_SCRIPT) debian/$$f.disorder-playrtp debian/disorder-playrtp/DEBIAN/$$f; \
fi;\
done
+ $(INSTALL_DATA) debian/overrides.disorder-playrtp \
+ debian/disorder-playrtp/usr/share/lintian/overrides/disorder-playrtp
$(MKDIR) debian/disorder-playrtp/usr/bin
$(MKDIR) debian/disorder-playrtp/usr/share/man/man1
$(INSTALL_PROGRAM) clients/disorder-playrtp \
$(MKDIR) debian/disorder-playrtp/usr/bin
$(MKDIR) debian/disorder-playrtp/usr/share/man/man1
$(INSTALL_PROGRAM) clients/disorder-playrtp \
@@
-247,7
+245,7
@@
pkg-disorder-playrtp: build
$(INSTALL_DATA) debian/README.RTP \
debian/disorder-playrtp/usr/share/doc/disorder-playrtp/README
$(INSTALL_DATA) CHANGES.html debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES.html
$(INSTALL_DATA) debian/README.RTP \
debian/disorder-playrtp/usr/share/doc/disorder-playrtp/README
$(INSTALL_DATA) CHANGES.html debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES.html
- gzip -9f debian/disorder-playrtp/usr/share/man/man*/*
+ gzip -9
n
f debian/disorder-playrtp/usr/share/man/man*/*
cd debian/disorder-playrtp && \
find -name DEBIAN -prune -o -type f -print \
| sed 's/^\.\///' \
cd debian/disorder-playrtp && \
find -name DEBIAN -prune -o -type f -print \
| sed 's/^\.\///' \
@@
-274,14
+272,16
@@
pkg-disorder-gstdecode: build
fi;\
done
$(MKDIR) debian/disorder-gstdecode/usr/sbin
fi;\
done
$(MKDIR) debian/disorder-gstdecode/usr/sbin
- : $(MKDIR) debian/disorder-gstdecode/usr/share/man/man1
+ $(MKDIR) debian/disorder-gstdecode/usr/share/man/man8
$(INSTALL_PROGRAM) server/disorder-gstdecode \
debian/disorder-gstdecode/usr/sbin/disorder-gstdecode
strip --remove-section=.comment debian/disorder-gstdecode/usr/sbin/disorder-gstdecode
$(INSTALL_PROGRAM) server/disorder-gstdecode \
debian/disorder-gstdecode/usr/sbin/disorder-gstdecode
strip --remove-section=.comment debian/disorder-gstdecode/usr/sbin/disorder-gstdecode
+ $(INSTALL_DATA) doc/disorder-gstdecode.8 \
+ debian/disorder-gstdecode/usr/share/man/man8/disorder-gstdecode.8
dpkg-shlibdeps -Tdebian/substvars.disorder-gstdecode \
debian/disorder-gstdecode/usr/sbin/*
$(INSTALL_DATA) CHANGES.html debian/disorder-gstdecode/usr/share/doc/disorder-gstdecode/CHANGES.html
dpkg-shlibdeps -Tdebian/substvars.disorder-gstdecode \
debian/disorder-gstdecode/usr/sbin/*
$(INSTALL_DATA) CHANGES.html debian/disorder-gstdecode/usr/share/doc/disorder-gstdecode/CHANGES.html
-
:
gzip -9f debian/disorder-gstdecode/usr/share/man/man*/*
+ gzip -9f debian/disorder-gstdecode/usr/share/man/man*/*
cd debian/disorder-gstdecode && \
find -name DEBIAN -prune -o -type f -print \
| sed 's/^\.\///' \
cd debian/disorder-gstdecode && \
find -name DEBIAN -prune -o -type f -print \
| sed 's/^\.\///' \
@@
-300,7
+300,7
@@
pkg-disobedience: build
debian/disobedience/usr/share/doc/disobedience/copyright
$(INSTALL_DATA) debian/changelog \
debian/disobedience/usr/share/doc/disobedience/changelog
debian/disobedience/usr/share/doc/disobedience/copyright
$(INSTALL_DATA) debian/changelog \
debian/disobedience/usr/share/doc/disobedience/changelog
- gzip -9 debian/disobedience/usr/share/doc/disobedience/changelog*
+ gzip -9
n
debian/disobedience/usr/share/doc/disobedience/changelog*
@for f in preinst postinst prerm postrm conffiles templates config; do\
if test -e debian/$$f.disobedience; then\
echo $(INSTALL_SCRIPT) debian/$$f.disobedience debian/disobedience/DEBIAN/$$f; \
@for f in preinst postinst prerm postrm conffiles templates config; do\
if test -e debian/$$f.disobedience; then\
echo $(INSTALL_SCRIPT) debian/$$f.disobedience debian/disobedience/DEBIAN/$$f; \
@@
-323,7
+323,7
@@
pkg-disobedience: build
debian/disobedience/usr/share/menu/disobedience
$(INSTALL_DATA) debian/disobedience-manual \
debian/disobedience/usr/share/doc-base/disobedience-manual
debian/disobedience/usr/share/menu/disobedience
$(INSTALL_DATA) debian/disobedience-manual \
debian/disobedience/usr/share/doc-base/disobedience-manual
- gzip -9f debian/disobedience/usr/share/man/man*/*
+ gzip -9
n
f debian/disobedience/usr/share/man/man*/*
dpkg-shlibdeps -Tdebian/substvars.disobedience \
debian/disobedience/usr/bin/*
rm -rf debian/disobedience/usr/share/doc/disobedience
dpkg-shlibdeps -Tdebian/substvars.disobedience \
debian/disobedience/usr/bin/*
rm -rf debian/disobedience/usr/share/doc/disobedience