From 63f1341db1d60947c3eb4d4141796a662a885359 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Fri, 6 Dec 2013 19:10:11 +0200 Subject: [PATCH] OBS: switch newer Debian/Ubuntu releases to OpenSSL On Debian/Ubuntu releases where OpenSSL >= 1.0 the package build has been switched from NSS to OpenSSL. That means that we have some sanity checking for the new OpenSSL code. --- contrib/debian/control | 1 + contrib/opensuse-build-service/generate_debian.sh | 5 +++++ contrib/opensuse-build-service/pidgin-sipe-VandV.dsc | 2 +- contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/debian/control b/contrib/debian/control index cccf40fe..b4d06c66 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -3,6 +3,7 @@ Section: misc Priority: optional Maintainer: Anibal Avelar Homepage: http://sipe.sourceforge.net/ +# FYI: libnss3-dev can be replaced with libssl-dev Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.12.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.4.0), libtool, intltool, libkrb5-dev, libzephyr-dev Standards-Version: 3.9.1 diff --git a/contrib/opensuse-build-service/generate_debian.sh b/contrib/opensuse-build-service/generate_debian.sh index e1b598cd..ecfc0e90 100755 --- a/contrib/opensuse-build-service/generate_debian.sh +++ b/contrib/opensuse-build-service/generate_debian.sh @@ -22,6 +22,11 @@ tar --strip-components=2 --wildcards -xvf \ "*/contrib/debian" || cleanup "tar failed" [ -e debian ] || cleanup "directory 'debian' - does not exist" +# Strip libnss3-dev from debian/control: build setup is controlled by .dsc's +sed -i.ORIG -e 's/libnss3-dev, //' debian/control +touch -r debian/control.ORIG debian/control +rm debian/control.ORIG + # Have the contents changed? if tar 2>/dev/null -df pidgin-sipe_${version}-1.debian.tar.gz; then echo "contrib/debian is unchanged - not updating .debian.tar.gz." diff --git a/contrib/opensuse-build-service/pidgin-sipe-VandV.dsc b/contrib/opensuse-build-service/pidgin-sipe-VandV.dsc index 43a60810..e5d9a068 100644 --- a/contrib/opensuse-build-service/pidgin-sipe-VandV.dsc +++ b/contrib/opensuse-build-service/pidgin-sipe-VandV.dsc @@ -5,5 +5,5 @@ Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any Standards-Version: 3.9.1 -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.12.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev, libtelepathy-glib-dev, libgmime-2.4-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.12.0), libxml2-dev, libssl-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev, libtelepathy-glib-dev, libgmime-2.4-dev Homepage: http://sipe.sourceforge.net/ diff --git a/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc b/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc index e3717853..8309e5fd 100644 --- a/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc +++ b/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc @@ -5,5 +5,5 @@ Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any Standards-Version: 3.9.1 -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev, libtelepathy-glib-dev (>= 0.18.0), libgmime-2.6-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libssl-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev, libtelepathy-glib-dev (>= 0.18.0), libgmime-2.6-dev Homepage: http://sipe.sourceforge.net/ -- 2.11.4.GIT