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

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 444cb0556de9ee93b6ef2cb8ac5b83a242745025
Author: Sven Hoexter <sven at timegate.de>
Date:   Sat Feb 19 11:19:02 2011 +0100

    Stop using defoma: Drop build-dep and dependency for ttf-lyx, remove dh_installdefoma from rules and subsequently no longer override_dh_install.

diff --git a/debian/changelog b/debian/changelog
index 9f520f2..f3f1392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ lyx (2.0.0~beta4-2) UNRELEASED; urgency=low
   * Add debian/patches/use-system-libmythes and a build depedency on
     libmythes-dev to use the system wide libmythes. (Closes: #612327)
 
+  [ Sven Hoexter ]
+  * Stop using defoma: Drop build-dep and dependency for ttf-lyx, remove
+    dh_installdefoma from rules and subsequently no longer override_dh_install.
+  
+
  -- Per Olofsson <pelle at debian.org>  Mon, 07 Feb 2011 15:55:44 +0100
 
 lyx (2.0.0~beta4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1ad2c1c..c3b9736 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: python (>= 2.6.6-3), debhelper (>= 8),
  autotools-dev, libqt4-dev, libboost-dev,
  libboost-filesystem-dev, libboost-signals-dev,
  libboost-iostreams-dev, libboost-regex-dev, libboost-test-dev,
- pkg-config, tex-common, defoma
+ pkg-config, tex-common
 
 Package: lyx
 Architecture: any
@@ -52,7 +52,7 @@ Description: Architecture-independent files for LyX
 Package: ttf-lyx
 Architecture: all
 Section: fonts
-Depends: ${misc:Depends}, defoma
+Depends: ${misc:Depends}
 Description: TrueType versions of some TeX fonts
  These fonts are needed for the visual math symbol display in
  LyX. They can also be used to display MathML in Gecko-based browsers
diff --git a/debian/rules b/debian/rules
index 794f073..313caca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,9 +62,5 @@ override_dh_python2:
 override_dh_installtex:
 	dh_installtex -plyx-common
 
-override_dh_install:
-	dh_install
-	dh_installdefoma -pttf-lyx
-
 override_dh_builddeb:
 	dh_builddeb -- -Z bzip2
diff --git a/debian/ttf-lyx.defoma-hints b/debian/ttf-lyx.defoma-hints
deleted file mode 100644
index 4e754c2..0000000
--- a/debian/ttf-lyx.defoma-hints
+++ /dev/null
@@ -1,112 +0,0 @@
-category truetype
-begin /usr/share/fonts/truetype/ttf-lyx/cmex10.ttf
-  Family = cmex10
-  FontName = cmex10
-  Encoding = Symbol
-  Location = Magyar Dutch Spanish Czech Russian English Catalan Slovak Italian Turkish Danish Slovenian Basque Portuguese German Polish Swedish Norwegian French Finnish Greek
-  Charset = font-specific
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape
-  Foundry = TeX
-  Priority = 20
-end
-begin /usr/share/fonts/truetype/ttf-lyx/cmmi10.ttf
-  Family = cmmi10
-  FontName = cmmi10
-  Encoding = Symbol
-  Location = Magyar Dutch Spanish Czech Russian English Catalan Slovak Italian Turkish Danish Slovenian Basque Portuguese German Polish Swedish Norwegian French Finnish Greek
-  Charset = font-specific
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape
-  Foundry = TeX
-  Priority = 20
-end
-begin /usr/share/fonts/truetype/ttf-lyx/cmr10.ttf
-  Family = cmr10
-  FontName = cmr10
-  Encoding = Symbol
-  Location = Magyar Dutch Spanish Czech Russian English Catalan Slovak Italian Turkish Danish Slovenian Basque Portuguese German Polish Swedish Norwegian French Finnish Greek
-  Charset = font-specific
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape
-  Foundry = TeX
-  Priority = 20
-end
-begin /usr/share/fonts/truetype/ttf-lyx/cmsy10.ttf
-  Family = cmsy10
-  FontName = cmsy10
-  Encoding = Symbol
-  Location = Magyar Dutch Spanish Czech Russian English Catalan Slovak Italian Turkish Danish Slovenian Basque Portuguese German Polish Swedish Norwegian French Finnish Greek
-  Charset = font-specific
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape
-  Foundry = TeX
-  Priority = 20
-end
-begin /usr/share/fonts/truetype/ttf-lyx/msam10.ttf
-  Family = msam10
-  FontName = msam10
-  Encoding = Symbol
-  Location = Magyar Dutch Spanish Czech Russian English Catalan Slovak Italian Turkish Danish Slovenian Basque Portuguese German Polish Swedish Norwegian French Finnish Greek
-  Charset = font-specific
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape
-  Foundry = TeX
-  Priority = 20
-end
-begin /usr/share/fonts/truetype/ttf-lyx/msbm10.ttf
-  Family = msbm10
-  FontName = msbm10
-  Encoding = Symbol
-  Location = Magyar Dutch Spanish Czech Russian English Catalan Slovak Italian Turkish Danish Slovenian Basque Portuguese German Polish Swedish Norwegian French Finnish Greek
-  Charset = font-specific
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape
-  Foundry = TeX
-  Priority = 20
-end
-begin /usr/share/fonts/truetype/ttf-lyx/wasy10.ttf
-  Family = wasy10
-  FontName = wasy10
-  Encoding = Symbol
-  Location = Magyar Dutch Spanish Czech Russian English Catalan Slovak Italian Turkish Danish Slovenian Basque Portuguese German Polish Swedish Norwegian French Finnish Greek
-  Charset = font-specific
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape
-  Foundry = TeX
-  Priority = 20
-end
-begin /usr/share/fonts/truetype/ttf-lyx/esint10.ttf
-  Family = esint10
-  FontName = esint10
-  Encoding = Unicode
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape = Normal Upright
-  Priority = 20
-end
-begin /usr/share/fonts/truetype/ttf-lyx/eufm10.ttf
-  Family = eufm10
-  FontName = eufm10
-  Encoding = Unicode
-  GeneralFamily = Symbol
-  Weight = Medium
-  Width = Variable
-  Shape = Normal Upright
-  Priority = 20
-end

-- 
LyX packaging