[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta4-525-g8cb1559

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 8cb15597062ede2e700825a7275fb83fd66187d0
Merge: 29ac3811d94c5918cee1f3f509dd953f1a9bec77 14edf5b16369dd0b442649d24cffcd91439c0cb8
Author: Sven Hoexter <sven at timegate.de>
Date:   Mon Feb 7 16:10:01 2011 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-lyx/lyx

diff --combined debian/rules
index 58358f1,dce7101..794f073
--- a/debian/rules
+++ b/debian/rules
@@@ -3,7 -3,7 +3,7 @@@
  LDFLAGS += -Wl,-z,defs -Wl,--as-needed
  
  %:
- 	dh $@ --with autotools_dev --builddirectory
+ 	dh $@ --with autotools_dev,python2,tex --builddirectory
  
  override_dh_auto_configure:
  	dh_auto_configure -- \
@@@ -41,8 -41,9 +41,8 @@@ override_dh_auto_install
  
  # install bash completion in the correct location
  	mkdir -p debian/lyx-common/etc/bash_completion.d
 -	install --mode=644 lib/scripts/bash_completion \
 +	mv debian/lyx-common/usr/share/lyx/scripts/bash_completion \
  		debian/lyx-common/etc/bash_completion.d/lyx
 -	rm debian/lyx-common/usr/share/lyx/scripts/bash_completion
  
  
  override_dh_installdocs:
@@@ -56,12 -57,14 +56,14 @@@
  		debian/ttf-lyx/usr/share/doc/ttf-lyx/
  	rm debian/ttf-lyx/usr/share/fonts/truetype/ttf-lyx/BaKoMaFontLicense.txt
  
- override_dh_pysupport:
- 	dh_pysupport /usr/share/lyx
+ override_dh_python2:
+ 	dh_python2 /usr/share/lyx
+ 
+ override_dh_installtex:
+ 	dh_installtex -plyx-common
  
  override_dh_install:
  	dh_install
- 	dh_installtex -plyx-common
  	dh_installdefoma -pttf-lyx
  
  override_dh_builddeb:

-- 
LyX packaging