old_contents: # Copyright 2014 Google Inc. All rights reserved.
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  #
  #     http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
  from distutils.core import setup
  
  setup(
      name = 'adb',
      packages = ['adb'],
      version = '1.1.0',
      author = 'Fahrzin Hemmati',
      author_email = 'fahhem@gmail.com',
      maintainer = 'alusco@google.com',
      maintainer_email = 'Alex Lusco',
      url = 'https://github.com/google/python-adb',
      description = 'A pure python implementation of the Android ADB and Fastboot protocols',
      long_description = '''
  This repository contains a pure-python implementation of the Android
  ADB and Fastboot protocols, using libusb1 for USB communications.
  
  This is a complete replacement and rearchitecture of the Android
  project's ADB and fastboot code available at
  https://github.com/android/platform_system_core/tree/master/adb
  
  This code is mainly targeted to users that need to communicate with
  Android devices in an automated fashion, such as in automated
  testing. It does not have a daemon between the client and the device,
  and therefore does not support multiple simultaneous commands to the
  same device. It does support any number of devices and never
  communicates with a device that it wasn't intended to, unlike the
  Android project's ADB.
  ''',
  
      keywords = ['android', 'adb', 'fastboot'],
  
      requires = ['gflags', 'libusb1', 'M2Crypto'],
  
  ## classifier list https://pypi.python.org/pypi?:action=list_classifiers
      classifiers = [
          'Development Status :: 4 - Beta',
          'License :: OSI Approved :: Apache Software License',
          'Programming Language :: Python',
          #'Programming Language :: Python :: 3', ## import cStringIO fails with python3
          'Topic :: Software Development :: Testing'
          ]
  )
  
new_contents: # Copyright 2014 Google Inc. All rights reserved.
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  #
  #     http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
  from distutils.core import setup
  
  setup(
      name = 'adb',
      packages = ['adb'],
      version = '1.1.0',
      author = 'Fahrzin Hemmati',
      author_email = 'fahhem@gmail.com',
      maintainer = 'Alex Lusco',
      maintainer_email = 'alusco@google.com',
      url = 'https://github.com/google/python-adb',
      description = 'A pure python implementation of the Android ADB and Fastboot protocols',
      long_description = '''
  This repository contains a pure-python implementation of the Android
  ADB and Fastboot protocols, using libusb1 for USB communications.
  
  This is a complete replacement and rearchitecture of the Android
  project's ADB and fastboot code available at
  https://github.com/android/platform_system_core/tree/master/adb
  
  This code is mainly targeted to users that need to communicate with
  Android devices in an automated fashion, such as in automated
  testing. It does not have a daemon between the client and the device,
  and therefore does not support multiple simultaneous commands to the
  same device. It does support any number of devices and never
  communicates with a device that it wasn't intended to, unlike the
  Android project's ADB.
  ''',
  
      keywords = ['android', 'adb', 'fastboot'],
  
      requires = ['python-gflags', 'libusb1', 'M2Crypto'],
  
  ## classifier list https://pypi.python.org/pypi?:action=list_classifiers
      classifiers = [
          'Development Status :: 4 - Beta',
          'License :: OSI Approved :: Apache Software License',
          'Programming Language :: Python',
          #'Programming Language :: Python :: 3', ## import cStringIO fails with python3
          'Topic :: Software Development :: Testing'
          ]
  )
  
subject: Fix setup.py typos