diff -Nru python-support-1.0.14ubuntu1/debhelper/dh_pysupport python-support-1.0.14ubuntu2/debhelper/dh_pysupport --- python-support-1.0.14ubuntu1/debhelper/dh_pysupport 2011-10-21 20:34:38.000000000 +0000 +++ python-support-1.0.14ubuntu2/debhelper/dh_pysupport 2011-10-21 20:29:04.000000000 +0000 @@ -63,13 +63,6 @@ them from byte-compilation. You may use this option multiple times to build up a list of things to exclude. -=item B<--prefix> - -Install your package into a non-standard directory. The default prefix is -/usr, but when provided, the alternative prefix is passed to any other utility -as needed. --prefix is used for example, by Quickly to install modules into -/opt/extras.ubuntu.com/-version/ - =back =head1 CONFORMS TO @@ -78,9 +71,7 @@ =cut -init(options => { - "prefix=s" => \$dh{PREFIX}, -}); +init(); warning("This program is deprecated, you should use dh_python2 instead. Migration guide: http://deb.li/dhs2p"); @@ -142,12 +133,6 @@ my @debian_pysupported = split(/ /, `/usr/bin/pyversions -sv`); chomp @debian_pysupported; -# Use a prefix for private and public modules if set -my $prefix = '/usr'; -if($dh{PREFIX}) { - $prefix = $dh{PREFIX}; -} - my $privdir="/usr/share/python-support/private"; # All supported versions my $allversions_string=`$privdir/parseversions --all`; @@ -176,7 +161,6 @@ # on python one way or another. my @specified_deps = specified_deps_in_package ($package); my $do_scripts = ""; - my $postinst_do_scripts = ""; # 1) Handle public python modules # Move them to the python-support directories @@ -198,18 +182,13 @@ } } if ($versions) { - doit (("$privdir/movemodules", "--prefix", $prefix,"-V", $versions, $tmp)) + doit (("$privdir/movemodules","-V", $versions, $tmp)) } else { - doit (("$privdir/movemodules", "--prefix", $prefix, $tmp)); - } - if ($dh{PREFIX}) { - $do_scripts = "--prefix=$prefix"; - # activate manually what is normally a trigger - $postinst_do_scripts = "update-python-modules --prefix=$prefix --post-install"; + doit (("$privdir/movemodules",$tmp)); } # Then look for what the script found - foreach my $list_file (glob("$tmp$prefix/share/python-support/*.public")) { + foreach my $list_file (glob("$tmp/usr/share/python-support/*.public")) { if (-f $list_file) { my $supported=`$privdir/parseversions --minmax $list_file`; @@ -271,8 +250,8 @@ } # 2) Look for private python modules - my @dirs = ("$prefix/lib/$package", "$prefix/share/$package", - "$prefix/lib/games/$package", "$prefix/share/games/$package", @ARGV ); + my @dirs = ("/usr/lib/$package", "/usr/share/$package", + "/usr/lib/games/$package", "/usr/share/games/$package", @ARGV ); @dirs = grep -d, map "$tmp$_", @dirs; my @filelist; my $file; @@ -318,9 +297,9 @@ # We have private python modules # Use python-support to ensure that they are always # byte-compiled for the current version - doit("mkdir", "-p", "-m", "755", "$tmp$prefix/share/python-support"); - open(FILELIST, "> $tmp$prefix/share/python-support/$package.private") || - error("Can't create $tmp$prefix/share/python-support/$package.private: $!"); + doit("mkdir", "-p", "-m", "755", "$tmp/usr/share/python-support"); + open(FILELIST, "> $tmp/usr/share/python-support/$package.private") || + error("Can't create $tmp/usr/share/python-support/$package.private: $!"); if ( $useversion ) { print FILELIST "pyversion=$useversion\n\n"; } @@ -330,7 +309,7 @@ } # 3) Add python-support dependency depending on what we found - if (-d "$tmp$prefix/share/python-support") { + if (-d "$tmp/usr/share/python-support") { addsubstvar($package, "python:Depends", "python-support (>= 0.90.0)"); } @@ -386,11 +365,8 @@ # 6) Generate the scripts if ($do_scripts && ! $dh{NOSCRIPTS}) { - autoscript($package, "prerm", "prerm-python-support", "s,#ARGS#,$do_scripts,"); - if ($postinst_do_scripts) { - $do_scripts = "$do_scripts \\&\\& $postinst_do_scripts"; - } autoscript($package, "postinst", "postinst-python-support", "s,#ARGS#,$do_scripts,"); + autoscript($package, "prerm", "prerm-python-support", "s,#ARGS#,$do_scripts,"); } } diff -Nru python-support-1.0.14ubuntu1/debian/changelog python-support-1.0.14ubuntu2/debian/changelog --- python-support-1.0.14ubuntu1/debian/changelog 2011-10-21 20:36:21.000000000 +0000 +++ python-support-1.0.14ubuntu2/debian/changelog 2011-10-21 21:18:42.000000000 +0000 @@ -1,3 +1,10 @@ +python-support (1.0.14ubuntu2) precise; urgency=low + + * Based on IRC discussion, manually sync to Debian 1.0.14, dropping the + Ubuntu delta. After next Debian upload, please resync for real. + + -- Barry Warsaw Fri, 21 Oct 2011 17:18:35 -0400 + python-support (1.0.14ubuntu1) precise; urgency=low * Merge with Debian testing. Remaining Ubuntu changes: diff -Nru python-support-1.0.14ubuntu1/debian/control python-support-1.0.14ubuntu2/debian/control --- python-support-1.0.14ubuntu1/debian/control 2011-10-21 20:34:55.000000000 +0000 +++ python-support-1.0.14ubuntu2/debian/control 2011-10-21 21:19:13.000000000 +0000 @@ -1,7 +1,7 @@ Source: python-support Section: python Priority: optional -Maintainer: Ubuntu Core Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Josselin Mouette Uploaders: Bernd Zeimetz , Piotr Ożarowski Build-Depends: debhelper (>= 7), cdbs diff -Nru python-support-1.0.14ubuntu1/movemodules python-support-1.0.14ubuntu2/movemodules --- python-support-1.0.14ubuntu1/movemodules 2011-10-21 20:28:13.000000000 +0000 +++ python-support-1.0.14ubuntu2/movemodules 2011-10-21 20:29:04.000000000 +0000 @@ -8,25 +8,21 @@ import os,os.path,re,sys from hashlib import md5 +sourcepath='usr/share/python-support' +modulepath='usr/share/pyshared' +extensionpath='usr/lib/pyshared' +installedpath='usr/lib/pymodules' + parser = OptionParser(usage="usage: %prog [options] [directory [...]]") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", help="verbose output", default=False) parser.add_option("-p", "--package", dest="package") -parser.add_option("--prefix", action="store", dest="prefix", - help="choose a prefix different than /usr (default)", - default='/usr') parser.add_option("-V", "--version-info", dest="version") (options, args) = parser.parse_args() -prefix = options.prefix[1:] -sourcepath='%s/share/python-support' % prefix -modulepath='%s/share/pyshared' % prefix -extensionpath='%s/lib/pyshared' % prefix -installedpath='%s/lib/pymodules' % prefix - -sys.path.append("%s/share/python-support/private/" % prefix) +sys.path.append("/usr/share/python-support/private/") from pysupport import py_supported,py_supported_short # Set the umask so that directories are created with correct permissions @@ -75,9 +71,9 @@ if not os.path.isabs (linkdest): linkdest = os.path.normpath(os.path.join(os.path.dirname(source),linkdest)) if not linkdest.startswith(sourcedir+'/'): - renameprefix = os.path.dirname(os.path.commonprefix((linkdest, destination))) - linkdest = os.path.normpath(destination)[len(renameprefix)+1:].count('/') * '../' + \ - linkdest[len(renameprefix)+1:] + prefix = os.path.dirname(os.path.commonprefix((linkdest, destination))) + linkdest = os.path.normpath(destination)[len(prefix)+1:].count('/') * '../' + \ + linkdest[len(prefix)+1:] destdir = os.path.dirname(destination) if not os.path.isdir (destdir): os.makedirs (destdir) @@ -195,18 +191,18 @@ # movemodules was already run, do nothing sys.exit(0) - # /share/pyshared (files installed by hand) + # /usr/share/pyshared (files installed by hand) files = do_listonly (basedir) - # /lib/pythonX.Y/site-packages (python <= 2.5) - # /lib/pythonX.Y/dist-packages (python >= 2.6 with deb layout) - # /local/lib/pythonX.Y/dist-packages (python >= 2.6 without deb layout) - do_eggrename (basedir, "%s/lib" % prefix, "site-packages") - do_eggrename (basedir, "%s/lib" % prefix, "dist-packages") - do_eggrename (basedir, "%s/local/lib" % prefix, "dist-packages") - files2, pyversions = do_move (basedir, [("%s/lib" % prefix, "site-packages"), - ("%s/lib" % prefix, "dist-packages"), - ("%s/local/lib" % prefix, "dist-packages")]) + # /usr/lib/pythonX.Y/site-packages (python <= 2.5) + # /usr/lib/pythonX.Y/dist-packages (python >= 2.6 with deb layout) + # /usr/local/lib/pythonX.Y/dist-packages (python >= 2.6 without deb layout) + do_eggrename (basedir, "usr/lib", "site-packages") + do_eggrename (basedir, "usr/lib", "dist-packages") + do_eggrename (basedir, "usr/local/lib", "dist-packages") + files2, pyversions = do_move (basedir, [("usr/lib", "site-packages"), + ("usr/lib", "dist-packages"), + ("usr/local/lib", "dist-packages")]) files.update(files2) # /var/lib/python-support/pythonX.Y @@ -215,17 +211,17 @@ files.update(files2) pyversions.update(pyversions2) - # /lib/pymodules/pythonX.Y + # /usr/lib/pymodules/pythonX.Y do_eggrename (basedir, extensionpath) files2, pyversions2 = do_move (basedir, [(installedpath, "")]) files.update(files2) pyversions.update(pyversions2) - # /share/python-support/$package - if os.path.isdir(os.path.join(basedir, "%s/share/python-support" % prefix)): - for ent in os.listdir(os.path.join(basedir, "%s/share/python-support" % prefix)): - if os.path.isdir(os.path.join(basedir, "%s/share/python-support" % prefix, ent)): - files.update(do_simple_move(basedir, os.path.join("%s/share/python-support" % prefix, ent))) + # /usr/share/python-support/$package + if os.path.isdir(os.path.join(basedir,"usr/share/python-support")): + for ent in os.listdir(os.path.join(basedir,"usr/share/python-support")): + if os.path.isdir(os.path.join(basedir, "usr/share/python-support", ent)): + files.update(do_simple_move(basedir, os.path.join("usr/share/python-support", ent))) if files: if not os.path.isdir(os.path.join(basedir,sourcepath)): diff -Nru python-support-1.0.14ubuntu1/update-python-modules python-support-1.0.14ubuntu2/update-python-modules --- python-support-1.0.14ubuntu1/update-python-modules 2011-10-21 20:34:38.000000000 +0000 +++ python-support-1.0.14ubuntu2/update-python-modules 2011-10-21 20:29:04.000000000 +0000 @@ -16,6 +16,11 @@ import pysupport from pysupport import py_supported,py_installed,py_oldversions +basepath='/usr/lib/pymodules' +sourcepath='/usr/share/python-support' +old_extensionpath='/usr/lib/python-support' +shared_path='/usr/share/pyshared' +shared_extensionpath='/usr/lib/pyshared' parser = OptionParser(usage="usage: %prog [-v] [-c] package_directory [...]\n"+ " %prog [-v] [-c] package.dirs [...]\n"+ @@ -40,17 +45,8 @@ parser.add_option("-i", "--install", action="store_true", dest="force_public", help="[deprecated] installation mode: only handle public modules", default=False) -parser.add_option("--prefix", action="store", dest="prefix", - help="choose a prefix different than /usr (default)", - default='/usr') (options, args) = parser.parse_args() -basepath='%s/lib/pymodules' % options.prefix -sourcepath='%s/share/python-support' % options.prefix -old_extensionpath='%s/lib/python-support' % options.prefix -shared_path='%s/share/pyshared' % options.prefix -shared_extensionpath='%s/lib/pyshared' % options.prefix - def debug(x): if(options.verbose): print x