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

X Strike Force X.Org X11 SVN commit: r1023 - branches/modular/app/xterm/debian



Author: dnusinow
Date: 2006-01-06 00:24:28 -0500 (Fri, 06 Jan 2006)
New Revision: 1023

Modified:
   branches/modular/app/xterm/debian/changelog
   branches/modular/app/xterm/debian/rules
   branches/modular/app/xterm/debian/xterm.dirs
Log:
* Clean up xterm.dirs a bit
* Explicitly call --with-app-defaults (set to /etc/X11/app-defaults) during
  configure


Modified: branches/modular/app/xterm/debian/changelog
===================================================================
--- branches/modular/app/xterm/debian/changelog	2006-01-06 04:21:34 UTC (rev 1022)
+++ branches/modular/app/xterm/debian/changelog	2006-01-06 05:24:28 UTC (rev 1023)
@@ -42,8 +42,11 @@
     - fix memory reallocation for the "UTF-8" menu entry when xterm is started
       using the +u8 option
   * Debian patches 900 and 901 resynced.
+  * Clean up xterm.dirs a bit
+  * Explicitly call --with-app-defaults (set to /etc/X11/app-defaults) during
+    configure
 
- -- David Nusinow <dnusinow@debian.org>  Thu,  5 Jan 2006 23:19:35 -0500
+ -- David Nusinow <dnusinow@debian.org>  Fri,  6 Jan 2006 00:23:38 -0500
 
 xterm (204-0pre1) experimental; urgency=low
 

Modified: branches/modular/app/xterm/debian/rules
===================================================================
--- branches/modular/app/xterm/debian/rules	2006-01-06 04:21:34 UTC (rev 1022)
+++ branches/modular/app/xterm/debian/rules	2006-01-06 05:24:28 UTC (rev 1023)
@@ -85,7 +85,7 @@
 configure: $(STAMP_DIR)/patch $(STAMP_DIR)/configure
 $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
 	dh_testdir
-	./configure --enable-logging --enable-wide-chars --enable-256-color --prefix=/usr --exec-prefix=/usr --mandir=/usr/share/man
+	./configure --enable-logging --enable-wide-chars --enable-256-color --prefix=/usr --exec-prefix=/usr --mandir=/usr/share/man --with-app-defaults=/etc/X11/app-defaults
 	touch $@
 
 
@@ -120,11 +120,12 @@
 	## Install koi8rxterm command, manual page, and app-defaults file.
 	install -m 755 debian/local/koi8rxterm $(DEBINSTALLTREE)/usr/bin
 	install -m 755 debian/local/koi8rxterm.1x $(DEBINSTALLTREE)/usr/share/man/man1
+	install -d $(DEBINSTALLTREE)/etc/X11/app-defaults
 	install -m 644 debian/local/KOI8RXTerm $(DEBINSTALLTREE)/etc/X11/app-defaults
 	## Install manual page for uxterm.
 	install -m 644 debian/local/uxterm.1x $(DEBINSTALLTREE)/usr/share/man/man1
 	## Install terminfo and termcap precompiled definitions.
-	install -d $(DEBINSTALLTREE)/usr/lib/
+	install -d $(DEBINSTALLTREE)/usr/lib
 	install -m 644 termcap  $(DEBINSTALLTREE)/usr/lib/xterm.termcap
 	install -m 644 terminfo $(DEBINSTALLTREE)/usr/lib/xterm.terminfo
 	dh_installdocs

Modified: branches/modular/app/xterm/debian/xterm.dirs
===================================================================
--- branches/modular/app/xterm/debian/xterm.dirs	2006-01-06 04:21:34 UTC (rev 1022)
+++ branches/modular/app/xterm/debian/xterm.dirs	2006-01-06 05:24:28 UTC (rev 1023)
@@ -1,4 +1,4 @@
-/usr/bin
-/usr/share/man/man1
-/etc/X11/app-defaults
-/usr/share/lintian/overrides
+usr/bin
+usr/share/man/man1
+etc/X11/app-defaults
+usr/share/lintian/overrides



Reply to: