[Pkg-voip-commits] r10431 - in /rtpproxy/trunk/debian: changelog compat control docs manpage.xml patches/ patches/series patches/syslog_format.patch rtpproxy.init rtpproxy.install rtpproxy.lintian-overrides rtpproxy.manpages rtpproxy.postinst rules source/ source/format
msp at alioth.debian.org
msp at alioth.debian.org
Sun Feb 16 03:57:22 UTC 2014
Author: msp
Date: Sun Feb 16 03:57:22 2014
New Revision: 10431
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10431
Log:
* Ack NMU - thanks ~gregoa
* Add syslog_format.patch
* Switch to dh, debian/compact -> 9
* source/format -> "3.0 (quilt)"
* rtpproxy.init add ". /lib/lsb/init-functions"
* Fix "old version of manpage" dropped debian/manpage.xml (Closes: #609204)
* Fix "depending on automake1.10" dropped versioned depends (Closes: #724431)
* lintian-overrides: false positive
rtpproxy: maintainer-script-should-not-use-adduser-system-without-home
* Update Vcs: headers
* Standards-Version: 3.9.5 - no further changes
* Non-maintainer upload.
* Fix "FTBFS: rtpp_syslog_async.c:88: error: format not a string
literal and no format arguments": add format argument in
rtpp_syslog_async.c.
Closes: #614476, LP: #832772
Added:
rtpproxy/trunk/debian/patches/
rtpproxy/trunk/debian/patches/series
rtpproxy/trunk/debian/patches/syslog_format.patch
rtpproxy/trunk/debian/rtpproxy.lintian-overrides
rtpproxy/trunk/debian/source/
rtpproxy/trunk/debian/source/format
Removed:
rtpproxy/trunk/debian/manpage.xml
rtpproxy/trunk/debian/rtpproxy.install
rtpproxy/trunk/debian/rtpproxy.manpages
Modified:
rtpproxy/trunk/debian/changelog
rtpproxy/trunk/debian/compat
rtpproxy/trunk/debian/control
rtpproxy/trunk/debian/docs
rtpproxy/trunk/debian/rtpproxy.init
rtpproxy/trunk/debian/rtpproxy.postinst
rtpproxy/trunk/debian/rules
Modified: rtpproxy/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/changelog?rev=10431&op=diff
==============================================================================
--- rtpproxy/trunk/debian/changelog (original)
+++ rtpproxy/trunk/debian/changelog Sun Feb 16 03:57:22 2014
@@ -1,3 +1,29 @@
+rtpproxy (1.2.1-2) UNRELEASED; urgency=medium
+
+ * Ack NMU - thanks ~gregoa
+ * Add syslog_format.patch
+ * Switch to dh, debian/compact -> 9
+ * source/format -> "3.0 (quilt)"
+ * rtpproxy.init add ". /lib/lsb/init-functions"
+ * Fix "old version of manpage" dropped debian/manpage.xml (Closes: #609204)
+ * Fix "depending on automake1.10" dropped versioned depends (Closes: #724431)
+ * lintian-overrides: false positive
+ rtpproxy: maintainer-script-should-not-use-adduser-system-without-home
+ * Update Vcs: headers
+ * Standards-Version: 3.9.5 - no further changes
+
+ -- Mark Purcell <msp at debian.org> Sun, 16 Feb 2014 13:40:44 +1100
+
+rtpproxy (1.2.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS: rtpp_syslog_async.c:88: error: format not a string
+ literal and no format arguments": add format argument in
+ rtpp_syslog_async.c.
+ Closes: #614476, LP: #832772
+
+ -- gregor herrmann <gregoa at debian.org> Wed, 19 Oct 2011 22:23:55 +0200
+
rtpproxy (1.2.1-1) unstable; urgency=low
* New upstream release
Modified: rtpproxy/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/compat?rev=10431&op=diff
==============================================================================
--- rtpproxy/trunk/debian/compat (original)
+++ rtpproxy/trunk/debian/compat Sun Feb 16 03:57:22 2014
@@ -1 +1 @@
-5
+9
Modified: rtpproxy/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/control?rev=10431&op=diff
==============================================================================
--- rtpproxy/trunk/debian/control (original)
+++ rtpproxy/trunk/debian/control Sun Feb 16 03:57:22 2014
@@ -3,12 +3,11 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
-Build-Depends: hardening-wrapper, debhelper (>= 5), autotools-dev, autoconf, automake1.10, xsltproc, docbook-xsl, docbook-xml
-Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 3.8.0
+Build-Depends: hardening-wrapper, debhelper (>= 9), autotools-dev, autoconf, automake, xsltproc, docbook-xsl, docbook-xml
+Standards-Version: 3.9.5
Homepage: http://www.rtpproxy.org
-Vcs-Svn: svn://svn.debian.org/pkg-voip/rtpproxy/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/
+Vcs-Svn: svn://anonscm.debian.org/pkg-voip/rtpproxy/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/rtpproxy/
Package: rtpproxy
Architecture: any
Modified: rtpproxy/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/docs?rev=10431&op=diff
==============================================================================
--- rtpproxy/trunk/debian/docs (original)
+++ rtpproxy/trunk/debian/docs Sun Feb 16 03:57:22 2014
@@ -1 +1,2 @@
README
+README.remote
Added: rtpproxy/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/patches/series?rev=10431&op=file
==============================================================================
--- rtpproxy/trunk/debian/patches/series (added)
+++ rtpproxy/trunk/debian/patches/series Sun Feb 16 03:57:22 2014
@@ -0,0 +1 @@
+syslog_format.patch
Added: rtpproxy/trunk/debian/patches/syslog_format.patch
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/patches/syslog_format.patch?rev=10431&op=file
==============================================================================
--- rtpproxy/trunk/debian/patches/syslog_format.patch (added)
+++ rtpproxy/trunk/debian/patches/syslog_format.patch Sun Feb 16 03:57:22 2014
@@ -0,0 +1,16 @@
+Description: add format argument in rtpp_syslog_async.c
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=614476
+
+Index: rtpproxy-1.2.1/rtpp_syslog_async.c
+===================================================================
+--- rtpproxy-1.2.1.orig/rtpp_syslog_async.c 2009-10-06 21:12:41.000000000 +1100
++++ rtpproxy-1.2.1/rtpp_syslog_async.c 2014-02-16 13:55:34.267703849 +1100
+@@ -85,7 +85,7 @@
+ /* main work here */
+ switch (wi->item_type) {
+ case SYSLOG_ITEM_ASYNC_WRITE:
+- syslog(wi->priority, wi->data);
++ syslog(wi->priority, "%s", wi->data);
+ break;
+
+ case SYSLOG_ITEM_ASYNC_EXIT:
Modified: rtpproxy/trunk/debian/rtpproxy.init
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/rtpproxy.init?rev=10431&op=diff
==============================================================================
--- rtpproxy/trunk/debian/rtpproxy.init (original)
+++ rtpproxy/trunk/debian/rtpproxy.init Sun Feb 16 03:57:22 2014
@@ -21,6 +21,8 @@
test -x $DAEMON || exit 0
umask 002
+
+. /lib/lsb/init-functions
# Include defaults if available
if [ -f /etc/default/$NAME ] ; then
Added: rtpproxy/trunk/debian/rtpproxy.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/rtpproxy.lintian-overrides?rev=10431&op=file
==============================================================================
--- rtpproxy/trunk/debian/rtpproxy.lintian-overrides (added)
+++ rtpproxy/trunk/debian/rtpproxy.lintian-overrides Sun Feb 16 03:57:22 2014
@@ -0,0 +1,2 @@
+# false positive
+rtpproxy: maintainer-script-should-not-use-adduser-system-without-home
Modified: rtpproxy/trunk/debian/rtpproxy.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/rtpproxy.postinst?rev=10431&op=diff
==============================================================================
--- rtpproxy/trunk/debian/rtpproxy.postinst (original)
+++ rtpproxy/trunk/debian/rtpproxy.postinst Sun Feb 16 03:57:22 2014
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
case "$1" in
configure)
Modified: rtpproxy/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/rules?rev=10431&op=diff
==============================================================================
--- rtpproxy/trunk/debian/rules (original)
+++ rtpproxy/trunk/debian/rules Sun Feb 16 03:57:22 2014
@@ -1,110 +1,6 @@
#!/usr/bin/make -f
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
-else
- CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
export DEB_BUILD_HARDENING=1
-PKGNAME := rtpproxy
-DEBVERSION:=$(shell head -n 1 debian/changelog \
- | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-UPVER_REAL:=$(shell echo $(UPVERSION) | sed -e 's/~beta/.beta/')
-
-FILENAME := $(PKGNAME)_$(UPVERSION).orig.tar.gz
-URL := http://b2bua.org/chrome/site/rtpproxy-$(UPVER_REAL).tar.gz
-
-MANPAGE := debian/$(PKGNAME).8
-
-configure:
- autoreconf --force --install
-
-configure-stamp: $(QUILT_STAMPFN) configure
- dh_testdir
- rm -f config.sub config.guess
- ln -sf /usr/share/misc/config.sub .
- ln -sf /usr/share/misc/config.guess .
- rm -f config.cache
- ./configure CFLAGS="$(CFLAGS)" --prefix=/usr --sysconfdir=/etc
- touch configure-stamp
-
-$(MANPAGE): debian/manpage.xml
- xsltproc -nonet -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $<
-
-build: build-stamp
-build-stamp: configure-stamp $(MANPAGE)
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- -rm -f build-stamp configure-stamp
- -rm -f debian/rtpproxy.8
- [ ! -f Makefile ] || $(MAKE) distclean
- -rm -f Makefile.in aclocal.m4 config.sub config.guess config.h.in \
- configure depcomp install-sh ltmain.sh missing mkinstalldirs
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_install
- dh_installinit
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-print-version:
- @@echo "Debian version: $(DEBVERSION)"
- @@echo "Upstream version: $(UPVERSION)"
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(FILENAME) from $(URL) ...
- @@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
- @@echo Repacking without upstream debian/...
- @@mkdir -p ../tarballs/rtpproxy-$(UPVERSION).tmp/
- @@cd ../tarballs/rtpproxy-$(UPVERSION).tmp ; \
- tar xfz ../$(FILENAME)
- @@rm -fR ../tarballs/rtpproxy-$(UPVERSION).tmp/rtpproxy-$(UPVER_REAL)/debian
- @@cd ../tarballs/rtpproxy-$(UPVERSION).tmp ; \
- tar cfz ../$(FILENAME) *
- @@echo Cleaning up...
- @@rm -rf ../tarballs/rtpproxy-$(UPVERSION).tmp/
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install print-version get-orig-source
+%:
+ dh $@
Added: rtpproxy/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/trunk/debian/source/format?rev=10431&op=file
==============================================================================
--- rtpproxy/trunk/debian/source/format (added)
+++ rtpproxy/trunk/debian/source/format Sun Feb 16 03:57:22 2014
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-voip-commits
mailing list