10139N/Adiff -rup compiz-bcop-0.7.8-clean/Makefile.am compiz-bcop-0.7.8/Makefile.am

10139N/A--- compiz-bcop-0.7.8-clean/Makefile.am 2008-09-17 14:32:41.000000000 +0200

10139N/A+++ compiz-bcop-0.7.8/Makefile.am 2009-03-02 17:46:45.443640620 +0100

15905N/A@@ -3,5 +3,5 @@ SUBDIRS = src

10139N/A

10139N/A EXTRA_DIST = VERSION

10139N/A

15905N/A-pkgconfigdir = $(datadir)/pkgconfig

10139N/A+pkgconfigdir = $(libdir)/pkgconfig

10139N/A pkgconfig_DATA = bcop.pc

10139N/Adiff -rup compiz-bcop-0.7.8-clean/configure.ac compiz-bcop-0.7.8/configure.ac

15294N/A--- compiz-bcop-0.7.8-clean/configure.ac 2008-09-17 14:32:41.000000000 +0200

10139N/A+++ compiz-bcop-0.7.8/configure.ac 2009-03-02 17:46:45.443970715 +0100

15623N/A@@ -1,6 +1,6 @@

10139N/A AC_PREREQ(2.57)

10139N/A

10139N/A-AC_INIT([compiz-bcop],esyscmd(. ./VERSION;echo -n $VERSION), [onestone@beryl-project.org])

10139N/A+AC_INIT([compiz-bcop],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [onestone@beryl-project.org])

15905N/A

10142N/A AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])

12773N/A

12773N/A@@ -16,6 +16,13 @@ AC_C_BIGENDIAN

12773N/A

10139N/A PKG_CHECK_MODULES(LIBXSLT, libxslt)

12518N/A

10139N/A+AC_MSG_CHECKING(for getopt program)

12518N/A+GETOPT=getopt

16637N/A+AC_ARG_WITH(getopt, [ --with-getopt=GETOPT name of the getopt program],

12518N/A+ GETOPT=$withval)

15906N/A+AC_MSG_RESULT($GETOPT)

12518N/A+AC_SUBST(GETOPT)

16726N/A+

16637N/A xsltdir=$datadir/bcop

10139N/A AC_SUBST(xsltdir)

10139N/A

10139N/Adiff -rup compiz-bcop-0.7.8-clean/src/bcop.in compiz-bcop-0.7.8/src/bcop.in

10139N/A--- compiz-bcop-0.7.8-clean/src/bcop.in 2008-09-17 14:32:41.000000000 +0200

10139N/A+++ compiz-bcop-0.7.8/src/bcop.in 2009-03-02 17:46:45.444454427 +0100

10139N/A@@ -17,6 +17,8 @@

10139N/A # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

10139N/A # GNU General Public License for more details.

10139N/A #

10139N/A+# Utilities that we need that aren't everywhere

10139N/A+GETOPT=@GETOPT@

10139N/A

10139N/A xsltdir=@prefix@/share/bcop

10139N/A

10139N/A@@ -34,7 +36,7 @@ function usage

10139N/A srcfile=

10139N/A hdrfile=

10139N/A

10139N/A-set -- `getopt -quo "hv" -l "help,version,source:,header:" -- "$@"`

10139N/A+set -- `${GETOPT} -quo "hv" -l "help,version,source:,header:" -- "$@"`

10139N/A [ $# -lt 2 ] && usage

10139N/A

10139N/A while [ $# -gt 0 ]

10139N/AOnly in compiz-bcop-0.7.8/src: bcop.in.orig

10139N/Adiff -rup compiz-bcop-0.7.8-clean/src/bcop.xslt compiz-bcop-0.7.8/src/bcop.xslt

10139N/A--- compiz-bcop-0.7.8-clean/src/bcop.xslt 2008-09-17 14:32:41.000000000 +0200

10139N/A+++ compiz-bcop-0.7.8/src/bcop.xslt 2009-03-02 17:46:45.445742663 +0100

10139N/A@@ -267,7 +267,8 @@ typedef struct _</xsl:text>

10139N/A <xsl:text>OptionsScreen

10139N/A {

10139N/A </xsl:text>

10139N/A- <xsl:if test="plugin[@name=$pName]/screen/descendant-or-self::option">

10139N/A+ <xsl:choose>

10139N/A+ <xsl:when test="plugin[@name=$pName]/screen/descendant-or-self::option">

10142N/A <xsl:text> CompOption opt[</xsl:text>

10139N/A <xsl:value-of select="$Plugin"/>

10139N/A <xsl:text>ScreenOptionNum];

12518N/A@@ -283,7 +284,11 @@ typedef struct _</xsl:text>

12518N/A <xsl:text>;

10139N/A </xsl:text>

12518N/A </xsl:for-each>

16637N/A- </xsl:if>

10139N/A+ </xsl:when>

10139N/A+ <xsl:otherwise>

10139N/A+ <xsl:text> int dummy;</xsl:text>

10139N/A+ </xsl:otherwise>

10139N/A+ </xsl:choose>

10139N/A <xsl:text>} </xsl:text>

10139N/A <xsl:value-of select="$Plugin"/>

10139N/A <xsl:text>OptionsScreen;

10139N/A