[SCM] idjc/master: Python scripts are now installed into ${libdir}/idjc per default

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Feb 18 17:43:17 UTC 2014


The following commit has been merged in the master branch:
commit d7582ea14818f1750ea0fbe35c2190377de73667
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Feb 18 18:26:24 2014 +0100

    Python scripts are now installed into ${libdir}/idjc per default

diff --git a/debian/rules b/debian/rules
index ee60144..3cbaff1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
 #!/usr/bin/make -f
 
-export REPACK_SH=$(CURDIR)/debian/repack.sh
-
 %:
 	dh $@ --parallel --with python2,autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-rpath --disable-static --libexecdir=/usr/bin --libdir=/usr/lib/idjc
+	dh_auto_configure -- --disable-rpath --disable-static --libexecdir=/usr/bin --libdir=/usr/lib
 
 override_dh_auto_build:
 ifneq (,$(findstring doopt,$(DEB_BUILD_OPTIONS)))
@@ -33,11 +31,6 @@ override_dh_auto_install:
 	cp -a doc/* debian/idjc/usr/share/doc/idjc/html/
 	# Delete auto-installed docs in wrong dir (rather than patching Makefiles)
 	rm -rf debian/idjc/usr/share/doc/idjc-*
-	# Fix pyexecdir path
-	sed -i -e 's/\(pyexecdir=\)\(.*\)/\1\/usr\/share\/pyshared/' \
-		debian/idjc/usr/bin/idjc
-	sed -i -e 's/\(pkgpyexecdir=\)\(.*\)/\1\/usr\/share\/pyshared\/idjc/' \
-		debian/idjc/usr/bin/idjc
 	# remove pyc files
 	find debian/idjc/ -name \*.pyc -exec rm -v {} +
 	find debian/idjc -type d -empty -delete

-- 
idjc packaging



More information about the pkg-multimedia-commits mailing list