[Python-checkins] python/nondist/sandbox/Lib bdist_dpkg.py,1.1,1.2

[akuchling at users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv32091

Modified Files:
	bdist_dpkg.py 
Log Message:
If py_modules are specified, add site-packages to dirlist
Only generate postinst/prerm if .py files are being installed
Write 'Architecture:' line in control file (but how do I determine the 
   architecture?)
Uncomment spawn() call; oops!
Fix hard-wired version in rules template; oops again!


Index: bdist_dpkg.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/Lib/bdist_dpkg.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bdist_dpkg.py	21 Sep 2003 19:56:14 -0000	1.1
--- bdist_dpkg.py	23 Sep 2003 12:26:25 -0000	1.2
***************
*** 52,56 ****
          # build package
          log.info("building DPKG")
!         #self.spawn(["dpkg-buildpackage", "-rfakeroot"])
  
      # run()
--- 52,56 ----
          # build package
          log.info("building DPKG")
!         self.spawn(["dpkg-buildpackage", "-rfakeroot"])
  
      # run()
***************
*** 66,79 ****
              os.mkdir('debian')
  
          dirlist = ""
!         for i in self.distribution.packages:
              dir = i 
              dirlist += ' ' + dir
  
!         dist = self.distribution
!         package_name = dist.get_name().lower()
          d = {'name':dist.get_name(),
               'package_name':package_name, 
!              'pyversion': '%i.%i' % sys.version_info[0:2],
               'dirlist':dirlist,
               'marker':MARKER_STRING,
--- 66,87 ----
              os.mkdir('debian')
  
+         dist = self.distribution
          dirlist = ""
!         if dist.has_pure_modules():
!             dirlist += '""'
!         
!         for i in dist.packages or []:
              dir = i 
              dirlist += ' ' + dir
  
!         pyversion = '%i.%i' % sys.version_info[0:2]
!         # Temporary hack to build everything with 2.2 --
!         # I'm running out of the CVS trunk, but don't have it
!         # installed as python2.4.
!         ##pyversion = '2.2'
!         package_name = 'python%s-%s' % (pyversion, dist.get_name().lower())
          d = {'name':dist.get_name(),
               'package_name':package_name, 
!              'pyversion': pyversion,
               'dirlist':dirlist,
               'marker':MARKER_STRING,
***************
*** 92,96 ****
  
          if not self._is_user_file('control') or True:
-             dist = self.distribution
              log.info('writing control file')
              output = self._write_file('control')
--- 100,103 ----
***************
*** 105,112 ****
--- 112,126 ----
  """)
              output.write('\n')          # Separator line
+             
              output.write("Package: %s\n" % package_name)
              output.write("""Section: libs
  Architecture: all\n""")
              output.write("Depends: python%(pyversion)s\n" % d)
+             if dist.has_ext_modules():
+                 # XXX how do I figure out the right architecture?
+                 output.write('Architecture: i386\n')
+             else:
+                 output.write('Architecture: all\n')
+ 
              output.write("Description: %s\n" % dist.get_description())
              s = dist.get_long_description()
***************
*** 115,128 ****
              output.close()
              
!         if not self._is_user_file('postinst'):
              log.info('writing postinst file')
              output = self._write_file('postinst')
              output.write(POSTINST_FILE % d)
              output.close()
!         if not self._is_user_file('prerm'):
              log.info('writing prerm file')
              output = self._write_file('prerm')
              output.write(PRERM_FILE % d)
              output.close()
          if not self._is_user_file('rules'):
              log.info('writing rules file')
--- 129,143 ----
              output.close()
              
!         if dist.has_pure_modules() and not self._is_user_file('postinst'):
              log.info('writing postinst file')
              output = self._write_file('postinst')
              output.write(POSTINST_FILE % d)
              output.close()
!         if dist.has_pure_modules() and not self._is_user_file('prerm'):
              log.info('writing prerm file')
              output = self._write_file('prerm')
              output.write(PRERM_FILE % d)
              output.close()
+             
          if not self._is_user_file('rules'):
              log.info('writing rules file')
***************
*** 240,244 ****
  
  build: build-stamp
! 	/usr/bin/python2.2 setup.py build
  build-stamp: 
  	touch build-stamp
--- 255,259 ----
  
  build: build-stamp
! 	/usr/bin/python%(pyversion)s setup.py build
  build-stamp: 
  	touch build-stamp