[Pkg-voip-commits] r835 - in bayonne/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Wed Oct 12 18:58:13 UTC 2005
Author: msp
Date: 2005-10-12 18:58:12 +0000 (Wed, 12 Oct 2005)
New Revision: 835
Modified:
bayonne/trunk/debian/changelog
bayonne/trunk/debian/patches/01_old_rollup.dpatch
Log:
* (NOT RELEASED YET) New upstream release
Modified: bayonne/trunk/debian/changelog
===================================================================
--- bayonne/trunk/debian/changelog 2005-10-12 18:27:18 UTC (rev 834)
+++ bayonne/trunk/debian/changelog 2005-10-12 18:58:12 UTC (rev 835)
@@ -1,3 +1,9 @@
+bayonne (1.2.15-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+
+ -- Mark Purcell <msp at debian.org> Wed, 12 Oct 2005 19:28:45 +0100
+
bayonne (1.2.14pl2-3) UNRELEASED; urgency=low
* Debian VoIP upload
Modified: bayonne/trunk/debian/patches/01_old_rollup.dpatch
===================================================================
--- bayonne/trunk/debian/patches/01_old_rollup.dpatch 2005-10-12 18:27:18 UTC (rev 834)
+++ bayonne/trunk/debian/patches/01_old_rollup.dpatch 2005-10-12 18:58:12 UTC (rev 835)
@@ -21,28 +21,28 @@
exit 0
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./aclocal.m4 /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/aclocal.m4
---- ./aclocal.m4 2005-07-31 21:51:53.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/aclocal.m4 2005-07-31 21:52:11.000000000 +0100
-@@ -1664,6 +1664,7 @@
- soname_spec='$libname${shared_ext}.$major'
+diff -urNad bayonne-1.2.15~/aclocal.m4 bayonne-1.2.15/aclocal.m4
+--- bayonne-1.2.15~/aclocal.m4 2005-10-12 19:41:43.000000000 +0100
++++ bayonne-1.2.15/aclocal.m4 2005-10-12 19:41:48.000000000 +0100
+@@ -2263,6 +2263,7 @@
+ soname_spec='$libname.so.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
+ hardcode_into_libs=yes
;;
- uts4*)
-@@ -2331,6 +2332,9 @@
- siemens)
- lt_cv_deplibs_check_method=pass_all
+ *)
+@@ -2902,6 +2903,9 @@
+
+ EOF
;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
- ;;
-@@ -6616,6 +6620,8 @@
+ # We use sed instead of cat because bash on DJGPP gets confused if
+@@ -3695,6 +3699,8 @@
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
@@ -51,43 +51,10 @@
# This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro
# because gettext's gettext.m4 (distributed in the automake package)
-diff -urNad --exclude=CVS --exclude=.svn ./config/config.guess /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/config/config.guess
---- ./config/config.guess 2005-07-31 21:52:09.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/config/config.guess 2005-07-31 21:52:11.000000000 +0100
-@@ -325,6 +325,9 @@
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit 0 ;;
-+ *:OS400:*:*)
-+ echo powerpc-ibm-os400
-+ exit 0 ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
-@@ -1013,6 +1016,9 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit 0 ;;
-+ i*86:syllable:*:*)
-+ echo ${UNAME_MACHINE}-pc-syllable
-+ exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
-@@ -1264,6 +1270,9 @@
- *:XENIX:*:SysV)
- echo i386-pc-xenix
- exit 0 ;;
-+ *:DRAGONFLY:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -urNad --exclude=CVS --exclude=.svn ./config/config.sub /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/config/config.sub
---- ./config/config.sub 2005-07-31 21:52:09.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/config/config.sub 2005-07-31 21:52:11.000000000 +0100
-@@ -390,6 +390,9 @@
+diff -urNad bayonne-1.2.15~/config/config.sub bayonne-1.2.15/config/config.sub
+--- bayonne-1.2.15~/config/config.sub 2005-10-12 19:41:47.000000000 +0100
++++ bayonne-1.2.15/config/config.sub 2005-10-12 19:41:48.000000000 +0100
+@@ -400,6 +400,9 @@
amd64-*)
basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -97,7 +64,7 @@
amdahl)
basic_machine=580-amdahl
os=-sysv
-@@ -769,6 +772,10 @@
+@@ -778,6 +781,10 @@
basic_machine=powerpc-ibm
os=-os400
;;
@@ -108,7 +75,7 @@
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
-@@ -866,6 +873,12 @@
+@@ -875,6 +882,12 @@
s390x | s390x-*)
basic_machine=s390x-ibm
;;
@@ -121,7 +88,7 @@
sa29200)
basic_machine=a29k-amd
os=-udi
-@@ -993,6 +1006,10 @@
+@@ -1002,6 +1015,10 @@
basic_machine=s390x-ibm
os=-tpf
;;
@@ -132,7 +99,7 @@
udi29k)
basic_machine=a29k-amd
os=-udi
-@@ -1208,6 +1225,9 @@
+@@ -1215,6 +1232,9 @@
-linux-dietlibc)
os=-linux-dietlibc
;;
@@ -142,7 +109,7 @@
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-@@ -1223,6 +1243,9 @@
+@@ -1230,6 +1250,9 @@
-os400*)
os=-os400
;;
@@ -152,7 +119,7 @@
-wince*)
os=-wince
;;
-@@ -1247,6 +1270,9 @@
+@@ -1254,6 +1277,9 @@
-syllable*)
os=-syllable
;;
@@ -162,7 +129,7 @@
-386bsd)
os=-bsd
;;
-@@ -1272,6 +1298,9 @@
+@@ -1279,6 +1305,9 @@
-tpf*)
os=-tpf
;;
@@ -172,10 +139,10 @@
-triton*)
os=-sysv3
;;
-diff -urNad --exclude=CVS --exclude=.svn ./configure /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/configure
---- ./configure 2005-07-31 21:51:53.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/configure 2005-07-31 21:52:11.000000000 +0100
-@@ -3336,6 +3336,9 @@
+diff -urNad bayonne-1.2.15~/configure bayonne-1.2.15/configure
+--- bayonne-1.2.15~/configure 2005-10-12 19:41:43.000000000 +0100
++++ bayonne-1.2.15/configure 2005-10-12 19:41:48.000000000 +0100
+@@ -2911,6 +2911,9 @@
# If it is relative, then search for the first ld in PATH.
with_gnu_ld=unknown
;;
@@ -185,7 +152,7 @@
esac
elif test "$with_gnu_ld" = yes; then
echo "$as_me:$LINENO: checking for GNU ld" >&5
-@@ -5056,6 +5059,7 @@
+@@ -4416,6 +4419,7 @@
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -193,8 +160,8 @@
;;
esac
-@@ -7141,6 +7145,18 @@
- dynamic_linker='GNU ld.so'
+@@ -5874,6 +5878,18 @@
+ dynamic_linker='GNU/FreeBSD ld.so'
;;
+freebsd*-gnu*)
@@ -212,9 +179,9 @@
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
-diff -urNad --exclude=CVS --exclude=.svn ./server/bayonne.8 /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/server/bayonne.8
---- ./server/bayonne.8 2005-07-31 21:51:53.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/server/bayonne.8 2005-07-31 21:52:11.000000000 +0100
+diff -urNad bayonne-1.2.15~/server/bayonne.8 bayonne-1.2.15/server/bayonne.8
+--- bayonne-1.2.15~/server/bayonne.8 2005-10-12 19:41:43.000000000 +0100
++++ bayonne-1.2.15/server/bayonne.8 2005-10-12 19:41:48.000000000 +0100
@@ -57,8 +57,6 @@
have the Bayonne host enabled in xhost. This provides remote graphical
debugging of a Bayonne server.
@@ -224,9 +191,9 @@
.SH AUTHOR
David Sugar (dyfet at ostel.com)
.PP
-diff -urNad --exclude=CVS --exclude=.svn ./server/bayonne.init /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/server/bayonne.init
---- ./server/bayonne.init 2005-07-31 21:51:53.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/server/bayonne.init 2005-07-31 21:52:11.000000000 +0100
+diff -urNad bayonne-1.2.15~/server/bayonne.init bayonne-1.2.15/server/bayonne.init
+--- bayonne-1.2.15~/server/bayonne.init 2005-10-12 19:41:43.000000000 +0100
++++ bayonne-1.2.15/server/bayonne.init 2005-10-12 19:41:48.000000000 +0100
@@ -16,8 +16,6 @@
# description: Bayonne is the telephony server of the GNU \
# project and offers interactive voice response.
@@ -236,9 +203,9 @@
RETVAL=0
-diff -urNad --exclude=CVS --exclude=.svn ./server/Makefile.am /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/server/Makefile.am
---- ./server/Makefile.am 2005-07-31 21:51:53.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/server/Makefile.am 2005-07-31 21:52:11.000000000 +0100
+diff -urNad bayonne-1.2.15~/server/Makefile.am bayonne-1.2.15/server/Makefile.am
+--- bayonne-1.2.15~/server/Makefile.am 2005-10-12 19:41:43.000000000 +0100
++++ bayonne-1.2.15/server/Makefile.am 2005-10-12 19:41:48.000000000 +0100
@@ -15,7 +15,7 @@
dsolibdir = $(libdir)/bayonne/$(VERSION)
pkgincludedir=${includedir}/cc++
@@ -248,21 +215,21 @@
etc_suffix=.orig
AM_CPPFLAGS = -DVERPATH=\"@VERSION@\" @SERVER_FLAGS@
-diff -urNad --exclude=CVS --exclude=.svn ./server/Makefile.in /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/server/Makefile.in
---- ./server/Makefile.in 2005-07-31 21:51:53.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/server/Makefile.in 2005-07-31 21:52:11.000000000 +0100
-@@ -175,7 +175,7 @@
-
+diff -urNad bayonne-1.2.15~/server/Makefile.in bayonne-1.2.15/server/Makefile.in
+--- bayonne-1.2.15~/server/Makefile.in 2005-10-12 19:41:43.000000000 +0100
++++ bayonne-1.2.15/server/Makefile.in 2005-10-12 19:41:48.000000000 +0100
+@@ -165,7 +165,7 @@
dsolibdir = $(libdir)/bayonne/$(VERSION)
+ pkgincludedir = ${includedir}/cc++
etc_prefix = @sysconfdir@
-ini_prefix = /etc
+ini_prefix = @sysconfdir@
etc_suffix = .orig
AM_CPPFLAGS = -DVERPATH=\"@VERSION@\" @SERVER_FLAGS@
-diff -urNad --exclude=CVS --exclude=.svn ./var/users/admin /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/var/users/admin
---- ./var/users/admin 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep-work.SCVa3l/bayonne-1.2.14pl2/var/users/admin 2005-07-31 21:52:11.000000000 +0100
+diff -urNad bayonne-1.2.15~/var/users/admin bayonne-1.2.15/var/users/admin
+--- bayonne-1.2.15~/var/users/admin 1970-01-01 01:00:00.000000000 +0100
++++ bayonne-1.2.15/var/users/admin 2005-10-12 19:41:48.000000000 +0100
@@ -0,0 +1,2 @@
+password=9999
+type=user
More information about the Pkg-voip-commits
mailing list