On Wed, May 31, 2006, Mohammed Adnène Trojette wrote:
> It may be uploaded as part of the current 0-day NMU policy.
Attached is the last version of the patch for the NMUs I've uploaded.
I do not close #362404 as I did not use the dh_installxfonts thing.
I hope it helps.
--
adn
Mohammed Adnène Trojette
diff -u ibm-3270-3.3.4p6/debian/rules ibm-3270-3.3.4p6/debian/rules
--- ibm-3270-3.3.4p6/debian/rules
+++ ibm-3270-3.3.4p6/debian/rules
@@ -28,7 +28,7 @@
--infodir=\$${prefix}/share/info \
--sysconfdir=/etc \
--enable-app-defaults \
- --with-fontdir=/usr/X11R6/lib/X11/fonts/misc
+ --with-fontdir=/usr/share/fonts/X11/misc
touch $@
stamp-config-part-%:
diff -u ibm-3270-3.3.4p6/debian/control ibm-3270-3.3.4p6/debian/control
--- ibm-3270-3.3.4p6/debian/control
+++ ibm-3270-3.3.4p6/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Bastian Blank <[EMAIL PROTECTED]>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>> 4.0.0), libncurses5-dev, libssl-dev, libxaw7-dev,
libxt-dev, xutils
+Build-Depends: debhelper (>> 4.0.0), libncurses5-dev, libssl-dev, libxaw7-dev,
libxt-dev, xutils, xbitmaps
Package: x3270
Architecture: any
diff -u ibm-3270-3.3.4p6/debian/changelog ibm-3270-3.3.4p6/debian/changelog
--- ibm-3270-3.3.4p6/debian/changelog
+++ ibm-3270-3.3.4p6/debian/changelog
@@ -1,3 +1,25 @@
+ibm-3270 (3.3.4p6-3.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Put xfonts-x3270-misc's fonts in /usr/share/fonts/X11/misc/, not
+ /usr/share/fonts/X11/fonts/misc/ (References: #362404).
+ * Fix path to x3270.1x
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Sat, 3 Jun 2006 19:18:41
+0200
+
+ibm-3270 (3.3.4p6-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Change X11 paths in:
+ + configure
+ + debian/rules
+ + debian/xfonts-x3270-misc.install
+ + debian/xfonts-x3270-misc.postrm
+ + debian/xfonts-x3270-misc.postinst
+ * Add Build-Depends on xbitmap (Closes: #367830)
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Wed, 31 May 2006 12:23:59
+0200
+
ibm-3270 (3.3.4p6-3) unstable; urgency=low
* Use libxaw7.
diff -u ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.postrm
ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.postrm
--- ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.postrm
+++ ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.postrm
@@ -4,8 +4,8 @@
case "$1" in
purge|remove)
- if [ -d /usr/X11R6/lib/X11/fonts/misc ]; then
- ( cd /usr/X11R6/lib/X11/fonts/misc; mkfontdir )
+ if [ -d /usr/share/fonts/X11/misc ]; then
+ ( cd /usr/share/fonts/X11/misc; mkfontdir )
update-fonts-alias misc
fi
;;
diff -u ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.postinst
ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.postinst
--- ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.postinst
+++ ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.postinst
@@ -4,7 +4,7 @@
case "$1" in
configure)
- ( cd /usr/X11R6/lib/X11/fonts/misc; mkfontdir )
+ ( cd /usr/share/fonts/X11/misc; mkfontdir )
update-fonts-alias misc
;;
diff -u ibm-3270-3.3.4p6/debian/x3270.install
ibm-3270-3.3.4p6/debian/x3270.install
--- ibm-3270-3.3.4p6/debian/x3270.install
+++ ibm-3270-3.3.4p6/debian/x3270.install
@@ -2,2 +2,2 @@
-usr/X11R6/bin/x3270 usr/bin
-usr/X11R6/man/man1 usr/share/man
+usr/bin/x3270 usr/bin
+usr/share/man/man1/x3270.1x usr/share/man/man1
diff -u ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.install
ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.install
--- ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.install
+++ ibm-3270-3.3.4p6/debian/xfonts-x3270-misc.install
@@ -1 +1 @@
-usr/X11R6/lib/X11/fonts/misc/*.pcf.gz
+usr/share/fonts/X11/misc/*.pcf.gz
