[Pkg-voip-commits] r9717 - in /kamailio/trunk/debian: changelog compat control patches/multiarch_support.patch patches/no_lib64_on_64_bits.patch rules
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Wed May 23 07:50:59 UTC 2012
Author: maniac-guest
Date: Wed May 23 07:50:58 2012
New Revision: 9717
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9717
Log:
Removing lua from built until fix. Multiarch support initial effort
Added:
kamailio/trunk/debian/patches/multiarch_support.patch
- copied, changed from r9673, kamailio/trunk/debian/patches/no_lib64_on_64_bits.patch
Removed:
kamailio/trunk/debian/patches/no_lib64_on_64_bits.patch
Modified:
kamailio/trunk/debian/changelog
kamailio/trunk/debian/compat
kamailio/trunk/debian/control
kamailio/trunk/debian/rules
Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9717&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Wed May 23 07:50:58 2012
@@ -11,9 +11,10 @@
+ remove dpatch
+ add myself as Uploader
+ add ${misc:Depends} to all binary packages (lintian suggestion)
+ + multiarch support.
* debian/patches:
+ remove all patches.
- + refresh no_lib64_on_64_bits.patch
+ + no_lib64_on_64_bits.patch -> multiarch_support.patch
+ added upstream fixes
+ added no_INSTALL_file.patch
+ added spelling-errors.patch
@@ -23,7 +24,7 @@
* debian/copyright
+ using copyright-format/1.0/
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Tue, 22 May 2012 17:16:02 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Wed, 23 May 2012 09:47:20 +0200
kamailio (1.5.1-2) unstable; urgency=low
Modified: kamailio/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/compat?rev=9717&op=diff
==============================================================================
--- kamailio/trunk/debian/compat (original)
+++ kamailio/trunk/debian/compat Wed May 23 07:50:58 2012
@@ -1,1 +1,1 @@
-5
+8
Modified: kamailio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/control?rev=9717&op=diff
==============================================================================
--- kamailio/trunk/debian/control (original)
+++ kamailio/trunk/debian/control Wed May 23 07:50:58 2012
@@ -4,7 +4,7 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Kilian Krause <kilian at debian.org>, Henning Westerholt <henning.westerholt at 1und1.de>, Victor Seva <linuxmaniac at torreviejawireless.org>
Build-Depends: bison,
- debhelper (>= 7),
+ debhelper (>= 8.1.3),
quilt (>= 0.46-7~),
docbook-xml,
dpkg-dev (>= 1.13.19),
@@ -42,6 +42,7 @@
Package: kamailio
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, python, adduser
Replaces: openser
Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules
@@ -66,6 +67,7 @@
Priority: extra
Section: debug
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, kamailio (= ${binary:Version})
Replaces: openser-dbg
Description: very fast and configurable SIP proxy [debug symbols]
@@ -78,6 +80,7 @@
Package: kamailio-geoip-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Description: contains the geoip module
Kamailio is a very fast and flexible SIP (RFC3261)
@@ -89,6 +92,7 @@
Package: kamailio-sqlite-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version}), libsqlite3-0
Description: SQLite database connectivity module for Kamailio
Kamailio is a very fast and flexible SIP (RFC3261)
@@ -99,6 +103,7 @@
Package: kamailio-json-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version}), libjson0, libevent-1.4-2
Description: Json parser and jsonrpc modules for Kamailio
Kamailio is a very fast and flexible SIP (RFC3261)
@@ -110,6 +115,7 @@
Package: kamailio-memcached-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: kamailio-memcached-module
Description: Provides the memcached module, an interface to the memcached server
@@ -122,6 +128,7 @@
Package: kamailio-lua-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Description: contains the app_lua module
Kamailio is a very fast and flexible SIP (RFC3261)
@@ -133,6 +140,7 @@
Package: kamailio-python-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Description: contains the app_python module
Kamailio is a very fast and flexible SIP (RFC3261)
@@ -144,6 +152,7 @@
Package: kamailio-mysql-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
Replaces: openser-mysql-module
Description: MySQL database connectivity module for Kamailio
@@ -155,6 +164,7 @@
Package: kamailio-postgres-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
Replaces: openser-postgres-module
Description: PostgreSQL database connectivity module for Kamailio
@@ -166,6 +176,7 @@
Package: kamailio-cpl-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: openser-cpl-module
Description: CPL module (CPL interpreter engine) for Kamailio
@@ -178,6 +189,7 @@
Package: kamailio-radius-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: openser-radius-modules
Description: RADIUS modules for Kamailio
@@ -191,6 +203,7 @@
Package: kamailio-unixodbc-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: openser-unixodbc-modules
Description: unixODBC database connectivity module for Kamailio
@@ -202,6 +215,7 @@
Package: kamailio-presence-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: openser-presence-modules
Description: SIMPLE presence modules for Kamailio
@@ -215,6 +229,7 @@
Package: kamailio-perl-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: openser-perl-modules, openser-perl-modules
Conflicts: openser-perl-modules
@@ -228,6 +243,7 @@
Package: kamailio-snmpstats-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
Replaces: openser-snmpstats-modules
Description: SNMP AgentX subagent module for Kamailio
@@ -240,6 +256,7 @@
Package: kamailio-xmpp-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: openser-xmpp-modules
Description: XMPP gateway module for Kamailio
@@ -251,6 +268,7 @@
Package: kamailio-xml-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: kamailio-xml-module, kamailio-xmlrpc-module
Provides: kamailio-xmlrpc-modules
@@ -266,6 +284,7 @@
Package: kamailio-carrierroute-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: openser-carrierroute-modules
Description: carrierroute module for Kamailio
@@ -278,6 +297,7 @@
Package: kamailio-berkeley-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
Replaces: openser-berkeley-modules
Description: Berkeley database module for Kamailio
@@ -291,6 +311,7 @@
Package: kamailio-ldap-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Replaces: openser-ldap-modules
Description: LDAP modules for Kamailio
@@ -304,6 +325,7 @@
Package: kamailio-utils-modules
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, kamailio (= ${binary:Version})
Description: Provides a set utility functions for Kamailio
Kamailio is a very fast and flexible SIP (RFC3261)
Copied: kamailio/trunk/debian/patches/multiarch_support.patch (from r9673, kamailio/trunk/debian/patches/no_lib64_on_64_bits.patch)
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/multiarch_support.patch?rev=9717&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/no_lib64_on_64_bits.patch (original)
+++ kamailio/trunk/debian/patches/multiarch_support.patch Wed May 23 07:50:58 2012
@@ -1,19 +1,22 @@
--- a/Makefile.defs
+++ b/Makefile.defs
-@@ -411,15 +411,7 @@
+@@ -411,15 +411,12 @@
endif
$(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>)
-LIBDIR ?=
--ifeq ($(LIBDIR),)
++LIBDIR ?=
+ ifeq ($(LIBDIR),)
-ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
-ifeq ($(ARCHBSZ),64b)
- LIBDIR = lib64
-else
- LIBDIR = lib
-endif
--endif
-+LIBDIR = lib
++ ARCH_TRIPLET=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
++ LIBDIR = lib/$(ARCH_TRIPLET)
+ endif
++$(info LIBDIR <$(LIBDIR)>)
# dirs
cfg_dir = etc/$(MAIN_NAME)/
Modified: kamailio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/rules?rev=9717&op=diff
==============================================================================
--- kamailio/trunk/debian/rules (original)
+++ kamailio/trunk/debian/rules Wed May 23 07:50:58 2012
@@ -8,6 +8,8 @@
FILENAME := kamailio_$(UPVERSION).orig.tar.gz
URL := http://www.kamailio.org/pub/kamailio/$(UPVERSION)/src/kamailio-$(UPVERSION)_src.tar.gz
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -27,11 +29,11 @@
# on which other depend first)
PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
ldap xml perl utils memcached \
- snmpstats carrierroute xmpp cpl lua python geoip\
+ snmpstats carrierroute xmpp cpl python geoip\
sqlite json
# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
-LIBDIR ?= lib
+LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
# directories with possible duplicate libraries (that should be deleted
# from current module* packages)
@@ -52,7 +54,7 @@
define PACKAGE_GRP_INSTALL_template
$(foreach grp,$(PACKAGE_GROUPS),\
- $(MAKE) install-modules-all group_include="k$(grp)" \
+ $(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
basedir=$(CURDIR)/debian/kamailio-$(grp)-modules \
cfg_prefix=$(CURDIR)/debian/kamailio-$(grp)-modules \
doc-dir=share/doc/kamailio-$(grp)-modules
@@ -118,7 +120,7 @@
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/kamailio
- $(MAKE) install group_include="kstandard"
+ $(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
# make group packages
$(call PACKAGE_GRP_INSTALL_template)
# install /etc/default/kamailio file
More information about the Pkg-voip-commits
mailing list