reverted: --- atitvout-0.4/COPYING +++ atitvout-0.4.orig/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,8 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA Also add information on how to contact you by electronic and paper mail. reverted: --- atitvout-0.4/Makefile +++ atitvout-0.4.orig/Makefile @@ -4,7 +4,6 @@ TAR=atitvout-$(VERSION).tar.gz BINARY=atitvout PACKAGE=atitvout -PREFIX=/usr/local all: $(BINARY) @@ -12,12 +11,17 @@ make -C lrmi-0.6 $(CC) $(OBJS) lrmi-0.6/liblrmi.a -o $(BINARY) +strip: $(BINARY) + @du -h $(BINARY) + strip -s $(BINARY) + @du -h $(BINARY) + clean: rm -f *.o $(BINARY) *~ README index.html *.tar.gz test.out make -C lrmi-0.6 clean +install: strip + install -g root -o root -m 555 $(BINARY) /usr/local/sbin -install: $(BINARY) - install -g root -o root -m 555 $(BINARY) $(DESTDIR)$(PREFIX)/sbin deinstall: rm -f /usr/local/sbin/$(BINARY) reverted: --- atitvout-0.4/test.sh +++ atitvout-0.4.orig/test.sh @@ -2,7 +2,7 @@ testit () { echo "TEST: Running 'atitvout $FLAG $1' ..." + ./atitvout $FLAG $1 - atitvout $FLAG $1 echo "TEST: ... finished. Return value is $?. Please wait 3 seconds." echo sleep 3 diff -u atitvout-0.4/debian/rules atitvout-0.4/debian/rules --- atitvout-0.4/debian/rules +++ atitvout-0.4/debian/rules @@ -7,6 +7,7 @@ export DDATE=`date` + ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS += -g endif @@ -14,8 +15,10 @@ INSTALL_PROGRAM += -s endif +include /usr/share/quilt/quilt.make + configure: configure-stamp -configure-stamp: +configure-stamp: patch dh_testdir # Add here commands to configure the package. @@ -37,7 +40,7 @@ touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp diff -u atitvout-0.4/debian/changelog atitvout-0.4/debian/changelog --- atitvout-0.4/debian/changelog +++ atitvout-0.4/debian/changelog @@ -1,3 +1,18 @@ +atitvout (0.4-13ubuntu1) karmic; urgency=low + + * Build test. + + -- Bhavani Shankar Sat, 30 May 2009 19:54:01 +0530 + +atitvout (0.4-13) unstable; urgency=low + + * Merged atitvout_0.4-12ubuntu1.patch (Closes: #518725 #490746) + * Added builddep: quilt, libx86-dev + * Updated maintainer email + * Bump Standards-Version up to 3.8.1 + + -- Philippe Coval Sun, 24 May 2009 22:15:54 +0200 + atitvout (0.4-12ubuntu1) intrepid; urgency=low * lrmi-0.6/lrmi.c: @@ -103,0 +119 @@ + diff -u atitvout-0.4/debian/control atitvout-0.4/debian/control --- atitvout-0.4/debian/control +++ atitvout-0.4/debian/control @@ -2,9 +2,9 @@ Section: misc Priority: optional Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Philippe Coval -Build-Depends: debhelper (>= 6) -Standards-Version: 3.8.0 +XSBC-Original-Maintainer: Philippe Coval +Build-Depends: debhelper (>= 6), quilt, libx86-dev +Standards-Version: 3.8.1 Homepage: http://0pointer.de/lennart/projects/atitvout/ Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/atitvout/ Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/atitvout/ only in patch2: unchanged: --- atitvout-0.4.orig/debian/patches/lrmi +++ atitvout-0.4/debian/patches/lrmi @@ -0,0 +1,23 @@ +Index: atitvout-trunk/lrmi-0.6/lrmi.c +=================================================================== +--- atitvout-trunk.orig/lrmi-0.6/lrmi.c 2009-05-24 22:08:40.000000000 +0200 ++++ atitvout-trunk/lrmi-0.6/lrmi.c 2009-05-24 22:11:42.000000000 +0200 +@@ -26,6 +26,13 @@ + + #include "lrmi.h" + ++#if defined(__linux__) && !defined(TF_MASK) ++ #define TF_MASK X86_EFLAGS_TF ++ #define IF_MASK X86_EFLAGS_IF ++ #define VIF_MASK X86_EFLAGS_VIF ++ #define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++ + #define REAL_MEM_BASE ((void *)0x10000) + #define REAL_MEM_SIZE 0x10000 + #define REAL_MEM_BLOCKS 0x100 +@@ -880,4 +887,3 @@ + + return vret; + } +- only in patch2: unchanged: --- atitvout-0.4.orig/debian/patches/series +++ atitvout-0.4/debian/patches/series @@ -0,0 +1,2 @@ +debian +lrmi only in patch2: unchanged: --- atitvout-0.4.orig/debian/patches/debian +++ atitvout-0.4/debian/patches/debian @@ -0,0 +1,62 @@ +--- atitvout-0.4.orig/Makefile ++++ atitvout-0.4/Makefile +@@ -4,6 +4,7 @@ + TAR=atitvout-$(VERSION).tar.gz + BINARY=atitvout + PACKAGE=atitvout ++PREFIX=/usr/local + + all: $(BINARY) + +@@ -11,17 +12,12 @@ + make -C lrmi-0.6 + $(CC) $(OBJS) lrmi-0.6/liblrmi.a -o $(BINARY) + +-strip: $(BINARY) +- @du -h $(BINARY) +- strip -s $(BINARY) +- @du -h $(BINARY) +- + clean: + rm -f *.o $(BINARY) *~ README index.html *.tar.gz test.out + make -C lrmi-0.6 clean + +-install: strip +- install -g root -o root -m 555 $(BINARY) /usr/local/sbin ++install: $(BINARY) ++ install -g root -o root -m 555 $(BINARY) $(DESTDIR)$(PREFIX)/sbin + + deinstall: + rm -f /usr/local/sbin/$(BINARY) +--- atitvout-0.4.orig/test.sh ++++ atitvout-0.4/test.sh +@@ -2,7 +2,7 @@ + + testit () { + echo "TEST: Running 'atitvout $FLAG $1' ..." +- ./atitvout $FLAG $1 ++ atitvout $FLAG $1 + echo "TEST: ... finished. Return value is $?. Please wait 3 seconds." + echo + sleep 3 +--- atitvout-0.4.orig/COPYING ++++ atitvout-0.4/COPYING +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -305,7 +305,8 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ MA 02110-1301, USA + + + Also add information on how to contact you by electronic and paper mail. only in patch2: unchanged: --- atitvout-0.4.orig/debian/atitvout.1 +++ atitvout-0.4/debian/atitvout.1 @@ -0,0 +1,183 @@ +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.07) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.ie \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. nr % 0 +. rr F +.\} +.el \{\ +. de IX +.. +.\} +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "ATITVOUT 1" +.TH ATITVOUT 1 "Fri May 29 13:00:32 NZST 2009" "ATITVout " "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" +atitvout \- ATI Rage/Radeon TV Out configuration program +.SH "COMMANDS" +.IX Header "COMMANDS" +.Vb 12 +\& help: Shows this help. +\& vbe: Show some information about the VESA BIOS Extension (VBE). +\& tvout: Shows some information about the TV Out connector. +\& standard: Shows some information about the used TV standard. +\& pal*: Sets PAL mode. +\& ntsc*: Sets NTSC mode. +\& detect: Shows a list of attached displays. +\& active: Shows a list of all active displays. +\& auto: Activates all attached displays, deactivates all others. +\& off: Deactives all displays. +\& l,c,t,lc,lt,ct,lct: Activates the specified display, deactivates all +\& others. (l = LCD; c = CRT; t = TV) +.Ve +.SH "MISC" +.IX Header "MISC" +Use the flags \-f and \-r for forcing Rage Mobility/Rage \s-1LT\s0 resp. Radeon/R128 mode. +* Not available on Radeon/Rage 128. +.PP +You may specifiy more than one command on the command line. An example: +.PP +.Vb 1 +\& atitvout pal auto +.Ve +.PP +This command line automatically enables an attached \s-1TV\s0 and sets it to \s-1PAL\s0 mode. +.SH "NOTES" +.IX Header "NOTES" +\&\s-1PLEASE\s0 \s-1NOTE:\s0 When using the ati driver of XFree 4.1 you should rerun this +utility always after having changed the screen resolution with C\-A\-+ or C\-A\-\-. +Otherwise the displays may go nuts. +.PP +\&\s-1PLEASE\s0 \s-1NOTE:\s0 Not all \s-1ATI\s0 adapters support all of these commands. Please try them +all before complaining. +.PP +\&\s-1PLEASE\s0 \s-1NOTE:\s0 Most cards do not allow to activate non attached displays. All calls +to atitvout will fail if you try to enable displays which do not show up in +\&'atitvout detect'. +.PP +\&\s-1PLEASE\s0 \s-1NOTE:\s0 Not all adapters seem to support simultaneously using \s-1TV\s0 and \s-1LCD\s0 from +within Linux. Thus 'lt' may fail, while 'l' and 't' succeed. In this case 'auto' +will fail too. In fact 'auto' works only on very few adapters. +.SH "AUTHOR" +.IX Header "AUTHOR" +Author of this manpage is Ola Lundqvist +.SH "SEE ALSO" +.IX Header "SEE ALSO" +http://www.stud.uni\-hamburg.de/users/lennart/projects/atitvout/