--- aterm-1.0.1.orig/debian/aterm-ml.docs +++ aterm-1.0.1/debian/aterm-ml.docs @@ -0,0 +1,4 @@ +doc/README.greek +doc/README.thai +doc/README.Unix98PTY +doc/FAQ --- aterm-1.0.1.orig/debian/aterm.manpages +++ aterm-1.0.1/debian/aterm.manpages @@ -0,0 +1 @@ +doc/aterm.1 --- aterm-1.0.1.orig/debian/aterm-ml.links +++ aterm-1.0.1/debian/aterm-ml.links @@ -0,0 +1,4 @@ +usr/share/man/man1/aterm-ml.1.gz usr/share/man/man1/katerm.1.gz +usr/share/man/man1/aterm-ml.1.gz usr/share/man/man1/caterm.1.gz +usr/share/man/man1/aterm-ml.1.gz usr/share/man/man1/taterm.1.gz +usr/share/man/man1/aterm-ml.1.gz usr/share/man/man1/gaterm.1.gz --- aterm-1.0.1.orig/debian/aterm.menu +++ aterm-1.0.1/debian/aterm.menu @@ -0,0 +1,2 @@ +?package(aterm):needs="X11" section="Applications/Terminal Emulators"\ + title="Aterm" command="/usr/bin/aterm" --- aterm-1.0.1.orig/debian/changelog +++ aterm-1.0.1/debian/changelog @@ -0,0 +1,440 @@ +aterm (1.0.1-7) unstable; urgency=low + + * QA upload. + * Add 31_dpy.dpatch to fix problems caused by libafterimage's API & ABI + change (closes: #537777). + * Made libafterimage-dev build dependency versioned. + + -- Robert Luberda Mon, 20 Jul 2009 23:18:25 +0200 + +aterm (1.0.1-6) unstable; urgency=low + + * QA upload. + * Revert previous fix to maintainer scripts, causes regression. + * Bump Standards Version 3.8.1. (No changes needed). + + -- Barry deFreese Sun, 05 Apr 2009 10:07:48 -0400 + +aterm (1.0.1-5) unstable; urgency=low + + * QA upload. + * Fix update alternatives in maintainer scripts. (Closes: #518962). + + Thanks to Nicolas Valcarcel for the patch. + * Bump Standards Version to 3.8.0. (No changes needed). + + -- Barry deFreese Tue, 10 Mar 2009 11:10:13 -0400 + +aterm (1.0.1-4) unstable; urgency=low + + * QA upload. + * Set maintainer to QA group. + + -- Nico Golde Tue, 06 May 2008 19:51:14 +0200 + +aterm (1.0.1-3) unstable; urgency=low + + * Fix aterm losing copy&paste buffer after window resize, + thanks Jason Woofenden (Closes: #456765). + * Switched from Homepage tag to new Homepage control field. + * Bumped Standards version, no changes needed. + + -- Nico Golde Mon, 17 Dec 2007 19:55:30 +0100 + +aterm (1.0.1-2) unstable; urgency=medium + + * Included 29_fix_deadkeys.dpatch to fix broken deadkeys + input (Closes: #443811) + * Bumped urgency since the deadkeys bug breaks a lot of languages. + + -- Nico Golde Wed, 26 Sep 2007 15:07:37 +0200 + +aterm (1.0.1-1) unstable; urgency=low + + * New upstream release (Closes: #442033). + * Fixed broken watch file. + * Remove Suggests: xfonts-cjk (xfonts-cjk was merged into xfonts-base). + * Changed menu section to Applications/Terminal Emulators because + of new menu structure. + * Reworked 20_cutToBeginningOfLine 27_xlocale_test.dpatch, + 25_superflous_linking.dpatch and + 22_eterm_transparency patches to apply with new version. + * Removed 23_remove_debugging.dpatch and + 24_background_updates.dpatch, included upstream. + * Fixed lintian's debian-rules-ignores-make-clean-error. + + -- Nico Golde Sat, 22 Sep 2007 09:59:57 +0200 + +aterm (1.0.0-5) unstable; urgency=low + + * New Debian maintainer (Closes: #422358). + * Fixed copyright file. + * Added homepage tag. + * Bumped compat version. + * Updated watch file to version 3. + * Added Build-Dependency on librsvg2-dev (Closes: #421983). + + -- Nico Golde Thu, 10 May 2007 12:21:44 +0200 + +aterm (1.0.0-4) unstable; urgency=low + + * Patch 28_manpage_bl: Fix the -bl option in the manpage. Thanks to Maru + Dubshinki for the report (closes: #387965). + * debian/aterm{,-ml}.postinst: Fix a potentially buggy postinst. Thanks + to Sam Hocevar for finding this (closes: #390542). + + -- Göran Weinholt Fri, 6 Oct 2006 15:27:52 +0200 + +aterm (1.0.0-3) unstable; urgency=low + + * debian/copyright: Update upstream location. + * Install the same documentation in aterm-ml as in aterm (closes: + #315725). + * Add libafterimage-dev to the build-dependencies and enable pixmap + support (closes: #346309). + * Updated to Standards-Version 3.7.2 (no changes). + + -- Göran Weinholt Thu, 24 Aug 2006 00:07:59 +0200 + +aterm (1.0.0-2) unstable; urgency=low + + * New patch, 27_xlocale_test: Don't link with libXmu when testing for + Xlocale. This fixes dead keys and compose (closes: #346523). + * debian/control: Add libafterimage-dev to Build-Conflicts since it + can break the build. It will soon be moved to Build-Depends, though. + + -- Göran Weinholt Tue, 7 Feb 2006 19:14:08 +0100 + +aterm (1.0.0-1) unstable; urgency=low + + * New upstream release (closes: #335157). + + Fixes "resizing of windows when showing contents is slow" + (closes: #236166). + * Patches included upstream: 01_linuxkeys, 02_fontchange_removal, + 03_resize_window_always, 04_shift_insert_outside_window, + 06_mouse_wheel_codes, 07_scrollKey_resource, + 08_manpage_resource_path, 09_specific_resources_before_global, + 11_tt_winsize_fd, 12_child_fd_closed, 13_fix_warnings, + 14_background_crash, 15_scrollttyoutput, 16_uninitialized_keysym, + 18_untbl_manpage, 19_manpage_section. + * Extracted the part of 17_color_sequences that isn't applied upstream + yet and made it into 22_eterm_transparency. + * Update 10_warn_faulty_boolean and 20_cutToBeginningOfLine. + * New patch 24_background_updates: when changing workspaces, only + update the background image if it is necessary. + * New patch, 25_superflous_linking: don't link against libSM, libICE, + libXext. + * debian/control: + + Update to Standards-Version: 3.6.2 (no changes). + + Remove superflous build-dependencies: libice-dev, libsm-dev, + libxpm-dev. + * New patch, 26_manpage_paths: fix file paths in the FILES section of + aterm(1). Thanks to Sean Finney for reporting this (closes: #338214). + + -- Göran Weinholt Tue, 3 Jan 2006 07:16:46 +0100 + +aterm (0.4.2-11) unstable; urgency=low + + * debian/control: + + Put all Build-Depends on one line. + + Require dpatch 2.0.9 or newer. + * Patch #18, new: Undo the effects of tbl on aterm.1. + (Closes: #245427, #297161). + * Patch #19, new: The manpage title and section were reversed. + * Patch #20, new: Add support for an XTerm-like cutToBeginningOfLine + resource, allowing for configuration of what's selected on triple + click. Thanks to George Cristian Birzan for + this patch. (Closes: #261935). + * Patch #21, new: changed manpage to mention xrdb instead of + .Xdefaults etc. (Closes: #250484). + + -- Göran Weinholt Tue, 29 Mar 2005 16:09:35 +0200 + +aterm (0.4.2-10) unstable; urgency=low + + * Patch #16, new: Finally tracked down the real cause of #96755. Turns + out it was an uninitialized variable. + * Patch #17, new: Adds support for some xterm control sequences. This + includes the sequences that redefine colors, change the cursor, + pointer, bold, and underline colors, and change the tint. + * debian/control: + + Reindented the second paragraph of aterm-ml's description. + + Updated Maintainer: with my @debian.org address. + + Corrected build dependencies for the new X library arrangement. + + Added a build dependency on debhelper. + * debian/rules: + + Don't install the outdated files BUGS and TODO. + + Re-debhelperized. (Hi Alfie!) + + Reenabled -O2, thanks to patch #16. + + Build the *aterm's in their own directories. + * debian/copyright: Added the GPL blurb and detypoed upstream's name. + * debian/changelog: Enhanced with UTF-8. + * debian/README.Debian.thai: Removed in favor of upstream's README.thai. + * debian/caterm: Removed since it is obsolete. + * debian/katerm.1: Renamed to aterm-ml.1 and slightly reformatted. + * Rearranged debian/ to make it work with debhelper. + + -- Göran Weinholt Fri, 19 Mar 2004 07:18:13 +0100 + +aterm (0.4.2-9) unstable; urgency=low + + * Patch #12, updated: Exit with success instead of failure, because + this new behaviour isn't really a failure. Also, don't call + clean_exit() if it will be called at exit anyway. (Closes: #216906) + * Patch #13, new: Fix all compiler warnings. + * Patch #14, new: Fix a crash that happens if the root pixmap is + invalid, which is the case sometimes when changing backgrounds in + Enlightenment. + * Patch #15, new: Backport a fix from rxvt to invert the behaviour of + the scrollTtyOutput resource. (Closes: #136679) + + -- Göran Weinholt Sun, 2 Nov 2003 14:44:59 +0100 + +aterm (0.4.2-8) unstable; urgency=low + + * Begin using dpatch. All the old patches have been organized in + debian/patches. + * debian/control: Add dpatch to the build dependencies. + * debian/rules: Add the necessary dpatch modifications. + * Patch #05, disabled: the paste problem with licq-qt and aterm seems + to have been resolved in Qt, so I'm disabling this patch. It may + have caused other problems. + * Patch #11, new: Resize the child's pty before we fork(), instead of + resizing stdin after we've fork()'ed. Fixes a race condition + especially annoying to Ion users. (Closes: #211455) + * Patch #12, new: Fix a race condition that would often make aterm + spin before exiting. This became very visible on Linux 2.6, where it + could spin for seconds. + + -- Göran Weinholt Sat, 4 Oct 2003 18:27:00 +0200 + +aterm (0.4.2-7) unstable; urgency=low + + * src/screen.c: Don't call XmbTextListToTextProperty() in + selection_send(). This allows non-ASCII text to be cut and pasted in + non-latin1 locales again. Thanks to Bartosz FeÅ„ski for + reporting this issue. (Closes: #208221) + * src/command.c: Reverted my fix for #169917, since it caused slowness + in gnome. (Closes: #207164) + * debian/{changelog,control}: These files are now valid UTF-8. + (Closes: #206827) + * debian/control: Bumped Standards-Version to 3.6.1. + + -- Göran Weinholt Wed, 10 Sep 2003 15:12:22 +0200 + +aterm (0.4.2-6) unstable; urgency=low + + * New maintainer, thanks Alfie! + * src/command.c: + - Implemented proper mouse wheel reporting for mouse aware applications. + The control codes are the same that xterm use. + - Comment out a test in the MapNotify handler. Makes transparency work + when aterm is started on another work space in wmaker. (Closes: #169917) + * src/screen.c: Take the latest selection_send() from rxvt. This makes + pasting to licq-qt work. (Closes: #205040) + * src/xdefaults.c: + - Renamed the scrollTtyKeypress resource to scrollKey, to be compatible + with xterm. Updated the documentation, which previously referred to + scrollKeypress, to reflect the change. (Closes: #136677) + - Warn if a boolean value can't be parsed as such. (Closes: #82495) + * debian/rules: Configure with --disable-memset, so that the system's + memset() will be used instead of the one in src/rmemset.c. + * debian/control: + - Removed the autoconf and automake build-deps, since they were not needed. + - Updated to Standards-Version 3.6.0, no changes needed. + + -- Göran Weinholt Tue, 12 Aug 2003 09:56:23 +0200 + +aterm (0.4.2-5) unstable; urgency=low + + * The "happy 30th birthday, Alfie" release. + * Updated to policy 3.5.7, no changes needed. + * Fixed documentation wrt/ compile settings (closes: #126878) + * All the following nice birthday present patches were sent in by Göran + Weinholt (many thanks!): + - make shift insert work if mouse isn't in window, too (closes: #77338) + - don't let aterm forget to redraw every now and then (closes: #126877) + - commented out font_change_count lines which resolves the background grab + problem on font change (closes: #150801) + + -- Gerfried Fuchs Tue, 06 May 2003 16:43:29 +0200 + +aterm (0.4.2-4) unstable; urgency=low + + * New maintainer. Thank you Jordi for the good work so far! + * Added watch file. + * Reworked debian/rules to be able to live without debhelper: + - Don't install aterm.html anymore, it's just a copy of the manpage. + - Don't do a $(MAKE) install anymore, we replace everything anyway. + - gzip -9 atermRef.html also, way too large and most browsers support + gnuzipped files anyway. + * debian/control: + - Updated to policy 3.5.7. + - Removed Build-Depends: debhelper + - Stated in the aterm-ml description that only Chinese Big5 is useable. + + -- Gerfried Fuchs Thu, 19 Sep 2002 13:00:01 +0200 + +aterm (0.4.2-3) unstable; urgency=low + + * src/xdefaults.c: applied patch from Geoff Wing which binds + specific X resources before global resources (closes: #105656). + * debian/{aterm-ml,}docs: removed README.configure. + * debian/changelog: removed emacs cruft. + * debian/rules: removed dh_make cruft. + + -- Jordi Mallach Fri, 8 Feb 2002 22:44:33 +0100 + +aterm (0.4.2-2) unstable; urgency=low + + * debian/rules: delete crufty "scripts/random-colors" in the + clean target. + * src/command.c: remove translation of Home/End patch. + * src/feature.h: comment out LINUX_KEYS, this fixes Home/End for + TERM=rxvt, which is now the default for aterm (closes: #112403). + * Restoring of screen after exiting ncurses programs works ok with + TERM=rxvt (closes: #110914). + + -- Jordi Mallach Wed, 19 Sep 2001 16:29:01 +0200 + +aterm (0.4.2-1) unstable; urgency=low + + * New upstream release. + * This version includes all our patches except the Home and End + translations. + * debian/docs: README.Unix98PTY moved to docs/. + + -- Jordi Mallach Thu, 6 Sep 2001 19:22:33 +0200 + +aterm (0.4.0-9) unstable; urgency=medium + + * src/command.c: fixed (hopefully) pseudo-terminal detection, using + getpt() in glibc systems. This should make aterm work on GNU/HURD; + patch from Gergely Nagy (closes: #111221). + As a side effect, it also fixes GNU/Linux systems without + CONFIG_UNIX98_PTYS enabled in the kernel! (closes: #75080) + Ok, Steve Kowalik, owner of the Weird Kernel, helped with + testing too :) + + -- Jordi Mallach Tue, 4 Sep 2001 18:50:17 +0200 + +aterm (0.4.0-8) unstable; urgency=low + + * src/command: applied patch from Eric Benoit , which + adds the "CSI 21 t" control sequence, for title handling. + * debian/rules: configure aterm with --enable-background-image to + enable -pixmap, which should be on by default, but... (closes: #105660). + You can now chose a pixmap to set as an aterm background. + + -- Jordi Mallach Wed, 22 Aug 2001 17:26:31 +0200 + +aterm (0.4.0-7) unstable; urgency=HIGH + + * src/command.c: fixed a buffer overflow, from the rxvt advisory + in BugTraq. I wasn't able to make aterm segfault, but just in + case... + * debian/{,aterm-ml.}postinst: raise the priority of aterm in + the x-terminal-emulator alternative from 10 to 20, as the new + policy mandates. + * debian/control: Standards-Version: 3.5.5.0. + + -- Jordi Mallach Sat, 16 Jun 2001 23:30:14 +0200 + +aterm (0.4.0-6) unstable; urgency=low + + * Ok, since 0.4.0-1, if you backspaced and then typed accents + (and maybe other chars), aterm would do more backspacing. + Finally found that removing gcc optimization (-O2) fixes this. + Any idea of how should I debug that welcome (closes: #96755). + + -- Jordi Mallach Wed, 17 May 2001 17:20:36 +0200 + +aterm (0.4.0-5) unstable; urgency=low + + * debian/rules: DH_COMPAT=3, removed dh_testversion calls. + * debian/control: + + Standards-Version: 3.5.4.0 (no changes) + + removed libtools from Build-Depends, upped the debhelper version + * src/commands.c: fixed Home and End translations, they should work + properly now. Thanks to Edward Bloch for the hint which helped solving + this. + + -- Jordi Mallach Wed, 3 May 2001 15:49:20 +0200 + +aterm (0.4.0-4) unstable; urgency=low + + * Applied a patch from Chanop Silpa-Anan and + Teepanis Chachiyo which adds Thai + support in Aterm. A new binary, taterm, is included in aterm-ml. + * debian/control: + + Standards-Version: 3.5.2.0 + + add a version to debhelper's Build-Depend. + + uncut the Suggests line so some scripts don't break when parsing it. + * debian/links: add a link from aterm.1 to aterm-xterm.1. + * debian/*.docs: remove INSTALL. + + -- Jordi Mallach Thu, 8 Mar 2001 14:08:38 +0100 + +aterm (0.4.0-3) unstable; urgency=low + + * suidmanager -> dpkg-statoverride transition: + + debian/control: Conflicts: suidmanager (<< 0.50) + + debian/{postinst's,prerm's}: remove suidmanager cruft. + + debian/rules: sgid utmp binaries manually. + + -- Jordi Mallach Thu, 11 Jan 2001 00:24:39 +0100 + +aterm (0.4.0-2) unstable; urgency=low + + * debian/rules: + + configure with --enable-fading per user request. Thanks Kevin! + (closes: #77644) + + replaced `pwd` shell calls with GNU make's $(CURDIR). + + DH_COMPAT=2, install aterm in debian/aterm. + * debian/control: + + Standards-Version: 3.2.1.0. + + no longer Suggests: menu. + + updated Build-Depends for X4. + + -- Jordi Mallach Mon, 27 Nov 2000 20:49:02 +0100 + +aterm (0.4.0-1) unstable; urgency=low + + * Introduces aterm-ml, containing binaries for Kanji, Chinese (Big5) + and Greek support. Brian Mays did nearly all the work in his rxvt-ml + package (closes: #43975, reported long before aterm was in Debian). + * debian/control: + + added Build-Depends, Suggests: menu and Provides: x-terminal-emulator. + + aterm-ml: added new package entry. + * debian/docs: added four missing documents. + * debian/{postinst,prerm}: + + add alternative for x-terminal-emulator and aterm. The new normal + binary is "aterm-xterm". + + make the binaries setuid utmp. + * Apply patch from Chris Leishman for + utmp/wtmp enabled builds. Thank you! (closes: #70476). + * Moved the binaries and manpages out of /usr/X11R6. + * debian/menu: new -ml entries, updates for new paths. + * debian/rules: + + install doc/aterm.pretbl as aterm.1. + + configure with --enable-xgetdefault, trying to fix #70481. + + support for DEB_BUILD_OPTIONS debug and nostrip added. + * debian/katerm.1: install manpage by Ryuichi Arafune. + * debian/copyright: updated download information, added more precise + copyright info. + + -- Jordi Mallach Tue, 11 Jul 2000 11:26:12 +0200 + +aterm (0.4.0-0) unstable; urgency=low + + * New upstream release. + * New Maintainer. Thanks for the first upload, Shaleh. + * Compiled without utmp support until some problems are fixed upstream. + * aterm-ml will be added in the next revision, hopefully. + + -- Jordi Mallach Mon, 3 Jul 2000 14:35:48 +0200 + +aterm (0.3.6-0) unstable; urgency=low + + * Initial Release. + + -- Sean 'Shaleh' Perry Tue, 30 May 2000 15:07:30 -0700 --- aterm-1.0.1.orig/debian/aterm-ml.prerm +++ aterm-1.0.1/debian/aterm-ml.prerm @@ -0,0 +1,18 @@ +#!/bin/sh -e +# prerm for aterm-ml +# Script taken from Brian May's rxvt package + +if [ "$1" = remove ]; then + update-alternatives --remove aterm /usr/bin/katerm + update-alternatives --remove aterm /usr/bin/caterm + update-alternatives --remove aterm /usr/bin/gaterm + update-alternatives --remove aterm /usr/bin/taterm + update-alternatives --remove x-terminal-emulator /usr/bin/katerm + update-alternatives --remove x-terminal-emulator /usr/bin/caterm + update-alternatives --remove x-terminal-emulator /usr/bin/gaterm + update-alternatives --remove x-terminal-emulator /usr/bin/taterm +fi + +#DEBHELPER# + +exit 0 --- aterm-1.0.1.orig/debian/aterm-ml.install +++ aterm-1.0.1/debian/aterm-ml.install @@ -0,0 +1,4 @@ +build-katerm/src/katerm usr/bin +build-caterm/src/caterm usr/bin +build-gaterm/src/gaterm usr/bin +build-taterm/src/taterm usr/bin --- aterm-1.0.1.orig/debian/aterm-ml.overrides +++ aterm-1.0.1/debian/aterm-ml.overrides @@ -0,0 +1,4 @@ +aterm-ml: setgid-binary usr/bin/katerm 2755 root/utmp +aterm-ml: setgid-binary usr/bin/caterm 2755 root/utmp +aterm-ml: setgid-binary usr/bin/gaterm 2755 root/utmp +aterm-ml: setgid-binary usr/bin/taterm 2755 root/utmp --- aterm-1.0.1.orig/debian/aterm.docs +++ aterm-1.0.1/debian/aterm.docs @@ -0,0 +1,2 @@ +doc/README.Unix98PTY +doc/FAQ --- aterm-1.0.1.orig/debian/control +++ aterm-1.0.1/debian/control @@ -0,0 +1,43 @@ +Source: aterm +Section: x11 +Priority: optional +Maintainer: Debian QA Group +Build-Depends: dpatch (>= 2.0.9), debhelper (>= 5), libx11-dev, libxt-dev, libafterimage-dev (>= 2.2.9), librsvg2-dev +Standards-Version: 3.8.1 +Homepage: http://aterm.sf.net + +Package: aterm +Architecture: any +Depends: ${shlibs:Depends} +Provides: x-terminal-emulator +Conflicts: suidmanager (<< 0.50) +Description: Afterstep XVT - a VT102 emulator for the X window system + Aterm is a colour vt102 terminal emulator, based on rxvt 2.4.8 with + some additions of fast transparency, intended as an xterm replacement + for users who do not require features such as Tektronix 4014 + emulation and toolkit-style configurability. As a result, aterm uses + much less swap space -- a significant advantage on a machine serving + many X sessions. It was created with AfterStep Window Manager users + in mind, but is not tied to any libraries, and can be used anywhere. + +Package: aterm-ml +Architecture: any +Depends: ${shlibs:Depends} +Recommends: aterm +Suggests: xfonts-intl-european, xfonts-intl-chinese (>= 1.1-4) | xfonts-cmex-big5p +Provides: x-terminal-emulator +Conflicts: suidmanager (<< 0.50) +Description: Afterstep XVT - a VT102 emulator for the X window system + Aterm is a colour vt102 terminal emulator, based on rxvt 2.4.8 with + some additions of fast transparency, intended as an xterm replacement + for users who do not require features such as Tektronix 4014 + emulation and toolkit-style configurability. As a result, aterm uses + much less swap space -- a significant advantage on a machine serving + many X sessions. It was created with AfterStep Window Manager users + in mind, but is not tied to any libraries, and can be used anywhere. + . + This package contains four aterm binaries: katerm and caterm, for + Japanese and Chinese (Big5 only) characters support; gaterm, which + supports ELOT-928 (ISO-8859-7 standard) and IBM-437 keyboard + translations for Greek character entry, and taterm for Thai characters + support. --- aterm-1.0.1.orig/debian/aterm-ml.postinst +++ aterm-1.0.1/debian/aterm-ml.postinst @@ -0,0 +1,34 @@ +#!/bin/sh -e +# postinst file for aterm-ml + +if [ "$1" = "configure" ]; then + # Add an alternative for aterm + update-alternatives --install /usr/bin/aterm aterm \ + /usr/bin/katerm 25 + update-alternatives --install /usr/bin/aterm aterm \ + /usr/bin/caterm 20 + update-alternatives --install /usr/bin/aterm aterm \ + /usr/bin/gaterm 20 + update-alternatives --install /usr/bin/aterm aterm \ + /usr/bin/taterm 20 + + # Add an alternative for x-terminal-emulator + update-alternatives --install /usr/bin/x-terminal-emulator \ + x-terminal-emulator /usr/bin/katerm 20 \ + --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ + x-terminal-emulator.1.gz /usr/share/man/man1/katerm.1.gz + update-alternatives --install /usr/bin/x-terminal-emulator \ + x-terminal-emulator /usr/bin/caterm 20 \ + --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ + x-terminal-emulator.1.gz /usr/share/man/man1/katerm.1.gz + update-alternatives --install /usr/bin/x-terminal-emulator \ + x-terminal-emulator /usr/bin/gaterm 20 \ + --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ + x-terminal-emulator.1.gz /usr/share/man/man1/katerm.1.gz + update-alternatives --install /usr/bin/x-terminal-emulator \ + x-terminal-emulator /usr/bin/taterm 20 \ + --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ + x-terminal-emulator.1.gz /usr/share/man/man1/katerm.1.gz +fi + +#DEBHELPER# --- aterm-1.0.1.orig/debian/rules +++ aterm-1.0.1/debian/rules @@ -0,0 +1,76 @@ +#!/usr/bin/make -f +# rules file for aterm + +# Include dpatch stuff. +include /usr/share/dpatch/dpatch.make +PACKAGE := aterm + +COMMON_OPTIONS := --prefix=/usr --mandir=\$${prefix}/share/man --enable-utmp \ + --enable-wtmp --enable-xgetdefault --enable-fading \ + --enable-background-image --disable-memset + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp scripts/random_colors doc/aterm-ml.1 + rm -rf build-aterm build-katerm build-caterm build-gaterm build-taterm + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + +build: patch-stamp build-stamp +build-stamp: + dh_testdir + cp doc/aterm.1 doc/aterm-ml.1 + mkdir build-aterm build-katerm build-caterm build-gaterm build-taterm + cd build-aterm && ../configure $(COMMON_OPTIONS) CFLAGS="$(CFLAGS)" && \ + $(MAKE) && mv src/aterm src/aterm-xterm + cd build-katerm && ../configure $(COMMON_OPTIONS) CFLAGS="$(CFLAGS)" --enable-kanji && \ + $(MAKE) && mv src/aterm src/katerm + cd build-caterm && ../configure $(COMMON_OPTIONS) CFLAGS="$(CFLAGS)" --enable-big5 && \ + $(MAKE) && mv src/aterm src/caterm + cd build-gaterm && ../configure $(COMMON_OPTIONS) CFLAGS="$(CFLAGS)" --enable-greek && \ + $(MAKE) && mv src/aterm src/gaterm + cd build-taterm && ../configure $(COMMON_OPTIONS) CFLAGS="$(CFLAGS)" --enable-thai && \ + $(MAKE) && mv src/aterm src/taterm + touch build-stamp + +install: build + dh_testdir + dh_testroot + dh_clean + dh_install + +binary: binary-indep binary-arch + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdirs -A usr/share/lintian/overrides + cp debian/aterm.overrides debian/aterm/usr/share/lintian/overrides/aterm + cp debian/aterm-ml.overrides debian/aterm-ml/usr/share/lintian/overrides/aterm-ml + dh_installmenu + dh_installman + dh_installdocs + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + chown root:utmp debian/aterm/usr/bin/aterm-xterm debian/aterm-ml/usr/bin/*aterm + chmod g+s debian/aterm/usr/bin/aterm-xterm debian/aterm-ml/usr/bin/*aterm + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +.PHONY: clean build install binary-indep binary-arch binary --- aterm-1.0.1.orig/debian/aterm.postinst +++ aterm-1.0.1/debian/aterm.postinst @@ -0,0 +1,15 @@ +#!/bin/sh -e +# postinst for aterm + +if [ "$1" = "configure" ]; then + # Add an alternative for aterm + update-alternatives --install /usr/bin/aterm aterm \ + /usr/bin/aterm-xterm 30 + # Add an alternative for x-terminal-emulator + update-alternatives --install /usr/bin/x-terminal-emulator \ + x-terminal-emulator /usr/bin/aterm-xterm 20 \ + --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ + x-terminal-emulator.1.gz /usr/share/man/man1/aterm.1.gz +fi + +#DEBHELPER# --- aterm-1.0.1.orig/debian/compat +++ aterm-1.0.1/debian/compat @@ -0,0 +1 @@ +5 --- aterm-1.0.1.orig/debian/aterm.links +++ aterm-1.0.1/debian/aterm.links @@ -0,0 +1 @@ +usr/share/man/man1/aterm.1.gz usr/share/man/man1/aterm-xterm.1.gz --- aterm-1.0.1.orig/debian/copyright +++ aterm-1.0.1/debian/copyright @@ -0,0 +1,56 @@ +This package was debianized by Sean 'Shaleh' Perry on +Tue, 30 May 2000 15:07:30 -0700. + +Jordi Mallach took over the package on +Sat, 22 Jun 2000 07:34:53 +0200. + +Then Gerfried Fuchs took over around +Thu, 19 Sep 2002 13:00:01 +0200. + +Göran Weinholt took over around +Tue, 12 Aug 2003 09:56:23 +0200. + +Nico Golde is the current maintainer. + +It was downloaded from ftp://ftp.afterstep.org/apps/aterm/ + +Upstream Author: Sasha Vasko + +Copyright: + +This software is copyright (C) 2004-2007 by Sasha Vasko. + + Some files have different authors: + grkelot.c: Copyright (C) 1997,1998 Oezger Kesim , + Copyright (C) 1994,1995 Angelo Haritsis + main.c: Copyright (C) 1997,1998 Oezguer Kesim + menubar.c: Copyright (C) 1997,1998 mj olesen + netdisp.c, graphics.c,misc.c, command.c: + Copyright (C) 1997,1998 Oezguer Kesim + pixmap.c: Copyright (C) 1999 Ethan Fischer , + Copyright (C) 1999 Sasha Vasko + rmemset.c: Copyright (C) 1997,1998 Geoff Wing + screen.c: Copyright (C) 2001 (cursor color) Jordan DeLong , + Copyright (C) 2000 Sasha Vasko , + Copyright (C) 1997,1998 Geoff Wing + scrollbar2.c: Copyright (C) 1998 Alfredo K. Kojima + thai.c: Copyright (C) 2000,2001 Teepanis Chachiyo + utmp.c: Copyright (C) 1997,1998 Geoff Wing + xdefaults.c: Copyright (C) 1997,1998 mj olesen + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL file. --- aterm-1.0.1.orig/debian/aterm.overrides +++ aterm-1.0.1/debian/aterm.overrides @@ -0,0 +1,2 @@ +aterm: setgid-binary usr/bin/aterm-xterm 2755 root/utmp +aterm: menu-command-not-in-package /usr/share/menu/aterm:2 /usr/bin/aterm --- aterm-1.0.1.orig/debian/aterm-ml.manpages +++ aterm-1.0.1/debian/aterm-ml.manpages @@ -0,0 +1 @@ +doc/aterm-ml.1 --- aterm-1.0.1.orig/debian/aterm.install +++ aterm-1.0.1/debian/aterm.install @@ -0,0 +1 @@ +build-aterm/src/aterm-xterm usr/bin --- aterm-1.0.1.orig/debian/watch +++ aterm-1.0.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +# Site/Directory Pattern Version Script +ftp://ftp.afterstep.org/apps/aterm/aterm-([\d\.]*)\.tar\.gz debian uupdate --- aterm-1.0.1.orig/debian/aterm.prerm +++ aterm-1.0.1/debian/aterm.prerm @@ -0,0 +1,11 @@ +#!/bin/sh -e +# prerm for aterm + +if [ "$1" = remove ]; then + update-alternatives --remove aterm /usr/bin/aterm-xterm + update-alternatives --remove x-terminal-emulator /usr/bin/aterm-xterm +fi + +#DEBHELPER# + +exit 0 --- aterm-1.0.1.orig/debian/aterm-ml.menu +++ aterm-1.0.1/debian/aterm-ml.menu @@ -0,0 +1,12 @@ +?package(aterm-ml):needs="X11" section="Applications/Terminal Emulators" \ + longtitle="KAterm: terminal emulator for X with Japanese (Kanji) support" \ + title="KAterm" command="/usr/bin/katerm" +?package(aterm-ml):needs="X11" section="Applications/Terminal Emulators" \ + longtitle="CAterm: terminal emulator for X with Chinese (Big5) support" \ + title="CAterm (Big5)" command="/usr/bin/caterm" +?package(aterm-ml):needs="X11" section="Applications/Terminal Emulators" \ + longtitle="GAterm: terminal emulator for X with Greek support" \ + title="GAterm" command="/usr/bin/gaterm" +?package(aterm-ml):needs="X11" section="Applications/Terminal Emulators" \ + longtitle="TAterm: terminal emulator for X with Thai support" \ + title="TAterm" command="/usr/bin/taterm" --- aterm-1.0.1.orig/debian/patches/29_fix_deadkeys.dpatch +++ aterm-1.0.1/debian/patches/29_fix_deadkeys.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 29_fix_deadkeys.dpatch by Nico Golde +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aterm-1.0.1~/src/command.c aterm-1.0.1/src/command.c +--- aterm-1.0.1~/src/command.c 2006-06-26 20:01:20.000000000 +0200 ++++ aterm-1.0.1/src/command.c 2007-09-26 15:03:19.000000000 +0200 +@@ -1486,19 +1486,21 @@ + numlock_state = (ev->xkey.state & ModNumLockMask); /* numlock toggle */ + PrivMode((!numlock_state), PrivMode_aplKP); + } +-#ifdef USE_XIM ++#if defined(USE_XIM) || !defined(NO_XLOCALE) + len = 0; +- if (Input_Context != NULL) { +- Status status_return; ++ if (!XFilterEvent(ev, *(&ev->xkey.window))) { ++ if (Input_Context != NULL) { ++ Status status_return; + +- kbuf[0] = '\0'; +- len = XmbLookupString(Input_Context, &ev->xkey, kbuf, +- sizeof(kbuf), &keysym, +- &status_return); +- } else { +- len = XLookupString(&ev->xkey, kbuf, +- sizeof(kbuf), &keysym, +- &compose); ++ kbuf[0] = '\0'; ++ len = XmbLookupString(Input_Context, &ev->xkey, kbuf, ++ sizeof(kbuf), &keysym, ++ &status_return); ++ } else { ++ len = XLookupString(&ev->xkey, kbuf, ++ sizeof(kbuf), &keysym, ++ &compose); ++ } + } + #else /* USE_XIM */ + len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, &compose); --- aterm-1.0.1.orig/debian/patches/10_warn_faulty_boolean.dpatch +++ aterm-1.0.1/debian/patches/10_warn_faulty_boolean.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_warn_faulty_boolean.dpatch by Göran Weinholt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Warn if a boolean resource is neither TRUE or FALSE. See #82495. + + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./src/xdefaults.c /tmp/dpep-work.T9H3hg/aterm-1.0.0/src/xdefaults.c +--- ./src/xdefaults.c 2005-07-31 18:31:49.000000000 +0200 ++++ /tmp/dpep-work.T9H3hg/aterm-1.0.0/src/xdefaults.c 2005-07-31 18:46:26.000000000 +0200 +@@ -862,8 +862,12 @@ + s = !s; + if (s) + Options |= (optList[entry].flag); +- else ++ else { ++ if (my_strcasecmp(str, "FALSE")) ++ print_error("Cannot parse value \"%s\" from resource \"%s\" as boolean", ++ str, kw); + Options &= ~(optList[entry].flag); ++ } + } + } + break; +@@ -945,8 +949,12 @@ + s = !s; + if (s) + Options |= (optList[entry].flag); +- else ++ else { ++ if (my_strcasecmp(p, "FALSE")) ++ print_error("Cannot parse value \"%s\" from resource \"%s\" as boolean", ++ p, kw); + Options &= ~(optList[entry].flag); ++ } + } + } + } --- aterm-1.0.1.orig/debian/patches/22_eterm_transparency.dpatch +++ aterm-1.0.1/debian/patches/22_eterm_transparency.dpatch @@ -0,0 +1,103 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 22_eterm_transparency.dpatch by Nico Golde +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aterm-1.0.1~/src/main.c aterm-1.0.1/src/main.c +--- aterm-1.0.1~/src/main.c 2007-08-04 00:05:30.000000000 +0200 ++++ aterm-1.0.1/src/main.c 2007-08-04 00:09:53.000000000 +0200 +@@ -1334,6 +1334,12 @@ + break; + #endif + ++ case XTerm_EtermSeq: ++ op = atoi(str); ++ if (!(str = strchr(str, ';'))) ++ break; ++ eterm_seq(op, str + 1); ++ break; + case XTerm_Menu: + /* + * menubar_dispatch() violates the constness of the string, +@@ -1360,6 +1366,43 @@ + break; + } + } ++ ++/* ++ * Eterm escape sequences: ESC ] 6;Ps;Pt BEL ++ * 2 = set shade/tint mask ++ * (There are more codes--check Eterm's reference doc.) ++ */ ++/* PROTO */ ++ void ++eterm_seq(int op, const char *str) ++{ ++ assert(str != NULL); ++ switch (op) { ++#if defined(BACKGROUND_IMAGE) || defined(TRANSPARENT) ++ case 2: ++ /* { shade | tint } [ class ; ] value */ ++ if (strncmp(str, "tint", 4) == 0) { ++ char *class; ++ char *value; ++ ++ if (!(class = strchr((char *) str, ';'))) ++ break; ++ *class++ = '\0'; ++ if (!(value = strchr(class, ';'))) { ++ /* Default class is bg. */ ++ value = class; ++ class = "bg"; ++ } else ++ *value++ = '\0'; ++ ++ if (strcmp(class, "bg") == 0) { ++ set_window_color(Color_tint, value); ++ } ++ } ++ break; ++#endif ++ } ++} + /*}}} */ + + +diff -urNad aterm-1.0.1~/src/rxvt.h aterm-1.0.1/src/rxvt.h +--- aterm-1.0.1~/src/rxvt.h 2007-08-04 00:05:30.000000000 +0200 ++++ aterm-1.0.1/src/rxvt.h 2007-08-04 00:10:31.000000000 +0200 +@@ -807,6 +807,7 @@ + /* + * rxvt extensions of XTerm escape sequences: ESC ] Ps;Pt BEL + */ ++#define XTerm_EtermSeq 6 /* Eterm proprietary escape sequences */ + #define XTerm_Menu 10 /* set menu item */ + #define XTerm_Pixmap 20 /* new bg pixmap */ + #define XTerm_restoreFG 39 /* change default fg color */ +diff -urNad aterm-1.0.1~/src/screen.c aterm-1.0.1/src/screen.c +--- aterm-1.0.1~/src/screen.c 2007-08-04 00:05:30.000000000 +0200 ++++ aterm-1.0.1/src/screen.c 2007-08-04 00:15:22.000000000 +0200 +@@ -2665,7 +2665,20 @@ + !(Options & Opt_transparent)) + { + XSetWindowBackground(Xdisplay, TermWin.vt, PixColors[Color_bg]); +- } ++ } else if (idx == Color_tint) { ++ XColor tint; ++ ++ tint.pixel = PixColors[Color_tint]; ++ XQueryColor(Xdisplay, Xcmap, &tint); ++ if (TermWin.background.Shading.tintColor.red == tint.red && ++ TermWin.background.Shading.tintColor.green == tint.green && ++ TermWin.background.Shading.tintColor.blue == tint.blue) { ++ return; ++ } ++ TermWin.background.Shading.tintColor = tint; ++ RenderPixmap(0); ++ } ++ + + /* handle Color_BD, scrollbar background, etc. */ + --- aterm-1.0.1.orig/debian/patches/27_xlocale_test.dpatch +++ aterm-1.0.1/debian/patches/27_xlocale_test.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 27_xlocale_test.dpatch by Nico Golde +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aterm-1.0.1~/autoconf/configure.in aterm-1.0.1/autoconf/configure.in +--- aterm-1.0.1~/autoconf/configure.in 2007-08-04 00:23:29.000000000 +0200 ++++ aterm-1.0.1/autoconf/configure.in 2007-08-04 00:28:14.000000000 +0200 +@@ -608,7 +608,7 @@ + + dnl# this is a really hack test for some basic Xlocale stuff + SAVETHELIBS=$LIBS +-LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lXmu" ++LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11" + CFLAGS="$CFLAGS $X_CFLAGS" + AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, + [AC_TRY_RUN( +diff -urNad aterm-1.0.1~/configure aterm-1.0.1/configure +--- aterm-1.0.1~/configure 2007-08-04 00:23:29.000000000 +0200 ++++ aterm-1.0.1/configure 2007-08-04 00:28:29.000000000 +0200 +@@ -10434,7 +10434,7 @@ + fi + + SAVETHELIBS=$LIBS +-LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lXmu" ++LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11" + CFLAGS="$CFLAGS $X_CFLAGS" + { echo "$as_me:$LINENO: checking for working Xlocale" >&5 + echo $ECHO_N "checking for working Xlocale... $ECHO_C" >&6; } --- aterm-1.0.1.orig/debian/patches/00list +++ aterm-1.0.1/debian/patches/00list @@ -0,0 +1,11 @@ +10_warn_faulty_boolean +20_cutToBeginningOfLine +21_xresources_in_manpage +22_eterm_transparency +26_manpage_paths +27_xlocale_test +28_manpage_bl +25_superflous_linking +29_fix_deadkeys +30_lose_pastebuffer_on_resize +31_dpy --- aterm-1.0.1.orig/debian/patches/31_dpy.dpatch +++ aterm-1.0.1/debian/patches/31_dpy.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 31_dpy.dpatch by Robert Luberda +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aterm-1.0.1~/src/libafterstep.h aterm-1.0.1/src/libafterstep.h +--- aterm-1.0.1~/src/libafterstep.h 2004-11-10 18:21:43.000000000 +0100 ++++ aterm-1.0.1/src/libafterstep.h 2009-07-20 23:10:02.000000000 +0200 +@@ -45,7 +45,6 @@ + #ifdef INTERN + int DeadPipe( int nonsense ){return 1;} + ScreenInfo Scr ; +-Display *dpy ; + char *MyName; + #endif /* INTERN */ + #endif /* USE_LIBASIMAGE */ +diff -urNad aterm-1.0.1~/src/main.c aterm-1.0.1/src/main.c +--- aterm-1.0.1~/src/main.c 2007-08-01 16:08:29.000000000 +0200 ++++ aterm-1.0.1/src/main.c 2009-07-20 23:08:46.000000000 +0200 +@@ -2087,7 +2087,7 @@ + #endif + + ConnectX ( &Scr, 0 ); +- Xdisplay = dpy ; ++ Xdisplay = get_current_X_display() ; + Xscreen = Scr.screen ; + asv = Scr.asv ; + +@@ -2125,7 +2125,7 @@ + XdisplayHeight = DisplayHeight (Xdisplay, Xscreen); + + #ifdef HAVE_AFTERIMAGE +- dpy = Xdisplay ; ++ set_current_X_display(Xdisplay) ; + asv = create_asvisual (Xdisplay, Xscreen, Xdepth, NULL); + Xcmap = asv->colormap; + Xdepth = asv->visual_info.depth; --- aterm-1.0.1.orig/debian/patches/28_manpage_bl.dpatch +++ aterm-1.0.1/debian/patches/28_manpage_bl.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 28_manpage_bl.dpatch by Göran Weinholt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix the -bl option in the manpage. + +@DPATCH@ +diff -urNad aterm-1.0.0~/doc/aterm.1 aterm-1.0.0/doc/aterm.1 +--- aterm-1.0.0~/doc/aterm.1 2006-10-06 15:16:23.000000000 +0200 ++++ aterm-1.0.0/doc/aterm.1 2006-10-06 15:14:38.000000000 +0200 +@@ -171,7 +171,7 @@ + .IP "\fB-bd\fP \fIcolour\fP" + The colour of the border between the xterm scrollbar and the text; + resource \fBborderColor\fP\&. +-.IP "\fB-bl\fP \fInumber\fP" ++.IP "\fB-bl\fP|\fB+bl\fP" + This option specifies that aterm should askwindow manager to not have + a border around term's window; + resource \fBborderLess\fP\&. --- aterm-1.0.1.orig/debian/patches/30_lose_pastebuffer_on_resize.dpatch +++ aterm-1.0.1/debian/patches/30_lose_pastebuffer_on_resize.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_lose_pastebuffer_on_resize.dpatch by Nico Golde +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aterm-1.0.1~/src/screen.c aterm-1.0.1/src/screen.c +--- aterm-1.0.1~/src/screen.c 2006-03-30 00:32:07.000000000 +0200 ++++ aterm-1.0.1/src/screen.c 2007-12-17 23:08:19.000000000 +0100 +@@ -2883,7 +2883,7 @@ + selection.type = 1; + /* "fix" for the high-ascii pasting? : */ + /* may need to try all three : aterm_XA_UTF8_STRING, _XA_COMPAUND_TEXT and XA_STRING in that order */ +- XConvertSelection(Xdisplay, XA_PRIMARY, XA_STRING, aterm_XA_VT_SELECTION, TermWin.vt,tm); ++ XConvertSelection(Xdisplay, XA_PRIMARY, _XA_COMPAUND_TEXT, aterm_XA_VT_SELECTION, TermWin.vt,tm); + /* XConvertSelection(Xdisplay, XA_PRIMARY, _XA_COMPAUND_TEXT, prop, TermWin.vt,tm); */ + } + } --- aterm-1.0.1.orig/debian/patches/21_xresources_in_manpage.dpatch +++ aterm-1.0.1/debian/patches/21_xresources_in_manpage.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 21_xresources_in_manpage.dpatch by Göran Weinholt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove reference to .Xdefaults et al and mentions xrdb instead. + +@DPATCH@ +diff -urNad aterm-0.4.2/doc/aterm.1 /tmp/dpep.SAKh5b/aterm-0.4.2/doc/aterm.1 +--- aterm-0.4.2/doc/aterm.1 2005-03-29 15:58:53.000000000 +0200 ++++ /tmp/dpep.SAKh5b/aterm-0.4.2/doc/aterm.1 2005-03-29 16:06:31.000000000 +0200 +@@ -255,9 +255,12 @@ + .IP + .SH "RESOURCES (available also as long-options)" + .PP +-\fBaterm\fP accepts application defaults set in XAPPLOADDIR/aterm (compile-time +-defined: usually \fB/etc/X11/Xresources/aterm\fP) and resources set in +-\fB~/\&.Xdefaults\fP or \fB~/\&.Xresources\fP\&. Note that when reading X resources, ++.\" \fBaterm\fP accepts application defaults set in XAPPLOADDIR/aterm (compile-time ++.\" defined: usually \fB/etc/X11/Xresources/aterm\fP) and resources set in ++.\" \fB~/\&.Xdefaults\fP or \fB~/\&.Xresources\fP\&. ++\fBaterm\fP accepts application defaults from the X server resource database. ++\fBxrdb\fP is used to update this database. ++Note that when reading X resources, + \fBaterm\fP recognizes two class names: \fBXTerm\fP and \fBAterm\fP\&. The class name + \fBXTerm\fP allows resources common to both \fBaterm\fP and \fIxterm\fP to be easily + configured, while the class name \fBAterm\fP allows resources unique to \fBaterm\fP, --- aterm-1.0.1.orig/debian/patches/20_cutToBeginningOfLine.dpatch +++ aterm-1.0.1/debian/patches/20_cutToBeginningOfLine.dpatch @@ -0,0 +1,63 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_cutToBeginningOfLine.dpatch by Nico Golde +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aterm-1.0.1~/src/rxvt.h aterm-1.0.1/src/rxvt.h +--- aterm-1.0.1~/src/rxvt.h 2007-08-03 23:55:28.000000000 +0200 ++++ aterm-1.0.1/src/rxvt.h 2007-08-03 23:56:36.000000000 +0200 +@@ -784,6 +784,7 @@ + #define Opt_scrollKeypress (1LU<<12) + #define Opt_transparent (1LU<<13) + #define Opt_transparent_sb (1LU<<14) ++#define Opt_cutToBeginningOfLine (1LU<<15) + #define Opt_borderLess (1LU<<16) + + /* place holder used for parsing command-line options */ +diff -urNad aterm-1.0.1~/src/screen.c aterm-1.0.1/src/screen.c +--- aterm-1.0.1~/src/screen.c 2007-08-03 23:55:28.000000000 +0200 ++++ aterm-1.0.1/src/screen.c 2007-08-04 00:02:35.000000000 +0200 +@@ -3155,7 +3155,7 @@ + text_t *stp; + rend_t *srp; + +- if (selection.clicks != 2) ++ if (selection.clicks < 2) + return; /* Go away: we only handle double clicks */ + + if (dirn == UP) { +@@ -3454,7 +3454,11 @@ + } else if (selection.clicks == 3) { + if (ROWCOL_IS_AFTER(selection.mark, selection.beg)) + selection.mark.col++; +- selection.beg.col = 0; ++ if (Options & Opt_cutToBeginningOfLine) { ++ selection_delimit_word(UP, &(selection.beg), &(selection.beg)); ++ } else { ++ selection.beg.col = 0; ++ } + selection.end.col = TermWin.bcol; + } + if (button3 && buttonpress) { /* mark may need to be changed */ +diff -urNad aterm-1.0.1~/src/xdefaults.c aterm-1.0.1/src/xdefaults.c +--- aterm-1.0.1~/src/xdefaults.c 2007-08-03 23:55:28.000000000 +0200 ++++ aterm-1.0.1/src/xdefaults.c 2007-08-04 00:03:23.000000000 +0200 +@@ -70,6 +70,7 @@ + #endif + static const char *rs_visualBell = NULL; + static const char *rs_reverseVideo = NULL; ++static const char *rs_cutToBeginningOfLine = NULL; + + #ifdef META8_OPTION + static const char *rs_meta8 = NULL; +@@ -327,6 +328,8 @@ + BOOL(rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, + "utmp inhibit"), + BOOL(rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), ++ BOOL(rs_cutToBeginningOfLine, "cutToBeginningOfLine", "cb", Opt_cutToBeginningOfLine, ++ "cut to beginning of line"), + + #ifndef NO_MAPALERT + # ifdef MAPALERT_OPTION --- aterm-1.0.1.orig/debian/patches/25_superflous_linking.dpatch +++ aterm-1.0.1/debian/patches/25_superflous_linking.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_superflous_linking.dpatch by Nico Golde +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad aterm-1.0.1~/configure aterm-1.0.1/configure +--- aterm-1.0.1~/configure 2007-09-22 10:33:40.000000000 +0200 ++++ aterm-1.0.1/configure 2007-09-22 10:34:13.000000000 +0200 +@@ -6796,9 +6796,9 @@ + fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then +- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +-fi ++#if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then ++# X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" ++#fi + + LDFLAGS=$ac_save_LDFLAGS + +@@ -6877,7 +6877,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXext $x_libs $LIBS" ++#LIBS="-lXext $x_libs $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF --- aterm-1.0.1.orig/debian/patches/26_manpage_paths.dpatch +++ aterm-1.0.1/debian/patches/26_manpage_paths.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 26_manpage_paths.dpatch by Göran Weinholt +## +## DP: Fix path to files in the FILES section of aterm(1) + +@DPATCH@ +diff -urNad aterm-1.0.1~/doc/aterm.1 aterm-1.0.1/doc/aterm.1 +--- aterm-1.0.1~/doc/aterm.1 2007-12-17 22:48:28.000000000 +0100 ++++ aterm-1.0.1/doc/aterm.1 2007-12-17 22:51:01.000000000 +0100 +@@ -1,6 +1,6 @@ + .TH "ATERM" "1" "05 July 05" "X Version 11" "X Tools" + .SH "NAME" +-aterm (Afterstep XVT) \- a VT102 emulator for the X window system ++aterm \- a VT102 emulator for the X window system + .PP + .SH "SYNOPSIS" + .PP +@@ -656,9 +656,9 @@ + to find XPM files\&. + .SH "FILES" + .PP +-.IP "\fB/etc/utmp\fP" ++.IP "\fB/var/run/utmp\fP" + System file for login records\&. +-.IP "\fB/usr/lib/X11/rgb\&.txt\fP" ++.IP "\fB/etc/X11/rgb.txt\fP" + Color names\&. + .PP + .SH "SEE ALSO" --- aterm-1.0.1.orig/src/version.h +++ aterm-1.0.1/src/version.h @@ -0,0 +1,2 @@ +#define VERSION "1.00.01" +#define DATE "01 August 2007"