From 70fb2c0cee33e95be5a94ab9a7bda4a47be10780 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Sat, 20 Jun 2015 21:09:39 +0300 Subject: [PATCH] OBS: switch to default pidgin-sipe.dsc All current Debian-like platforms support telepathy so we no longer need to use OS specific .dsc files but can use pidgin-sipe.dsc instead. This doesn't fix Debian lintian failure though, because it fails to parse the package name correctly: [ 269s] Use of uninitialized value $n in string ne at /usr/share/lintian/checks/fields.pm line 488. [ 269s] Use of uninitialized value $n in concatenation (.) or string at /usr/share/lintian/checks/fields.pm line 489. [ 269s] E: pidgin-sipe source: source-field-does-not-match-pkg-name pidgin-sipe != For now all Debian builds have been disabled on OBS. --- contrib/opensuse-build-service/generate_debian.sh | 22 ++++++++-------------- contrib/opensuse-build-service/lintian-overrides | 2 -- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 contrib/opensuse-build-service/lintian-overrides diff --git a/contrib/opensuse-build-service/generate_debian.sh b/contrib/opensuse-build-service/generate_debian.sh index dbd9fc06..b5fb5c28 100755 --- a/contrib/opensuse-build-service/generate_debian.sh +++ b/contrib/opensuse-build-service/generate_debian.sh @@ -27,10 +27,6 @@ sed -i.ORIG -e 's/libnss3-dev, //' debian/control touch -r debian/control.ORIG debian/control rm debian/control.ORIG -# Add Lintian override file -mkdir -p debian/source -cp -p lintian-overrides debian/source/ - # 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." @@ -59,17 +55,15 @@ done >checksums.txt for d in *.dsc; do cat checksums.txt >>${d}; done rm checksums.txt +# All current platforms currently support telepathy - use only default .dsc +cp pidgin-sipe-telepathy.dsc pidgin-sipe.dsc # Overwrite those .dsc's that have support for telepathy -for os in \ - Debian_8.0 \ - Debian_7.0 \ - xUbuntu_15.04 \ - xUbuntu_14.10 \ - xUbuntu_14.04 \ - xUbuntu_12.04; \ -do \ - cp pidgin-sipe-telepathy.dsc pidgin-sipe-${os}.dsc; \ -done +#for os in \ +# Debian_x.y \ +# xUbuntu_xx.yy; \ +#do \ +# cp pidgin-sipe-telepathy.dsc pidgin-sipe-${os}.dsc; \ +#done # Update SHA-2 256 checksum in Arch Linux PKGBUILD sed -i -e "s/@@SHA256SUM@@/$(sha256sum pidgin-sipe-${version}.tar.gz | cut -d' ' -f1)/" PKGBUILD diff --git a/contrib/opensuse-build-service/lintian-overrides b/contrib/opensuse-build-service/lintian-overrides deleted file mode 100644 index 2284cc82..00000000 --- a/contrib/opensuse-build-service/lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# OBS .dsc file names must contain OS name but source file doesn't -pidgin-sipe source: source-field-does-not-match-pkg-name * -- 2.11.4.GIT