[SCM] gerbera/master: Drop config options in d/rules - the defaults are fine

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Sat Sep 23 17:48:14 UTC 2017


The following commit has been merged in the master branch:
commit 71146d5f48aa6b22c65857dccdbcd7609de3b2b1
Author: James Cowgill <jcowgill at debian.org>
Date:   Fri Jun 2 18:28:24 2017 +0100

    Drop config options in d/rules - the defaults are fine

diff --git a/debian/rules b/debian/rules
index ac907ba..d72e110 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,45 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-    MEDIATOMB_DEBUG_OPTIONS += --enable-debug-malloc0 \
-			--enable-tombdebug \
-			--enable-upnpdebug \
-			--enable-debug-log
-endif
-
-# Implement a MEDIATOMB_CONFIG_OPTIONS variable that sets the default configure
-# options and allow it to be overridden.
-# Use DEB_HOST_ARCH_OS from dpkg-architecture to determine OS we're building
-# for.
-export DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-   ENABLE_INOTIFY = --enable-inotify
-endif
-MEDIATOMB_CONFIG_OPTIONS ?= --enable-sqlite3 \
-			--enable-mysql \
-			--enable-libjs \
-			--enable-libmagic \
-			$(ENABLE_INOTIFY) \
-			--enable-libexif \
-			--enable-taglib \
-			--enable-ffmpeg \
-			--enable-ffmpegthumbnailer \
-			--enable-external-transcoding \
-			--enable-curl \
-			--enable-youtube \
-			--enable-db-autocreate \
-			--disable-id3lib \
-			--disable-libmp4v2 \
-			--disable-lastfm \
-			$(MEDIATOMB_DEBUG_OPTIONS)
-
-override_dh_auto_configure:
-	dh_auto_configure -- $(MEDIATOMB_CONFIG_OPTIONS) --disable-silent-rules
-
 override_dh_installinit:
 	dh_installinit --name=mediatomb \
 		--update-rcd-params='defaults 98 02'

-- 
gerbera packaging



More information about the pkg-multimedia-commits mailing list