Add Debian/Ubuntu packages back to Linux build.

Thanks go to Jeff Bailey for writing most of this CL.
Also, bump version to 0.1.43.1 so that it exceeds the version of the previous O3D packages.

TEST=build, install, and run on Ubuntu

Review URL: http://codereview.chromium.org/556071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37561 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 245 insertions, 220 deletions

diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp
index 1a61c59..fdb1ccf 100644
--- a/o3d/build/libs.gyp
+++ b/o3d/build/libs.gyp
@@ -191,9 +191,6 @@
                   ],
                 ],
                 'files': [
-                  '../../<(glewdir)/<(libdir)/libGLEW.so',
-                  '../../<(glewdir)/<(libdir)/libGLEW.so.1.5',
-                  '../../<(glewdir)/<(libdir)/libGLEW.so.1.5.1',
                   "../../<(cgdir)/<(libdir)/libCg.so",
                   "../../<(cgdir)/<(libdir)/libCgGL.so",
                   "../../<(cgdir)/bin/cgc",
@@ -228,9 +225,6 @@
               {
                 'destination': '<(SHARED_LIB_DIR)',
                 'files': [
-                  '<(PRODUCT_DIR)/libGLEW.so',
-                  '<(PRODUCT_DIR)/libGLEW.so.1.5',
-                  '<(PRODUCT_DIR)/libGLEW.so.1.5.1',
                   "<(PRODUCT_DIR)/libCg.so",
                   "<(PRODUCT_DIR)/libCgGL.so",
                 ],
diff --git a/o3d/installer/installer.gyp b/o3d/installer/installer.gyp
index a511964..afbd0fd 100644
--- a/o3d/installer/installer.gyp
+++ b/o3d/installer/installer.gyp
@@ -29,7 +29,7 @@
             ],
           },
         ],
