[Pkg-voip-commits] r1102 - in bayonne/trunk/debian: . patches
Kilian Krause
kilian at costa.debian.org
Sat Dec 31 17:46:20 UTC 2005
Author: kilian
Date: 2005-12-31 17:46:19 +0000 (Sat, 31 Dec 2005)
New Revision: 1102
Modified:
bayonne/trunk/debian/changelog
bayonne/trunk/debian/control
bayonne/trunk/debian/patches/01_old_rollup.dpatch
bayonne/trunk/debian/rules
Log:
remove old cruft which is no longer used anyway. Now I just need to get straight where -fPIC is going lost...
Modified: bayonne/trunk/debian/changelog
===================================================================
--- bayonne/trunk/debian/changelog 2005-12-31 16:33:14 UTC (rev 1101)
+++ bayonne/trunk/debian/changelog 2005-12-31 17:46:19 UTC (rev 1102)
@@ -1,9 +1,13 @@
bayonne (1.2.15-2) unstable; urgency=low
+ [ Mark Purcell ]
* Copyright audit to debian/copyright
- -- Mark Purcell <msp at debian.org> Mon, 7 Nov 2005 19:14:25 +0000
+ [ Kilian Krause ]
+ * Bump build-dependencies to libmysqlclient15-dev (Closes: #343764)
+ -- Kilian Krause <kilian at debian.org> Sat, 31 Dec 2005 16:44:02 +0000
+
bayonne (1.2.15-1) unstable; urgency=low
* New upstream release
Modified: bayonne/trunk/debian/control
===================================================================
--- bayonne/trunk/debian/control 2005-12-31 16:33:14 UTC (rev 1101)
+++ bayonne/trunk/debian/control 2005-12-31 17:46:19 UTC (rev 1102)
@@ -3,7 +3,7 @@
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>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>
-Build-Depends: debhelper (>> 3.0.0), libcommoncpp2-dev (>= 1.3.10-4), libccaudio-dev (>= 1.1.2-2), libccscript-dev (>= 2.5.7-4), libperl-dev, zlib1g-dev, libxml2-dev, tcl8.4-dev, libhoard, libzap-dev, libjpeg62-dev, libmysqlclient10-dev, libpam0g-dev (>= 0.76), dpatch
+Build-Depends: debhelper (>> 3.0.0), libcommoncpp2-dev (>= 1.3.10-4), libccaudio-dev (>= 1.1.2-2), libccscript-dev (>= 2.5.7-4), libperl-dev, zlib1g-dev, libxml2-dev, tcl8.4-dev, libhoard, libzap-dev, libjpeg62-dev, libmysqlclient15-dev, libpam0g-dev (>= 0.76), dpatch
Standards-Version: 3.5.2
Package: bayonne
Modified: bayonne/trunk/debian/patches/01_old_rollup.dpatch
===================================================================
--- bayonne/trunk/debian/patches/01_old_rollup.dpatch 2005-12-31 16:33:14 UTC (rev 1101)
+++ bayonne/trunk/debian/patches/01_old_rollup.dpatch 2005-12-31 17:46:19 UTC (rev 1102)
@@ -21,164 +21,6 @@
exit 0
@DPATCH@
-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
- ;;
-
- *)
-@@ -2902,6 +2903,9 @@
-
- EOF
- ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
- esac
-
- # 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.
-
-+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
-+
- # 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 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/^[^-]*-//'`
- ;;
-+ amd64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
-@@ -778,6 +781,10 @@
- basic_machine=powerpc-ibm
- os=-os400
- ;;
-+ os400)
-+ basic_machine=powerpc-ibm
-+ os=-os400
-+ ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
-@@ -875,6 +882,12 @@
- s390x | s390x-*)
- basic_machine=s390x-ibm
- ;;
-+ s390 | s390-*)
-+ basic_machine=s390-ibm
-+ ;;
-+ s390x | s390x-*)
-+ basic_machine=s390x-ibm
-+ ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
-@@ -1002,6 +1015,10 @@
- basic_machine=s390x-ibm
- os=-tpf
- ;;
-+ tpf)
-+ basic_machine=s390x-ibm
-+ os=-tpf
-+ ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
-@@ -1215,6 +1232,9 @@
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
-+ -linux-dietlibc)
-+ os=-linux-dietlibc
-+ ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
-@@ -1230,6 +1250,9 @@
- -os400*)
- os=-os400
- ;;
-+ -os400*)
-+ os=-os400
-+ ;;
- -wince*)
- os=-wince
- ;;
-@@ -1254,6 +1277,9 @@
- -syllable*)
- os=-syllable
- ;;
-+ -syllable*)
-+ os=-syllable
-+ ;;
- -386bsd)
- os=-bsd
- ;;
-@@ -1279,6 +1305,9 @@
- -tpf*)
- os=-tpf
- ;;
-+ -tpf*)
-+ os=-tpf
-+ ;;
- -triton*)
- os=-sysv3
- ;;
-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
- ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
- esac
- elif test "$with_gnu_ld" = yes; then
- echo "$as_me:$LINENO: checking for GNU ld" >&5
-@@ -4416,6 +4419,7 @@
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
-+ hardcode_into_libs=yes
- ;;
- esac
-
-@@ -5874,6 +5878,18 @@
- dynamic_linker='GNU/FreeBSD ld.so'
- ;;
-
-+freebsd*-gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU/FreeBSD ld.so'
-+ ;;
-+
- freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
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
Modified: bayonne/trunk/debian/rules
===================================================================
--- bayonne/trunk/debian/rules 2005-12-31 16:33:14 UTC (rev 1101)
+++ bayonne/trunk/debian/rules 2005-12-31 17:46:19 UTC (rev 1102)
@@ -26,8 +26,7 @@
INSTALL_PROGRAM += -s
endif
-configure: patch-stamp configure-stamp
-configure-stamp: patch
+config.status: patch-stamp
dh_testdir
# Add here commands to configure the package.
@@ -45,10 +44,8 @@
--libexecdir=\$${prefix}/lib/bayonne
#--without-unsafe
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
@@ -61,10 +58,10 @@
cleanup:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
+ rm -f build-stamp config.status
-test -r /usr/share/misc/config.sub && \
cp -f /usr/share/misc/config.sub config/config.sub
-test -r /usr/share/misc/config.guess && \
@@ -135,4 +132,4 @@
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure cleanup patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install cleanup patch unpatch
More information about the Pkg-voip-commits
mailing list