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

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

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

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

18861N/A

18861N/A EXTRA_DIST = VERSION

18861N/A

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

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

18861N/A pkgconfig_DATA = bcop.pc

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

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

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

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

18861N/A AC_PREREQ(2.57)

18861N/A

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

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

18861N/A

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

18861N/A

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

18861N/A

18861N/A PKG_CHECK_MODULES(LIBXSLT, libxslt)

18861N/A

18861N/A+AC_MSG_CHECKING(for getopt program)

18861N/A+GETOPT=getopt

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

18861N/A+ GETOPT=$withval)

18861N/A+AC_MSG_RESULT($GETOPT)

18861N/A+AC_SUBST(GETOPT)

18861N/A+

18861N/A xsltdir=$datadir/bcop

18861N/A AC_SUBST(xsltdir)

18861N/A

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

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

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

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

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

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

18861N/A #

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

18861N/A+GETOPT=@GETOPT@

18861N/A

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

18861N/A

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

18861N/A srcfile=

18861N/A hdrfile=

18861N/A

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

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

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

18861N/A

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

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

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

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

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

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

18861N/A <xsl:text>OptionsScreen

18861N/A {

18861N/A </xsl:text>

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

18861N/A+ <xsl:choose>

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

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

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

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

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

18861N/A <xsl:text>;

18861N/A </xsl:text>

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

18861N/A- </xsl:if>

18861N/A+ </xsl:when>

18861N/A+ <xsl:otherwise>

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

18861N/A+ </xsl:otherwise>

18861N/A+ </xsl:choose>

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

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

18861N/A <xsl:text>OptionsScreen;