-        ['OS=="unix"',
+        ['OS=="linux"',
           {
             'dependencies': [
               'linux/installer.gyp:installer',
diff --git a/o3d/installer/linux/debian.in/changelog.in b/o3d/installer/linux/debian.in/changelog.in
new file mode 100644
index 0000000..5f53aee
--- /dev/null
+++ b/o3d/installer/linux/debian.in/changelog.in
@@ -0,0 +1,6 @@
+google-o3d (VERSION) unstable; urgency=low
+
+  * New upstream release.  For historical releases, please see
+  http://code.google.com/p/o3d/
+
+ -- Jeff Bailey <jeffbailey@google.com>  DATE
diff --git a/o3d/installer/linux/debian.in/compat b/o3d/installer/linux/debian.in/compat
new file mode 100644
index 0000000..1e8b314
--- /dev/null
+++ b/o3d/installer/linux/debian.in/compat
@@ -0,0 +1 @@
+6
diff --git a/o3d/installer/linux/debian_i386/control b/o3d/installer/linux/debian.in/control
index f9c6614..53c67a4 100644
--- a/o3d/installer/linux/debian_i386/control
+++ b/o3d/installer/linux/debian.in/control
@@ -1,13 +1,13 @@
 Source: google-o3d
-Section: non-free/web
-Priority: optional
 Maintainer: Tristan Schmelcher <tschmelcher@google.com>
-Build-Depends: debhelper (>= 4.0.0), cdbs (>=0.4.34ubuntu4)
-Standards-Version: 3.7.2
+Build-Depends-Indep: debhelper (>= 5), cdbs
+Priority: optional
+Section: web
+Standards-Version: 3.7.3
 
 Package: google-o3d
-Architecture: i386
-Depends: libc6, libstdc++6, libgcc1, zlib1g, libglew1.5
+Architecture: any
+Depends: ${shlibs:Depends}
 Conflicts: o3d-plugin
 Replaces: o3d-plugin
 Description: Google O3D Plugin
@@ -17,7 +17,7 @@ Description: Google O3D Plugin
  This package provides the NPAPI browser plugin for running O3D-based web apps.
 
 Package: google-o3d-dbgsym
-Architecture: i386
+Architecture: any
 Depends: google-o3d (= ${Source-Version})
 Description: Google O3D Plugin Debug Symbols
  O3D is an open-source web API for creating rich, interactive 3D applications in
diff --git a/o3d/installer/linux/debian.in/copyright b/o3d/installer/linux/debian.in/copyright
new file mode 100644
index 0000000..37e8e65
--- /dev/null
+++ b/o3d/installer/linux/debian.in/copyright
@@ -0,0 +1,7 @@
+This package was debianized by Jeff Bailey <jeffbailey@google.com> on
+Wed, 20 Jan 2010 14:19:30 -0500
+
+Copyright (C) 2010 Google, Inc. under the terms of the new BSD license.
+
+On Debian systems, the complete text of the BSD License can be found in the
+file /usr/share/common-licenses/BSD
diff --git a/o3d/installer/linux/debian.in/debian.gyp b/o3d/installer/linux/debian.in/debian.gyp
new file mode 100644
index 0000000..f5aa0ec
--- /dev/null
+++ b/o3d/installer/linux/debian.in/debian.gyp
@@ -0,0 +1,101 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'includes': [
+    '../../../build/common.gypi',
+  ],
+  'variables': {
+    'O3D_PLUGIN_VERSION':
+        '<!(python ../../../plugin/version_info.py --version)',
+    'INSTALLER_DIR': '<(PRODUCT_DIR)/installer',
+    'DEBIAN_DIR': '<(INSTALLER_DIR)/debian',
+  },
+  'conditions': [
+    [ 'target_arch=="x64"',
+      {
+        'variables': { 'ARCH': 'amd64' }
+      },
+      {
+        'variables': { 'ARCH': 'i386' }
+      },
+    ],
+  ],
+  'targets': [
+    {
+      'target_name': 'debian',
+      'dependencies': [
+        '../../../build/libs.gyp:cg_libs',
+        '../../../plugin/plugin.gyp:npo3dautoplugin',
+      ],
+      'type': 'none',
+      'copies': [
+        {
+          'destination': '<(DEBIAN_DIR)',
+          'files': [
+            'compat',
+            'control',
+            'copyright',
+            'google-o3d.install',
+            'google-o3d.links',
+            'google-o3d.lintian-overrides',
+            'rules',
+          ],
+        },
+      ],
+      'actions': [
+        {
+          'action_name': 'deb_mk_changelog',
+          'inputs': [
+            'changelog.in',
+            'mk_changelog.py',
+          ],
+          'outputs': [
+            '<(DEBIAN_DIR)/changelog',
+          ],
+          'action': [
+            'python',
+            'mk_changelog.py',
+            '--version=<(O3D_PLUGIN_VERSION)',
+            '--out=<(DEBIAN_DIR)/changelog',
+            '--in=changelog.in',
+          ],
+        },
+        {
+          'action_name': 'make_deb',
+          'inputs': [
+            '<(PRODUCT_DIR)/libnpo3dautoplugin.so',
+            '<(PRODUCT_DIR)/libCg.so',
+            '<(PRODUCT_DIR)/libCgGL.so',
+            '<(DEBIAN_DIR)/changelog',
+            '<(DEBIAN_DIR)/compat',
+            '<(DEBIAN_DIR)/control',
+            '<(DEBIAN_DIR)/copyright',
+            '<(DEBIAN_DIR)/google-o3d.install',
+            '<(DEBIAN_DIR)/google-o3d.links',
+            '<(DEBIAN_DIR)/google-o3d.lintian-overrides',
+            '<(DEBIAN_DIR)/rules',
+          ],
+          'action': [
+            'cd',
+            '<(INSTALLER_DIR)',
+            '&&',
+            'dpkg-buildpackage',
+            '-uc', # Don't sign the changes file
+            '-tc', # Clean the tree
+            '-b', # Don't produce a source build
+            '-a<(ARCH)',
+            '-rfakeroot',
+          ],
+          'outputs': [
+            '<(PRODUCT_DIR)/google-o3d_<(O3D_PLUGIN_VERSION)_<(ARCH).changes',
+            '<(PRODUCT_DIR)/google-o3d_<(O3D_PLUGIN_VERSION)_<(ARCH).deb',
+            '<(PRODUCT_DIR)/' +
+                'google-o3d-dbgsym_<(O3D_PLUGIN_VERSION)_<(ARCH).deb',
+          ],
+        },
+      ],
+    },
+  ],
+}
diff --git a/o3d/installer/linux/debian.in/google-o3d.install b/o3d/installer/linux/debian.in/google-o3d.install
new file mode 100644
index 0000000..5182bd3
--- /dev/null
+++ b/o3d/installer/linux/debian.in/google-o3d.install
@@ -0,0 +1,3 @@
+../libCgGL.so /opt/google/o3d/lib
+../libCg.so /opt/google/o3d/lib
+../libnpo3dautoplugin.so /opt/google/o3d
diff --git a/o3d/installer/linux/debian.in/google-o3d.links b/o3d/installer/linux/debian.in/google-o3d.links
new file mode 100644
index 0000000..229103d
--- /dev/null
+++ b/o3d/installer/linux/debian.in/google-o3d.links
@@ -0,0 +1,8 @@
+opt/google/o3d/libnpo3dautoplugin.so /usr/lib/mozilla/plugins/libnpo3dautoplugin.so
+opt/google/o3d/libnpo3dautoplugin.so /usr/lib/firefox/plugins/libnpo3dautoplugin.so
+opt/google/o3d/libnpo3dautoplugin.so /usr/lib/iceape/plugins/libnpo3dautoplugin.so
+opt/google/o3d/libnpo3dautoplugin.so /usr/lib/iceweasel/plugins/libnpo3dautoplugin.so
+opt/google/o3d/libnpo3dautoplugin.so /usr/lib/xulrunner/plugins/libnpo3dautoplugin.so
+opt/google/o3d/libnpo3dautoplugin.so /usr/lib/midbrowser/plugins/libnpo3dautoplugin.so
+opt/google/o3d/libnpo3dautoplugin.so /usr/lib/xulrunner-addons/plugins/libnpo3dautoplugin.so
+
diff --git a/o3d/installer/linux/debian.in/google-o3d.lintian-overrides b/o3d/installer/linux/debian.in/google-o3d.lintian-overrides
new file mode 100644
index 0000000..9c08475
--- /dev/null
+++ b/o3d/installer/linux/debian.in/google-o3d.lintian-overrides
@@ -0,0 +1,21 @@
+# We are not part of Debian/Ubuntu, so installing into /opt is correct.
+google-o3d: dir-or-file-in-opt opt/google/
+
+# We are not part of Debian/Ubuntu, so installing into /opt is correct.
+google-o3d: dir-or-file-in-opt opt/google/o3d/
+
+# We are not part of Debian/Ubuntu, so installing into /opt is correct.
+google-o3d: dir-or-file-in-opt opt/google/o3d/lib/
+
+# We are not part of Debian/Ubuntu, so installing into /opt is correct.
+google-o3d: dir-or-file-in-opt opt/google/o3d/lib/libCg.so
+
+# We are not part of Debian/Ubuntu, so installing into /opt is correct.
+google-o3d: dir-or-file-in-opt opt/google/o3d/lib/libCgGL.so
+
+# We are not part of Debian/Ubuntu, so installing into /opt is correct.
+google-o3d: dir-or-file-in-opt opt/google/o3d/lib/libnpo3dautoplugin.so
+
+# This is needed to find ourselves in /opt
+google-o3d: binary-or-shlib-defines-rpath ./opt/google/o3d/lib/libnpo3dautoplugin.so /opt/google/o3d/lib
+
diff --git a/o3d/installer/linux/debian.in/mk_changelog.py b/o3d/installer/linux/debian.in/mk_changelog.py
new file mode 100644
index 0000000..abebade0
--- /dev/null
+++ b/o3d/installer/linux/debian.in/mk_changelog.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python2.4
+#
+# Copyright 2010 Google Inc. All Rights Reserved.
+
+'''Makes a debian/changelog file from a template'''
+
+__author__ = 'jeffbailey@google.com (Jeff Bailey)'
+
+import optparse
+import os
+import subprocess
+import sys
+
+def GetOptionParser():
+  '''Constructs and configures an option parser for this script.
+
+  Returns:
+    An initalised OptionParser instance.
+  '''
+  parser = optparse.OptionParser('usage: %prog [options]')
+  parser.add_option('-v', '--version', dest='version',
+                    help='O3D version number')
+  parser.add_option('-i', '--in', dest='infile',
+                    help='Input file')
+  parser.add_option('-o', '--out', dest='outfile',
+                    help='Output file')
+  return parser
+
+def Main():
+  parser = GetOptionParser()
+  (options, args) = parser.parse_args()
+
+  version = options.version
+  outfile = options.outfile
+  infile = options.infile
+
+  if not version:
+    parser.error('Missing --version')
+
+  if not outfile:
+    parser.error('Missing --out')
+
+  if not infile:
+    parser.error('Missing --in')
+
+  deb_date = os.popen('date -R').read().rstrip()
+  sed_exp = "-e 's/VERSION/%s/' -e 's/DATE/%s/'" % (version, deb_date)
+
+  sed_cmd = '/bin/sed %s %s >%s' % (sed_exp, infile, outfile)
+
+  print sed_cmd
+  os.system(sed_cmd)
+
+if __name__ == '__main__':
+  sys.exit(Main())
diff --git a/o3d/installer/linux/debian.in/rules b/o3d/installer/linux/debian.in/rules
new file mode 100755
index 0000000..c30869b
--- /dev/null
+++ b/o3d/installer/linux/debian.in/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_DH_STRIP_ARGS=--dbg-package=google-o3d-dbgsym
+
+# Don't call ldconfig.  We're in /opt, which isn't supported.
+DEB_DH_MAKESHLIBS_ARGS_google-o3d := -n
+
+# This is needed on Hardy.  Lucid will remove this requirement.
+binary-install/google-o3d::
+	-dh_lintian -pgoogle-o3d
diff --git a/o3d/installer/linux/debian_amd64/control b/o3d/installer/linux/debian_amd64/control
deleted file mode 100644
index 08979cb..0000000
--- a/o3d/installer/linux/debian_amd64/control
+++ /dev/null
@@ -1,26 +0,0 @@
-Source: google-o3d
-Section: non-free/web
-Priority: optional
-Maintainer: Tristan Schmelcher <tschmelcher@google.com>
-Build-Depends: debhelper (>= 4.0.0), cdbs (>=0.4.34ubuntu4)
-Standards-Version: 3.7.2
-
-Package: google-o3d
-Architecture: amd64
-Depends: ia32-libs, libc6-i386, lib32stdc++6, lib32gcc1, lib32z1, nspluginwrapper
-Conflicts: o3d-plugin
-Replaces: o3d-plugin
-Description: Google O3D Plugin
- O3D is an open-source web API for creating rich, interactive 3D applications in
- the browser.
- .
- This package provides the NPAPI browser plugin for running O3D-based web apps.
-
-Package: google-o3d-dbgsym
-Architecture: amd64
-Depends: google-o3d (= ${Source-Version})
-Description: Google O3D Plugin Debug Symbols
- O3D is an open-source web API for creating rich, interactive 3D applications in
- the browser.
- .
- This package contains symbol files for debugging.
diff --git a/o3d/installer/linux/debian_amd64/google-o3d.install b/o3d/installer/linux/debian_amd64/google-o3d.install
deleted file mode 100644
index 5cec3dd..0000000
--- a/o3d/installer/linux/debian_amd64/google-o3d.install
+++ /dev/null
@@ -1,4 +0,0 @@
-libnpo3dautoplugin.so opt/google/o3d
-libGLEW.so.1.5 opt/google/o3d/lib
-libCg.so opt/google/o3d/lib
-libCgGL.so opt/google/o3d/lib
diff --git a/o3d/installer/linux/debian_amd64/postinst b/o3d/installer/linux/debian_amd64/postinst
deleted file mode 100755
index 3abad02..0000000
--- a/o3d/installer/linux/debian_amd64/postinst
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# postinst script for google-o3d
-
-set -e
-
-# Find out which Debian-derived distro this is.
-. /etc/lsb-release
-if test "$DISTRIB_ID" = Ubuntu; then
-  distro=Ubuntu
-else
-  distro=Other
-fi
-
-# The nspluginwrapper package in Ubuntu behaves differently from upstream. By
-# default it installs the wrapped plugin to multiple directories. -n must be
-# used to suppress this. Additionally, when using -n the directory that it
-# installs to is still different. Hence the logic here.
-if test $distro = Ubuntu; then
-  WRAPPED_PLUGIN_PATH="/usr/lib/nspluginwrapper/plugins/npwrapper.libnpo3dautoplugin.so"
-  APPS="iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons"
-  NSPW_OPTS="-n"
-else
-  WRAPPED_PLUGIN_PATH="/usr/lib/mozilla/plugins/npwrapper.libnpo3dautoplugin.so"
-  APPS="iceape iceweasel firefox xulrunner midbrowser xulrunner-addons"
-  NSPW_OPTS=""
-fi
-
-case "$1" in
-  configure)
-    if ! which nspluginwrapper 2>&1 > /dev/null; then
-      echo "Error: nspluginwrapper not found. Please run \`sudo apt-get install nspluginwrapper' or equivalent." >&2
-      exit 1
-    fi
-    # Install the wrapper.
-    nspluginwrapper $NSPW_OPTS -i /opt/google/o3d/libnpo3dautoplugin.so
-    if test ! -f $WRAPPED_PLUGIN_PATH; then
-      echo "Can't find where the wrapped plugin was installed to." >&2
-      exit 1
-    fi
-    # Symlink to everywhere.
-    for app in $APPS; do
-      ln -sf $WRAPPED_PLUGIN_PATH /usr/lib/$app/plugins/
-    done
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    echo "postinst called with argument \`$1'" >&2
-    exit 1
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/o3d/installer/linux/debian_amd64/prerm b/o3d/installer/linux/debian_amd64/prerm
deleted file mode 100755
index 44c9646..0000000
--- a/o3d/installer/linux/debian_amd64/prerm
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-# prerm script for google-o3d
-
-set -e
-
-# Find out which Debian-derived distro this is.
-. /etc/lsb-release
-if test "$DISTRIB_ID" = Ubuntu; then
-  distro=Ubuntu
-else
-  distro=Other
-fi
-
-# The nspluginwrapper package in Ubuntu behaves differently from upstream. By
-# default it installs the wrapped plugin to multiple directories. -n must be
-# used to suppress this. Additionally, when using -n the directory that it
-# installs to is still different. Hence the logic here.
-if test $distro = Ubuntu; then
-  WRAPPED_PLUGIN_PATH="/usr/lib/nspluginwrapper/plugins/npwrapper.libnpo3dautoplugin.so"
-  APPS="iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons"
-else
-  WRAPPED_PLUGIN_PATH="/usr/lib/mozilla/plugins/npwrapper.libnpo3dautoplugin.so"
-  APPS="iceape iceweasel firefox xulrunner midbrowser xulrunner-addons"
-fi
-
-case "$1" in
-  remove|upgrade|deconfigure)
-    # Remove the symlinks.
-    for app in $APPS; do
-      # Don't fail if it happens to not be there. User might have removed it
-      # themselves, for example.
-      rm -f /usr/lib/$app/plugins/npwrapper.libnpo3dautoplugin.so
-    done
-    if ! which nspluginwrapper 2>&1 > /dev/null; then
-      echo "Warning: nspluginwrapper not found. Some files may be left over." >&2
-    else
-      # Remove the wrapper. Again, don't fail.
-      nspluginwrapper -r $WRAPPED_PLUGIN_PATH || { echo "Warning: Unable to remove wrapped plugin. Some files may be left over." >&2; }
-    fi
-  ;;
-
-  failed-upgrade)
-    # Executing "old-prerm upgrade" failed. This gets called to take over.
-    # If it succeeds, the upgrade continues and postinst is later called.
-    # We don't want users to get stuck on an old version, so we always continue
-    # the upgrade.
-    echo "Warning: continuing upgrade even though old version wasn't successfully deconfigured" >&2
-  ;;
-
-  *)
-    echo "prerm called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/o3d/installer/linux/debian_amd64/rules b/o3d/installer/linux/debian_amd64/rules
deleted file mode 100755
index 508aab6..0000000
--- a/o3d/installer/linux/debian_amd64/rules
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-# Needed for dpkg-shlibdeps to be able to find the libraries we ship with so as
-# to properly calculate our shared library dependencies.
-export LD_LIBRARY_PATH=$(shell echo $$LD_LIBRARY_PATH:$$PWD)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-DEB_DH_STRIP_ARGS=--dbg-package=google-o3d-dbgsym
-
-# Workaround for Debian bug #364436
-DEB_DH_MAKESHLIBS_ARGS=-n
diff --git a/o3d/installer/linux/debian_common/changelog b/o3d/installer/linux/debian_common/changelog
deleted file mode 100644
index 47efedf..0000000
--- a/o3d/installer/linux/debian_common/changelog
+++ /dev/null
@@ -1,15 +0,0 @@
-google-o3d (0.1.40.0-1) UNRELEASED; urgency=low
-
-  * Install the 32-bit plugin too to support users that have a 32-bit browser
-    installed on a 64-bit OS (e.g., Swiftfox).
-  * Conflicts/replaces Ubuntu community-provided o3d-plugin from
-    https://launchpad.net/~ubuntu-webtech/+archive/o3d-daily
-  * Other miscellaneous improvements.
-
- -- tschmelcher <tschmelcher@google.com>  Fri, 17 Jul 2009 15:21:51 -0700
-
-google-o3d (0.1.39.0-1) UNRELEASED; urgency=low
-
-  * Initial package.
-
- -- tschmelcher <tschmelcher@google.com>  Tue, 30 Jun 2009 14:24:21 -0700
diff --git a/o3d/installer/linux/debian_common/links b/o3d/installer/linux/debian_common/links
deleted file mode 100644
index 54f1d70..0000000
--- a/o3d/installer/linux/debian_common/links
+++ /dev/null
@@ -1,7 +0,0 @@
-/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/iceape/plugins/libnpo3dautoplugin.so
-/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/iceweasel/plugins/libnpo3dautoplugin.so
-/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/mozilla/plugins/libnpo3dautoplugin.so
-/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/firefox/plugins/libnpo3dautoplugin.so
-/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/midbrowser/plugins/libnpo3dautoplugin.so
-/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/xulrunner/plugins/libnpo3dautoplugin.so
-/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/xulrunner-addons/plugins/libnpo3dautoplugin.so
diff --git a/o3d/installer/linux/debian_i386/google-o3d.install b/o3d/installer/linux/debian_i386/google-o3d.install
deleted file mode 100644
index d10e9e4..0000000
--- a/o3d/installer/linux/debian_i386/google-o3d.install
+++ /dev/null
@@ -1,3 +0,0 @@
-libnpo3dautoplugin.so opt/google/o3d
-libCg.so opt/google/o3d/lib
-libCgGL.so opt/google/o3d/lib
diff --git a/o3d/installer/linux/debian_i386/rules b/o3d/installer/linux/debian_i386/rules
deleted file mode 100755
index 152e73e..0000000
--- a/o3d/installer/linux/debian_i386/rules
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-
-# Needed for dpkg-shlibdeps to be able to find the libraries we ship with so as
-# to properly calculate our shared library dependencies.
-export LD_LIBRARY_PATH=$(shell echo $$LD_LIBRARY_PATH:$$PWD)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-DEB_DH_STRIP_ARGS=--dbg-package=google-o3d-dbgsym
-
-# For the 32-bit package, shlibdeps may not be able to find the three dependent
-# libraries because they aren't included in our package and we don't list them
-# as a build dependency (because we can't, since on a 64-bit system that would
-# be resolved with the 64-bit packages). So, we suppress errors for this case.
-DEB_DH_SHLIBDEPS_ARGS_ALL = -- --ignore-missing-info
diff --git a/o3d/installer/linux/installer.gyp b/o3d/installer/linux/installer.gyp
new file mode 100644
index 0000000..c09b045
--- /dev/null
+++ b/o3d/installer/linux/installer.gyp
@@ -0,0 +1,21 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'installer',
+      'type': 'none',
+      'conditions': [
+        [ '"<!(which dpkg-buildpackage || true)" != ""',
+          {
+            'dependencies': [
+              'debian.in/debian.gyp:debian',
+            ],
+          },
+        ],
+      ],
+    },
+  ],
+}
diff --git a/o3d/installer/win/o3d_version.py b/o3d/installer/win/o3d_version.py
index 5dff1ad..ed18ef1 100644
--- a/o3d/installer/win/o3d_version.py
+++ b/o3d/installer/win/o3d_version.py
@@ -2,5 +2,5 @@
 # Copyright 2008-9 Google Inc. All Rights Reserved.
 
 # version = (major, minor, trunk, patch)
-plugin_version = (0, 1, 43, 0)
+plugin_version = (0, 1, 43, 1)
 sdk_version = plugin_version