[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#649831: lmodern: diff for NMU version 2.004.1-3.1



tags 649831 + pending
thanks

Dear maintainer,

I've prepared an NMU for lmodern (versioned as 2.004.1-3.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u lmodern-2.004.1/debian/TODO lmodern-2.004.1/debian/TODO
--- lmodern-2.004.1/debian/TODO
+++ lmodern-2.004.1/debian/TODO
@@ -1,2 +1 @@
-* Register the OpenType fonts with defoma or Fontconfig?
 * Split the OpenType fonts (7 MB out of 44 MB) in an otf-lmodern package?
diff -u lmodern-2.004.1/debian/lmodern.preinst lmodern-2.004.1/debian/lmodern.preinst
--- lmodern-2.004.1/debian/lmodern.preinst
+++ lmodern-2.004.1/debian/lmodern.preinst
@@ -241,6 +241,18 @@
     ;;
 esac
 
+if dpkg --compare-versions "$2" lt 2.004.1-3.1; then
+	if [ -x "which defoma-font 2>/dev/null" ]; then
+		defoma-font purge /etc/defoma/hints/lmodern.hints
+	fi
+fi
+
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/lmodern.hints 2.004.1-3.1 -- "$@"
+fi
+
+
 #DEBHELPER#
 
 exit 0
diff -u lmodern-2.004.1/debian/changelog lmodern-2.004.1/debian/changelog
--- lmodern-2.004.1/debian/changelog
+++ lmodern-2.004.1/debian/changelog
@@ -1,3 +1,10 @@
+lmodern (2.004.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Transition away from defoma. Closes: #649831
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 17 Dec 2011 19:05:45 +0100
+
 lmodern (2.004.1-3) unstable; urgency=low
 
   * upload to unstable
diff -u lmodern-2.004.1/debian/lmodern.README.Debian lmodern-2.004.1/debian/lmodern.README.Debian
--- lmodern-2.004.1/debian/lmodern.README.Debian
+++ lmodern-2.004.1/debian/lmodern.README.Debian
@@ -8,23 +8,11 @@
   - the TeX typesetting system (TeX, LaTeX, pdfTeX, pdfLaTeX, xdvi,
     Dvips, etc.);
 
-  - defoma (this is a generic framework available in Debian whose
-    purpose is to help the packages that use fonts find the fonts
-    installed by the packages that provide fonts. defoma-registered
-    fonts are also classified by family, weight, etc. so that defoma can
-    perform font substitution whenever it is necessary); Fontconfig and
-    Ghostscript are two noteworthy applications that take advantage of
-    defoma-registered fonts in Debian;
+  - desktop environments;
 
   - the core X11 fonts system[1], for use by any X application.
 
 
-How to use the Latin Modern fonts with defoma-aware applications?
------------------------------------------------------------------
-
-You have nothing particular to do. This package already did the job.
-
-
 How to use the Latin Modern fonts with X11?
 -------------------------------------------
 
diff -u lmodern-2.004.1/debian/rules lmodern-2.004.1/debian/rules
--- lmodern-2.004.1/debian/rules
+++ lmodern-2.004.1/debian/rules
@@ -223,8 +223,6 @@
 
 	dh_link
 
-	dh_installdefoma
-
 	dh_installdocs debian/NEWS.Debian
 
 	$(INSTALL_FILE) debian/font-substitution/* \
diff -u lmodern-2.004.1/debian/control lmodern-2.004.1/debian/control
--- lmodern-2.004.1/debian/control
+++ lmodern-2.004.1/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Debian TeX maintainers <debian-tex-maint@lists.debian.org>
 Uploaders: Julian Gilbey <jdg@debian.org>, C.M. Connelly <cmc@debian.org>, Atsuhito KOHDA <kohda@debian.org>, Frank Küster <frank@debian.org>, Florent Rougon <frn@debian.org>, Norbert Preining <preining@debian.org>
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: defoma (>= 0.7.0), tex-common (>= 1.18)
+Build-Depends-Indep: tex-common (>= 1.18)
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-tex/lmodern/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-tex/lmodern/trunk/
@@ -13,7 +13,7 @@
 Package: lmodern
 Section: fonts
 Architecture: all
-Depends: defoma (>= 0.5.0), ${misc:Depends}
+Depends: ${misc:Depends}
 Conflicts: lm, lmodern-x11, context (<= 2008.10.31-1)
 Replaces: lm, lmodern-x11
 Description: scalable PostScript and OpenType fonts based on Computer Modern
diff -u lmodern-2.004.1/debian/lmodern.postrm lmodern-2.004.1/debian/lmodern.postrm
--- lmodern-2.004.1/debian/lmodern.postrm
+++ lmodern-2.004.1/debian/lmodern.postrm
@@ -55,6 +55,11 @@
         ;;
 esac
 
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/lmodern.hints 2.004.1-3.1 -- "$@"
+fi
+
+
 #DEBHELPER#
 
 exit 0
only in patch2:
unchanged:
--- lmodern-2.004.1.orig/debian/lmodern.postinst
+++ lmodern-2.004.1/debian/lmodern.postinst
@@ -0,0 +1,11 @@
+#! /bin/sh -e
+
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/lmodern.hints 2.004.1-3.1 -- "$@"
+fi
+
+
+#DEBHELPER#
+
+exit 0

Reply to: