r31374 - in /desktop/unstable/gtk2-engines/debian: changelog control control.in patches/01_lua5.1.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Nov 13 17:52:21 2011
New Revision: 31374

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31374
Log:
* Drop lua engine.
* 01_lua5.1.patch: dropped, useless.

Removed:
    desktop/unstable/gtk2-engines/debian/patches/01_lua5.1.patch
    desktop/unstable/gtk2-engines/debian/patches/series
Modified:
    desktop/unstable/gtk2-engines/debian/changelog
    desktop/unstable/gtk2-engines/debian/control
    desktop/unstable/gtk2-engines/debian/control.in
    desktop/unstable/gtk2-engines/debian/rules

Modified: desktop/unstable/gtk2-engines/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/changelog?rev=31374&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk2-engines/debian/changelog [utf-8] Sun Nov 13 17:52:21 2011
@@ -6,6 +6,8 @@
   * Use dh-autoreconf.
   * Install engines to the multiarch directory.
   * Make the package Multi-Arch: same.
+  * Drop lua engine.
+  * 01_lua5.1.patch: dropped, useless.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 13 Nov 2011 18:42:27 +0100
 

Modified: desktop/unstable/gtk2-engines/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/control?rev=31374&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/control [utf-8] (original)
+++ desktop/unstable/gtk2-engines/debian/control [utf-8] Sun Nov 13 17:52:21 2011
@@ -11,7 +11,6 @@
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 5),
                dh-autoreconf,
-               liblua5.1-dev,
                libgtk2.0-dev (>= 2.19.7-2),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),

Modified: desktop/unstable/gtk2-engines/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/control.in?rev=31374&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk2-engines/debian/control.in [utf-8] Sun Nov 13 17:52:21 2011
@@ -6,7 +6,6 @@
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 5),
                dh-autoreconf,
-               liblua5.1-dev,
                libgtk2.0-dev (>= 2.19.7-2),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),

Modified: desktop/unstable/gtk2-engines/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/rules?rev=31374&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk2-engines/debian/rules [utf-8] Sun Nov 13 17:52:21 2011
@@ -23,13 +23,10 @@
 DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
 
 # FIXME: This is required because of some automake weirdness
-CFLAGS += -I/usr/include/lua5.1
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,-Bsymbolic -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-animation
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-animation --disable-lua
 DEB_CONFIGURE_UDEB_FLAGS = $(DEB_CONFIGURE_EXTRA_FLAGS)
-DEB_CONFIGURE_UDEB_FLAGS += --disable-lua
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-lua --with-system-lua=yes
 
 configure/gtk2-engines-udeb:: $(DEB_BUILDDIR_gtk2-engines-udeb)/config.status
 $(DEB_BUILDDIR_gtk2-engines-udeb)/config.status: