[Pkg-voip-commits] r3085 - in srtp/trunk/debian: . cdbs cdbs/1
cdbs/1/rules
Jonas Smedegaard
js at alioth.debian.org
Mon Jan 29 21:07:27 CET 2007
Author: js
Date: 2007-01-29 21:07:26 +0100 (Mon, 29 Jan 2007)
New Revision: 3085
Added:
srtp/trunk/debian/README.cdbs-tweaks
srtp/trunk/debian/cdbs/
srtp/trunk/debian/cdbs/1/
srtp/trunk/debian/cdbs/1/rules/
srtp/trunk/debian/cdbs/1/rules/buildcore.mk
srtp/trunk/debian/cdbs/1/rules/buildinfo.mk
srtp/trunk/debian/cdbs/1/rules/copyright-check.mk
srtp/trunk/debian/control.in
srtp/trunk/debian/copyright_hints
Modified:
srtp/trunk/debian/copyright
srtp/trunk/debian/rules
Log:
Add some nifty CDBS tweaks. Add another copyright (with similar license) to debian/copyright.
Added: srtp/trunk/debian/README.cdbs-tweaks
===================================================================
--- srtp/trunk/debian/README.cdbs-tweaks 2007-01-29 18:54:34 UTC (rev 3084)
+++ srtp/trunk/debian/README.cdbs-tweaks 2007-01-29 20:07:26 UTC (rev 3085)
@@ -0,0 +1,85 @@
+CDBS tweak
+==========
+
+CDBS is great. In some corner cases, however, some parts of CDBS
+sometimes needs a few tweaks to work optimally.
+
+This is a collection of such tweaks. The goal is for these tweaks to be
+absorbed into upstream CDBS. We just haven't found time yet to discuss
+them at the CDBS developers' mailinglist. And possible we do not all
+agree that the tweaks are so great - therefore this "staging area".
+
+If you found this file below debian/ subdir in a source package, most
+probably only a subset of the below mentioned tweaks are relevant and
+have been shipped with the package. The repository of all these tweaks
+is here: svn://svn.debian.org/build-common/people/js/overlay/
+
+Web access: http://svn.debian.org/wsvn/build-common/people/js/overlay/
+
+
+
+Improved support for cdbs-autoupdate
+------------------------------------
+
+CDBS invented a cool way to help keep build-dependencies up-to-date.
+
+It is disabled by default, as messing with debian/rules at build time
+violates Debian Policy: A build must not change conditions for building.
+
+Some consider this CDBS feature evil.
+
+Some enable the feature within a package, and gets smacked by ftp-master
+or others (there's even a lintian check to complain about it now).
+
+This tweak enables the feature when the build environment contains the
+non-default hint "cdbs-autoupdate" in the DEB_BUILD_OPTIONS variable.
+
+
+
+New buildinfo rule
+------------------
+
+See package description for "buildinfo" for more info.
+
+
+
+Improved support for multiple compilations
+------------------------------------------
+
+Create and clean builddir _after_ resolvong per-package DEB_BUILDDIR.
+
+Honour per-package DEB_BUILDDIR in makefile class.
+
+
+
+Various improvements to python-distutils class
+----------------------------------------------
+
+Use full path to python interpreter (Python Policy section 1.3.2).
+
+Add CDBS_BUILD_DEPENDS to old policy method.
+
+Fix CDBS_BUILD_DEPENDS in new policy methods to only depend on debhelper
+when actually used.
+
+Fix DEB_PYTHON_SIMPLE_PACKAGES sometimes installed twice (and only one
+of them honouring DEB_PYTHON_COMPILE_VERSION).
+
+Unify install path using new DEB_PYTHON_DESTDIR.
+
+Quote install path.
+
+
+
+New copyright-check rule
+------------------------
+
+Refuse to build if the source is found to contain different copyright
+info than earlier builds.
+
+
+
+New kernelpatches rule
+----------------------
+
+Small wrapper around dh-kpatches, taking care of build-dependencies too.
Added: srtp/trunk/debian/cdbs/1/rules/buildcore.mk
===================================================================
--- srtp/trunk/debian/cdbs/1/rules/buildcore.mk 2007-01-29 18:54:34 UTC (rev 3084)
+++ srtp/trunk/debian/cdbs/1/rules/buildcore.mk 2007-01-29 20:07:26 UTC (rev 3085)
@@ -0,0 +1,30 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2006 Jonas Smedegaard <dr at jones.dk>
+# Description: Check for cdbs-autoupdate in DEB_BUILD_OPTIONS
+#
+# 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 the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
+
+ifneq (,$(findstring cdbs-autoupdate,$(DEB_BUILD_OPTIONS)))
+DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
+endif
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
Added: srtp/trunk/debian/cdbs/1/rules/buildinfo.mk
===================================================================
--- srtp/trunk/debian/cdbs/1/rules/buildinfo.mk 2007-01-29 18:54:34 UTC (rev 3084)
+++ srtp/trunk/debian/cdbs/1/rules/buildinfo.mk 2007-01-29 20:07:26 UTC (rev 3085)
@@ -0,0 +1,40 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2004-2006 Jonas Smedegaard <dr at jones.dk>
+# Description: Generate and include build information
+#
+# 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 the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildinfo
+_cdbs_rules_buildinfo = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), dh-buildinfo
+
+common-install-arch common-install-indep:: debian/stamp-buildinfo
+
+debian/stamp-buildinfo:
+ dh_buildinfo
+ touch debian/stamp-buildinfo
+
+clean::
+ rm -f debian/stamp-buildinfo
+
+endif
Added: srtp/trunk/debian/cdbs/1/rules/copyright-check.mk
===================================================================
--- srtp/trunk/debian/cdbs/1/rules/copyright-check.mk 2007-01-29 18:54:34 UTC (rev 3084)
+++ srtp/trunk/debian/cdbs/1/rules/copyright-check.mk 2007-01-29 20:07:26 UTC (rev 3085)
@@ -0,0 +1,57 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2005-2006 Jonas Smedegaard <dr at jones.dk>
+# Description: Check for changes to copyright notices in source
+#
+# 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 the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+# TODO: Make use of /usr/bin/licensecheck in kdesdk-scripts package
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_copyright-check
+_cdbs_rules_copyright-check := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+cdbs_copyright-check_find_opts := -not -regex '\./debian/.*' -not -regex '.*/config\.\(guess\|sub\|rpath\)'
+cdbs_copyright-check_egrep_opts := --text -rih '(copyright|\(c\) ).*[0-9]{4}'
+
+clean::
+ @echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+ find . -type f $(cdbs_copyright-check_find_opts) -exec cat '{}' ';' \
+ | tr '\r' '\n' \
+ | LC_ALL=C sed -e 's/[^[:print:]]//g' \
+ | egrep $(cdbs_copyright-check_egrep_opts) \
+ | sed -e 's/^[[:space:]*#]*//' -e 's/[[:space:]]*$$//' \
+ | LC_ALL=C sort -u \
+ > debian/copyright_newhints
+ @if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
+ @echo "diff --normal debian/copyright_hints debian/copyright_newhints | egrep '^>'"
+ @diff --normal debian/copyright_hints debian/copyright_newhints | egrep '^>'; \
+ if [ "$$?" -eq "0" ]; then \
+ echo "New or changed copyright notices discovered! Do this:"; \
+ echo " 1) Search source for each of the above lines ('grep -r' is your friend)"; \
+ echo " 2) Update debian/copyright as needed"; \
+ echo " 3) Replace debian/copyright_hints with debian/copyright_newhints"; \
+ exit 1; \
+ fi
+
+ @echo 'No new copyright notices found - assuming no news is good news...'
+ rm -f debian/copyright_newhints
+
+endif
Copied: srtp/trunk/debian/control.in (from rev 3084, srtp/trunk/debian/control)
===================================================================
--- srtp/trunk/debian/control 2007-01-29 18:54:34 UTC (rev 3084)
+++ srtp/trunk/debian/control.in 2007-01-29 20:07:26 UTC (rev 3085)
@@ -0,0 +1,25 @@
+Source: srtp
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Mikael Magnusson <mikma at users.sourceforge.net>
+Build-Depends: @cdbs@
+Standards-Version: 3.7.2
+Section: libs
+XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
+
+Package: libsrtp-dev
+Section: devel
+Architecture: any
+Description: Secure RTP (SRTP) and UST Reference Implementations
+ SRTP is a security profile for RTP that adds confidentiality, message
+ authentication, and replay protection to that protocol. It is specified
+ in RFC 3711.
+ .
+ LibSRTP provides an implementation of the Secure Real-time Transport
+ Protocol (SRTP), the Universal Security Transform (UST), and a
+ supporting cryptographic kernel.
+ .
+ This package contains the development headers and static libraries.
+ .
+ Homepage: http://srtp.sourceforge.net/srtp.html
Modified: srtp/trunk/debian/copyright
===================================================================
--- srtp/trunk/debian/copyright 2007-01-29 18:54:34 UTC (rev 3084)
+++ srtp/trunk/debian/copyright 2007-01-29 20:07:26 UTC (rev 3085)
@@ -10,7 +10,7 @@
Upstream author: David A. McGrew <mcgrew at cisco.com>
-Copyright and licensing info:
+Copyright and licensing info, most files:
* Copyright (c) 2001-2005, Cisco Systems, Inc.
* All rights reserved.
@@ -43,3 +43,39 @@
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Copyright and licensing info, crypto/rng/rand_linux_kernel.c and
+crypto/include/kernel-compat.h:
+
+ * Copyright(c) 2005 Ingate Systems AB
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * Neither the name of the author(s) nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
Added: srtp/trunk/debian/copyright_hints
===================================================================
--- srtp/trunk/debian/copyright_hints 2007-01-29 18:54:34 UTC (rev 3084)
+++ srtp/trunk/debian/copyright_hints 2007-01-29 20:07:26 UTC (rev 3085)
@@ -0,0 +1,11 @@
+Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (c) 2001-2005 Cisco Systems, Inc.
+Copyright (c) 2001-2005 Cisco Systems, Inc. All rights reserved.
+Copyright (c) 2001-2005, Cisco Systems, Inc.
+Copyright (c) 2001-2006, Cisco Systems, Inc.
+Copyright 1991 by the Massachusetts Institute of Technology
+Copyright(c) 2001-2005 Cisco Systems, Inc.
+Copyright(c) 2001-2005, Cisco Systems, Inc.
+Copyright(c) 2005 Ingate Systems AB
+\copyright 2001-2005 by David A. McGrew, Cisco Systems, Inc.
+sed 's/(c) 2001-2004/(c) 2001-2005/' $x > $x.tmp;
Modified: srtp/trunk/debian/rules
===================================================================
--- srtp/trunk/debian/rules 2007-01-29 18:54:34 UTC (rev 3084)
+++ srtp/trunk/debian/rules 2007-01-29 20:07:26 UTC (rev 3085)
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
+include debian/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
+include debian/cdbs/1/rules/copyright-check.mk
+include debian/cdbs/1/rules/buildinfo.mk
DEB_CONFIGURE_EXTRA_FLAGS = --disable-stdout --enable-syslog
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
More information about the Pkg-voip-commits
mailing list