--- alltray-0.69.orig/config.sub +++ alltray-0.69/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-11' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,15 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -268,26 +270,25 @@ | mn10200 | mn10300 \ | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -317,18 +318,18 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -350,29 +351,28 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -475,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -818,6 +822,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -904,6 +914,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -915,6 +929,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1120,7 +1137,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1193,7 +1210,8 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -1208,7 +1226,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1360,6 +1378,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1369,9 +1393,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1397,6 +1421,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- alltray-0.69.orig/config.guess +++ alltray-0.69/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-13' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -160,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -206,8 +208,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -325,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -764,12 +769,19 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -779,9 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -817,6 +835,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +872,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +895,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -925,6 +954,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -967,7 +999,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -977,7 +1009,11 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1179,6 +1215,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; --- alltray-0.69.orig/debian/patches/02-fix-compiz-windows-select.dpatch +++ alltray-0.69/debian/patches/02-fix-compiz-windows-select.dpatch @@ -0,0 +1,71 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-fix-compiz-windows-select.dpatch by "AZ" +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix "No windows hiding with compiz" (https://launchpad.net/bugs/106583) + +@DPATCH@ +diff -urNad alltray-0.69~/src/clickmode.c alltray-0.69/src/clickmode.c +--- alltray-0.69~/src/clickmode.c 2008-03-21 23:54:25.000000000 +0100 ++++ alltray-0.69/src/clickmode.c 2008-03-21 23:55:10.897554679 +0100 +@@ -141,7 +141,7 @@ + + target_win != None && + target_win != GDK_ROOT_WINDOW() && +- target_win != target_win_xmu && ++ (target_win != target_win_xmu || win->compiz == TRUE) && + window_type_is_normal (target_win_xmu))) { + + gdk_pointer_ungrab (GDK_CURRENT_TIME); +diff -urNad alltray-0.69~/src/common.h alltray-0.69/src/common.h +--- alltray-0.69~/src/common.h 2008-03-21 23:54:25.000000000 +0100 ++++ alltray-0.69/src/common.h 2008-03-21 23:55:10.897554679 +0100 +@@ -186,6 +186,7 @@ + + gchar *window_manager; + gboolean gnome; ++ gboolean compiz; + gboolean kde; + + gboolean no_reparent; +diff -urNad alltray-0.69~/src/main.c alltray-0.69/src/main.c +--- alltray-0.69~/src/main.c 2008-03-21 23:54:25.000000000 +0100 ++++ alltray-0.69/src/main.c 2008-03-21 23:55:10.897554679 +0100 +@@ -123,6 +123,7 @@ + + win->window_manager=NULL; + win->gnome=FALSE; ++ win->compiz=FALSE; + win->kde=FALSE; + + win->no_reparent=FALSE; +@@ -169,8 +170,8 @@ + + if (debug) printf ("window manager: %s\n", win->window_manager); + +- if (!strcmp(win->window_manager, "Metacity")) { +- ++ if ((!strcmp(win->window_manager, "Metacity")) || (!strcmp(win->window_manager, "compiz"))) { ++ + #ifndef GCONF_NOT_DISABLED + printf ("\n\nAlltray: To use Alltray under Gnome, Gconf support should not be disabled.\n" + " But it is.\n\n"); +@@ -181,6 +182,10 @@ + win->no_reparent=TRUE; + } + ++ if (!strcmp(win->window_manager, "compiz")) { ++ win->compiz = TRUE; ++ } ++ + if (!strcmp(win->window_manager, "KWin")) { + win->kde=TRUE; + win->no_reparent=TRUE; +@@ -237,6 +242,7 @@ + + win->gnome=FALSE; + win->kde=FALSE; ++ win->compiz=FALSE; + win->no_reparent=TRUE; + } + --- alltray-0.69.orig/debian/patches/00list +++ alltray-0.69/debian/patches/00list @@ -0,0 +1,2 @@ +01-fix-compiz-interaction.dpatch +02-fix-compiz-windows-select.dpatch --- alltray-0.69.orig/debian/patches/01-fix-compiz-interaction.dpatch +++ alltray-0.69/debian/patches/01-fix-compiz-interaction.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-fix-compiz-interaction.dpatch by Michael B. Trausch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix interaction with Compiz when Compiz is the active window manager. +## DP: https://launchpad.net/bugs/178541 + +@DPATCH@ +diff -urNad alltray-0.69~/README alltray-0.69/README +--- alltray-0.69~/README 2006-06-23 16:32:29.000000000 -0400 ++++ alltray-0.69/README 2008-03-03 23:39:25.000000000 -0500 +@@ -1,4 +1,5 @@ + AllTray: Copyright 2004, 2005, 2006 Jochen Baier, email@jochen-baier.de ++ Portions Copyright 2007, 2008 Michael B. Trausch, mike@trausch.us + + With AllTray you can dock any application with no native tray icon + (like Evolution, Thunderbird, Terminals) into the system tray. +diff -urNad alltray-0.69~/alltray.desktop alltray-0.69/alltray.desktop +--- alltray-0.69~/alltray.desktop 2006-04-10 13:38:43.000000000 -0400 ++++ alltray-0.69/alltray.desktop 2008-03-03 23:40:39.000000000 -0500 +@@ -2,7 +2,7 @@ + Encoding=UTF-8 + Name=AllTray + GenericName=AllTray +-Comment=Dock everything ++Comment=Dock any application to the notification area/system tray. + Exec=alltray + Icon=alltray.png + Terminal=false +diff -urNad alltray-0.69~/src/utils.c alltray-0.69/src/utils.c +--- alltray-0.69~/src/utils.c 2006-07-06 14:07:17.000000000 -0400 ++++ alltray-0.69/src/utils.c 2008-03-03 23:39:07.000000000 -0500 +@@ -24,6 +24,7 @@ + * Copyright: + * + * Jochen Baier, 2004, 2005, 2006 (email@Jochen-Baier.de) ++ * Portions by Michael B. Trausch, 2007, 2008 (mike@trausch.us) + * + * + * Based on code from: +@@ -1475,6 +1476,20 @@ + return; + } + ++ // Interact nicely with Compiz, which works slightly differently. ++ // We use get_window_manager() instead of win->window_manager because ++ // win->window_manager is not always populated when running under ++ // Compiz. ++ if ((!strcasecmp(get_window_manager(), "compiz")) && (win->no_title) ++ && (!win->xmms)) { ++ title_string = title; ++ if (win->no_reparent) { ++ gdk_window_set_title(win->child_gdk, title_string); ++ } else { ++ gdk_window_set_title(win->parent_gdk, title_string); ++ } ++ } ++ + if (!win->xmms) { + title_string=g_strconcat (title, " (AllTray)", NULL); + --- alltray-0.69.orig/debian/rules +++ alltray-0.69/debian/rules @@ -0,0 +1,113 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# +# Include the dpatch helper. +# +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + + +build: patch build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + touch build-stamp + +clean: clean-patched unpatch + +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + cp debian/lintian.overrides debian/alltray/usr/share/lintian/overrides/alltray + cp debian/linda.overrides debian/alltray/usr/share/linda/overrides/alltray + + # Add here commands to install the package into debian/alltray. + $(MAKE) install DESTDIR=$(CURDIR)/debian/alltray + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- alltray-0.69.orig/debian/changelog +++ alltray-0.69/debian/changelog @@ -0,0 +1,36 @@ +alltray (0.69-1ubuntu1) hardy; urgency=low + + [ Michael B. Trausch ] + * Work around issues with Compiz window manager and display of + window titles (LP: #178541) + * Modify Maintainer value to match the DebianMaintainerField + specification. + * Add dpatch to build-depends in debian/control. + * Modify debian/rules to use dpatch. + * Modify alltray.desktop comment to be more descriptive and thus useful. + + [ Daniel Hahler ] + * Fix "No windows hiding with compiz" (LP: #106583) + - 02-fix-compiz-windows-select.dpatch, provided by "AZ" + - There are still issues with compiz and alltray, but this patch makes it + better + * debian/control: + - Standards-Version 3.7.3 + - Moved Homepage from desc to field + * debian/rules: + - Fix debian-rules-ignores-make-clean-error (lintian) + + -- Daniel Hahler Sat, 22 Mar 2008 00:26:48 +0100 + +alltray (0.69-1) unstable; urgency=low + + [ Carlos C Soto ] + * New upstream release (Closes: Bug#305000). + + [ Raphael Hertzog ] + * Sponsoring this package. + * Added XS-Vcs-Svn header in debian/control. + * Added myself in the Uploaders field. + + -- Raphael Hertzog Sun, 14 Jan 2007 18:36:56 +0100 + --- alltray-0.69.orig/debian/control +++ alltray-0.69/debian/control @@ -0,0 +1,22 @@ +Source: alltray +Section: x11 +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Carlos C Soto +Uploaders: Raphael Hertzog +Build-Depends: debhelper (>= 5.0.0), dpatch (>= 2.0.28), autotools-dev, libgtk2.0-dev, libgconf2-dev +XS-Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/alltray/trunk/ +Standards-Version: 3.7.3 +Homepage: http://alltray.sourceforge.net/ + +Package: alltray +Architecture: any +Depends: ${shlibs:Depends} +Description: Dock any program into the system tray + With AllTray you can dock any application with no native tray icon + (like Evolution, Thunderbird, Terminals) into the system tray. + A high-light feature is that a click on the "close" button + will minimize back to system tray. It works well with Gnome, + KDE, XFCE 4*, Fluxbox* and WindowMaker*. + (*) No drag 'n drop support. Enable with "-nm" option. + . --- alltray-0.69.orig/debian/lintian.overrides +++ alltray-0.69/debian/lintian.overrides @@ -0,0 +1,2 @@ +alltray: non-dev-pkg-with-shlib-symlink usr/lib/liballtray.so.0.0.0 usr/lib/liballtray.so +alltray: package-name-doesnt-match-sonames liballtray0 --- alltray-0.69.orig/debian/compat +++ alltray-0.69/debian/compat @@ -0,0 +1 @@ +5 --- alltray-0.69.orig/debian/README.Debian +++ alltray-0.69/debian/README.Debian @@ -0,0 +1,27 @@ +Alltray running examples +======================== +Please check the options for alltray(1) + $ man alltray + $ alltray --help +To run alltray for xmms with a different icon: + $ alltray -i /usr/share/icons/gartoon/scalable/apps/xmms.svg -s -x xmms +To run thunderbird: + $ alltray -i /usr/share/icons/gartoon/scalable/apps/thunderbird.svg \ + mozilla-thunderbird +Obviously I'm using the gartoon theme ;) + +Override of lintian and linda +============================= +The alltray developer at version 0.50 has made a library for alltray named +liballtraynomap and I will make a different package for this library on a +future release. + +This change makes me introduce a override file for lintian and linda. +lintian: non-dev-pkg-with-shlib-symlink +linda: shlibs-sover-mismatch + +From lintian information: + However, if this is a small package which includes the runtime and the + development libraries, this is not a bug. In the latter case, please + override this warning. + --- alltray-0.69.orig/debian/dirs +++ alltray-0.69/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/lib +usr/share/lintian/overrides/ +usr/share/linda/overrides/ --- alltray-0.69.orig/debian/linda.overrides +++ alltray-0.69/debian/linda.overrides @@ -0,0 +1 @@ +Tag: shlibs-sover-mismatch --- alltray-0.69.orig/debian/copyright +++ alltray-0.69/debian/copyright @@ -0,0 +1,67 @@ +This package was debianized by Carlos C Soto on +Mon, 14 Aug 2006 02:11:07 -0500. + +It was downloaded from: http://alltray.sourceforge.net/ + +Author: Jochen Baier +Copyright: 2004, 2005, 2006 - Jochen Baier + +License: + + 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; either version 2 of the License, or + (at your option) any later version. + + 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 + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +------------------------------------------------------------------------------- + +The source file src/clientwin.c included in tallbar is +Copyright: 1989, 1998 The Open Group + +Licence: + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of The Open Group shall not be + used in advertising or otherwise to promote the sale, use or other dealings + in this Software without prior written authorization from The Open Group. + +------------------------------------------------------------------------------- + +The source file src/binreloc.c included in tallbar is +Written by: Hongli Lai + This source code is public domain. You can relicense this code + under whatever license you want. + +------------------------------------------------------------------------------- + +The Debian packaging is (C) 2006, Carlos C Soto +and is licensed under the GPL, see above. + --- alltray-0.69.orig/debian/docs +++ alltray-0.69/debian/docs @@ -0,0 +1 @@ +README