[SCM] libav/experimental: Revert "Tighten build-dependencies only when targeted experimental."

js at users.alioth.debian.org js at users.alioth.debian.org
Thu Jan 24 15:51:18 UTC 2013


The following commit has been merged in the experimental branch:
commit cdc249641cb58dd80064923d8ffe23d71647a342
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jan 24 16:38:49 2013 +0100

    Revert "Tighten build-dependencies only when targeted experimental."
    
    This reverts commit 9457dd3a2157c1bad7cedba87c59ddf974c120d5.

diff --git a/debian/rules b/debian/rules
index dbb5a57..f1fafd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,21 +66,15 @@ endif
 include debian/confflags
 OPT_FLAVORS := $(filter-out static shared, $(FLAVORS))
 
-# flag for package relations only for experimental releases
-experimental := $(shell dpkg-parsechangelog --format  rfc822 --count 2 | perl -0 -ne '/^Distribution: (experimental|UNRELEASED.*^Distribution: experimental)/ms && print "yes"')
-
 $(info FLAVORS = $(FLAVORS))
 $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
 $(info CFLAGS = $(CFLAGS))
 $(info CPPFLAGS = $(CPPFLAGS))
 $(info LDFLAGS = $(LDFLAGS))
-$(info experimental = $(if $(experimental),\
- yes - certain build-dependencies $(if $(DEB_MAINTAINER_MODE),is,should be) tightened,\
- no - certain build-dependencies left unversioned))
 
 CDBS_BUILD_DEPENDS += \
  debhelper (>= 8.1.3~), \
- frei0r-plugins-dev $(if $(experimental),(>= 1.3)), \
+ frei0r-plugins-dev (>= 1.3), \
  libasound2-dev [linux-any], \
  libbz2-dev, \
  libcdio-cdda-dev, \
@@ -95,7 +89,7 @@ CDBS_BUILD_DEPENDS += \
  libmp3lame-dev, \
  libopencore-amrnb-dev, \
  libopencore-amrwb-dev, \
- libopencv-dev $(if $(experimental),(>= 2.4)), \
+ libopencv-dev (>= 2.4), \
  libopenjpeg-dev, \
  libopus-dev (>= 1.0.1), \
  libpulse-dev, \
@@ -113,7 +107,7 @@ CDBS_BUILD_DEPENDS += \
  libvorbis-dev, \
  libvpx-dev, \
  libx11-dev, \
- libx264-dev $(if $(experimental),(>= 2:0.129)), \
+ libx264-dev (>= 2:0.129), \
  libxext-dev, \
  libxfixes-dev, \
  libxvidcore-dev, \

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list