From db324f5f810bfb09095773c6095604852ef4054f Mon Sep 17 00:00:00 2001
From: Kazuki Przyborowski <kazuki.przyborowski@gmail.com>
Date: Mon, 6 Jun 2016 22:08:42 -0500
Subject: [PATCH] Another small update to pkgbuild.

---
 pkgbuild/archlinux/python2/pypac-gen.py |  5 +++++
 pkgbuild/archlinux/python3/pypac-gen.py |  5 +++++
 pkgbuild/debian/python2/pydeb-gen.py    | 16 ++++++++++++++--
 pkgbuild/debian/python3/pydeb-gen.py    | 16 ++++++++++++++--
 pkgbuild/ubuntu/python2/pydeb-gen.py    | 16 ++++++++++++++--
 pkgbuild/ubuntu/python3/pydeb-gen.py    | 16 ++++++++++++++--
 6 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/pkgbuild/archlinux/python2/pypac-gen.py b/pkgbuild/archlinux/python2/pypac-gen.py
index 7bbe53f..82879ec 100644
--- a/pkgbuild/archlinux/python2/pypac-gen.py
+++ b/pkgbuild/archlinux/python2/pypac-gen.py
@@ -28,6 +28,11 @@ proname = "pypac-gen";
 prover = __version__;
 profullname = proname+" "+prover;
 
+def which_exec(execfile):
+ for path in os.environ["PATH"].split(":"):
+  if os.path.exists(path + "/" + execfile):
+   return path + "/" + execfile;
+
 parser = argparse.ArgumentParser(conflict_handler = "resolve", add_help = True);
 parser.add_argument("-v", "--version", action = "version", version = profullname);
 parser.add_argument("-s", "--source", default = os.path.realpath(os.getcwd()), help = "source dir");
diff --git a/pkgbuild/archlinux/python3/pypac-gen.py b/pkgbuild/archlinux/python3/pypac-gen.py
index ba8cf1d..58dcd9d 100644
--- a/pkgbuild/archlinux/python3/pypac-gen.py
+++ b/pkgbuild/archlinux/python3/pypac-gen.py
@@ -28,6 +28,11 @@ proname = "pypac-gen";
 prover = __version__;
 profullname = proname+" "+prover;
 
+def which_exec(execfile):
+ for path in os.environ["PATH"].split(":"):
+  if os.path.exists(path + "/" + execfile):
+   return path + "/" + execfile;
+
 parser = argparse.ArgumentParser(conflict_handler = "resolve", add_help = True);
 parser.add_argument("-v", "--version", action = "version", version = profullname);
 parser.add_argument("-s", "--source", default = os.path.realpath(os.getcwd()), help = "source dir");
diff --git a/pkgbuild/debian/python2/pydeb-gen.py b/pkgbuild/debian/python2/pydeb-gen.py
index 3e075f7..e43396f 100755
--- a/pkgbuild/debian/python2/pydeb-gen.py
+++ b/pkgbuild/debian/python2/pydeb-gen.py
@@ -29,6 +29,11 @@ prover = __version__;
 profullname = proname+" "+prover;
 buildsystem = "pybuild";
 
+def which_exec(execfile):
+ for path in os.environ["PATH"].split(":"):
+  if os.path.exists(path + "/" + execfile):
+   return path + "/" + execfile;
+
 distvertoupname = {'10.0': "Buster", '9.0': "Stretch", '8.0': "Jessie", '7.0': "Wheezy", '6.0': "Squeeze", '5.0': "Lenny", '4.0': "Etch", '3.1': "Sarge", '3.0': "Woody", '2.2': "Potato", '2.1': "Slink", '2.0': "Hamm", '1.3': "Bo", '1.2': "Rex", '1.1': "Buzz", '0.0': "Sid"};
 distvertoname = {'10.0': "buster", '9.0': "stretch", '8.0': "jessie", '7.0': "wheezy", '6.0': "squeeze", '5.0': "lenny", '4.0': "etch", '3.1': "sarge", '3.0': "woody", '2.2': "potato", '2.1': "slink", '2.0': "hamm", '1.3': "bo", '1.2': "rex", '1.1': "buzz", '0.0': "sid"};
 distnamelist = distvertoname.values();
@@ -88,6 +93,13 @@ standverdata = standverfile.read();
 standverfile.close();
 getstandver = re.findall("([0-9]\.[0-9]\.[0-9])\s+([0-9]+)", standverdata);
 getcurstandver = getstandver[0][0];
+dpkglocatout = which_exec("dpkg");
+pydpkglistp = subprocess.Popen([dpkglocatout, "-s", "debhelper"], stdout=subprocess.PIPE, stderr=subprocess.PIPE);
+pydpkgout, pydpkgerr = pydpkglistp.communicate();
+if(sys.version[0]=="3"):
+ pydpkgout = pydpkgout.decode("utf-8");
+pydpkg_esc = re.escape("Version:")+'\s+([0-9])'+re.escape(".");
+pydpkg_val = re.findall(pydpkg_esc, pydpkgout)[0];
 
 if(sys.version[0]=="2"):
  pkgsource = "py2motherless";
@@ -95,7 +107,7 @@ if(sys.version[0]=="3"):
  pkgsource = "py3motherless";
 pkgupstreamname = "PyMotherless";
 pkgveralt = str(setuppy_verinfo[0])+"."+str(setuppy_verinfo[1])+"."+str(setuppy_verinfo[2]);
-pkgver = str(pkgveralt)+"rc"+str(setuppy_verinfo[4])+"~"+getargs.codename+str(distnametover.get(getargs.codename, "1").replace(".", ""));
+pkgver = str(pkgveralt)+"~rc"+str(setuppy_verinfo[4])+"~"+getargs.codename+str(distnametover.get(getargs.codename, "1").replace(".", ""));
 pkgdistname = getargs.codename;
 pkgurgency = "urgency=low";
 pkgauthorname = setuppy_author;
@@ -168,7 +180,7 @@ os.chmod(debpkg_changelog_file, int("0644", 8));
 
 debpkg_compat_file = os.path.realpath(debpkg_debian_dir+os.path.sep+"compat");
 print("generating file "+debpkg_compat_file);
-debpkg_string_temp = "9\n";
+debpkg_string_temp = str(pydpkg_val)+"\n";
 debpkg_file_temp = open(debpkg_compat_file, "w");
 debpkg_file_temp.write(debpkg_string_temp);
 debpkg_file_temp.close();
diff --git a/pkgbuild/debian/python3/pydeb-gen.py b/pkgbuild/debian/python3/pydeb-gen.py
index 9ceb4a6..f9a4088 100755
--- a/pkgbuild/debian/python3/pydeb-gen.py
+++ b/pkgbuild/debian/python3/pydeb-gen.py
@@ -29,6 +29,11 @@ prover = __version__;
 profullname = proname+" "+prover;
 buildsystem = "pybuild";
 
+def which_exec(execfile):
+ for path in os.environ["PATH"].split(":"):
+  if os.path.exists(path + "/" + execfile):
+   return path + "/" + execfile;
+
 distvertoupname = {'10.0': "Buster", '9.0': "Stretch", '8.0': "Jessie", '7.0': "Wheezy", '6.0': "Squeeze", '5.0': "Lenny", '4.0': "Etch", '3.1': "Sarge", '3.0': "Woody", '2.2': "Potato", '2.1': "Slink", '2.0': "Hamm", '1.3': "Bo", '1.2': "Rex", '1.1': "Buzz", '0.0': "Sid"};
 distvertoname = {'10.0': "buster", '9.0': "stretch", '8.0': "jessie", '7.0': "wheezy", '6.0': "squeeze", '5.0': "lenny", '4.0': "etch", '3.1': "sarge", '3.0': "woody", '2.2': "potato", '2.1': "slink", '2.0': "hamm", '1.3': "bo", '1.2': "rex", '1.1': "buzz", '0.0': "sid"};
 distnamelist = distvertoname.values();
@@ -88,6 +93,13 @@ standverdata = standverfile.read();
 standverfile.close();
 getstandver = re.findall("([0-9]\.[0-9]\.[0-9])\s+([0-9]+)", standverdata);
 getcurstandver = getstandver[0][0];
+dpkglocatout = which_exec("dpkg");
+pydpkglistp = subprocess.Popen([dpkglocatout, "-s", "debhelper"], stdout=subprocess.PIPE, stderr=subprocess.PIPE);
+pydpkgout, pydpkgerr = pydpkglistp.communicate();
+if(sys.version[0]=="3"):
+ pydpkgout = pydpkgout.decode("utf-8");
+pydpkg_esc = re.escape("Version:")+'\s+([0-9])'+re.escape(".");
+pydpkg_val = re.findall(pydpkg_esc, pydpkgout)[0];
 
 if(sys.version[0]=="2"):
  pkgsource = "py2motherless";
@@ -95,7 +107,7 @@ if(sys.version[0]=="3"):
  pkgsource = "py3motherless";
 pkgupstreamname = "PyMotherless";
 pkgveralt = str(setuppy_verinfo[0])+"."+str(setuppy_verinfo[1])+"."+str(setuppy_verinfo[2]);
-pkgver = str(pkgveralt)+"rc"+str(setuppy_verinfo[4])+"~"+getargs.codename+str(distnametover.get(getargs.codename, "1").replace(".", ""));
+pkgver = str(pkgveralt)+"~rc"+str(setuppy_verinfo[4])+"~"+getargs.codename+str(distnametover.get(getargs.codename, "1").replace(".", ""));
 pkgdistname = getargs.codename;
 pkgurgency = "urgency=low";
 pkgauthorname = setuppy_author;
@@ -168,7 +180,7 @@ os.chmod(debpkg_changelog_file, int("0644", 8));
 
 debpkg_compat_file = os.path.realpath(debpkg_debian_dir+os.path.sep+"compat");
 print("generating file "+debpkg_compat_file);
-debpkg_string_temp = "9\n";
+debpkg_string_temp = str(pydpkg_val)+"\n";
 debpkg_file_temp = open(debpkg_compat_file, "w");
 debpkg_file_temp.write(debpkg_string_temp);
 debpkg_file_temp.close();
diff --git a/pkgbuild/ubuntu/python2/pydeb-gen.py b/pkgbuild/ubuntu/python2/pydeb-gen.py
index fcc5be3..bf446fe 100755
--- a/pkgbuild/ubuntu/python2/pydeb-gen.py
+++ b/pkgbuild/ubuntu/python2/pydeb-gen.py
@@ -29,6 +29,11 @@ prover = __version__;
 profullname = proname+" "+prover;
 buildsystem = "pybuild";
 
+def which_exec(execfile):
+ for path in os.environ["PATH"].split(":"):
+  if os.path.exists(path + "/" + execfile):
+   return path + "/" + execfile;
+
 distupnametover = {'Warty': "4.10", 'Hoary': "5.04", 'Breezy': "5.10", 'Dapper': "6.06", 'Edgy': "6.10", 'Feisty': "7.04", 'Gutsy': "7.10", 'Hardy': "8.04", 'Intrepid': "8.10", 'Jaunty': "9.04", 'Karmic': "9.10", 'Lucid': "10.04", 'Maverick': "10.10", 'Natty': "11.04", 'Oneiric': "11.10", 'Precise': "12.04", 'Quantal': "12.10", 'Raring': "13.04", 'Saucy': "13.10", 'Trusty': "14.04", 'Utopic': "14.10", 'Vivid': "15.04", 'Wily': "15.10", 'Xenial': "16.04", 'Yakkety': "16.10"};
 distnametover = {'warty': "4.10", 'hoary': "5.04", 'breezy': "5.10", 'dapper': "6.06", 'edgy': "6.10", 'feisty': "7.04", 'gutsy': "7.10", 'hardy': "8.04", 'intrepid': "8.10", 'jaunty': "9.04", 'karmic': "9.10", 'lucid': "10.04", 'maverick': "10.10", 'natty': "11.04", 'oneiric': "11.10", 'precise': "12.04", 'quantal': "12.10", 'raring': "13.04", 'saucy': "13.10", 'trusty': "14.04", 'utopic': "14.10", 'vivid': "15.04", 'wily': "15.10", 'xenial': "16.04", 'yakkety': "16.10"};
 distnamelist = distnametover.keys();
@@ -103,6 +108,13 @@ standverdata = standverfile.read();
 standverfile.close();
 getstandver = re.findall("([0-9]\.[0-9]\.[0-9])\s+([0-9]+)", standverdata);
 getcurstandver = getstandver[0][0];
+dpkglocatout = which_exec("dpkg");
+pydpkglistp = subprocess.Popen([dpkglocatout, "-s", "debhelper"], stdout=subprocess.PIPE, stderr=subprocess.PIPE);
+pydpkgout, pydpkgerr = pydpkglistp.communicate();
+if(sys.version[0]=="3"):
+ pydpkgout = pydpkgout.decode("utf-8");
+pydpkg_esc = re.escape("Version:")+'\s+([0-9])'+re.escape(".");
+pydpkg_val = re.findall(pydpkg_esc, pydpkgout)[0];
 
 if(sys.version[0]=="2"):
  pkgsource = "py2motherless";
@@ -110,7 +122,7 @@ if(sys.version[0]=="3"):
  pkgsource = "py3motherless";
 pkgupstreamname = "PyMotherless";
 pkgveralt = str(setuppy_verinfo[0])+"."+str(setuppy_verinfo[1])+"."+str(setuppy_verinfo[2]);
-pkgver = str(pkgveralt)+"rc"+str(setuppy_verinfo[4])+"~"+getargs.codename+str(distnametover.get(getargs.codename, "1").replace(".", ""));
+pkgver = str(pkgveralt)+"~rc"+str(setuppy_verinfo[4])+"~"+getargs.codename+str(distnametover.get(getargs.codename, "1").replace(".", ""));
 pkgdistname = getargs.codename;
 pkgurgency = "urgency=low";
 pkgauthorname = setuppy_author;
@@ -183,7 +195,7 @@ os.chmod(debpkg_changelog_file, int("0644", 8));
 
 debpkg_compat_file = os.path.realpath(debpkg_debian_dir+os.path.sep+"compat");
 print("generating file "+debpkg_compat_file);
-debpkg_string_temp = "9\n";
+debpkg_string_temp = str(pydpkg_val)+"\n";
 debpkg_file_temp = open(debpkg_compat_file, "w");
 debpkg_file_temp.write(debpkg_string_temp);
 debpkg_file_temp.close();
diff --git a/pkgbuild/ubuntu/python3/pydeb-gen.py b/pkgbuild/ubuntu/python3/pydeb-gen.py
index 2c18920..f422795 100755
--- a/pkgbuild/ubuntu/python3/pydeb-gen.py
+++ b/pkgbuild/ubuntu/python3/pydeb-gen.py
@@ -29,6 +29,11 @@ prover = __version__;
 profullname = proname+" "+prover;
 buildsystem = "pybuild";
 
+def which_exec(execfile):
+ for path in os.environ["PATH"].split(":"):
+  if os.path.exists(path + "/" + execfile):
+   return path + "/" + execfile;
+
 distupnametover = {'Warty': "4.10", 'Hoary': "5.04", 'Breezy': "5.10", 'Dapper': "6.06", 'Edgy': "6.10", 'Feisty': "7.04", 'Gutsy': "7.10", 'Hardy': "8.04", 'Intrepid': "8.10", 'Jaunty': "9.04", 'Karmic': "9.10", 'Lucid': "10.04", 'Maverick': "10.10", 'Natty': "11.04", 'Oneiric': "11.10", 'Precise': "12.04", 'Quantal': "12.10", 'Raring': "13.04", 'Saucy': "13.10", 'Trusty': "14.04", 'Utopic': "14.10", 'Vivid': "15.04", 'Wily': "15.10", 'Xenial': "16.04", 'Yakkety': "16.10"};
 distnametover = {'warty': "4.10", 'hoary': "5.04", 'breezy': "5.10", 'dapper': "6.06", 'edgy': "6.10", 'feisty': "7.04", 'gutsy': "7.10", 'hardy': "8.04", 'intrepid': "8.10", 'jaunty': "9.04", 'karmic': "9.10", 'lucid': "10.04", 'maverick': "10.10", 'natty': "11.04", 'oneiric': "11.10", 'precise': "12.04", 'quantal': "12.10", 'raring': "13.04", 'saucy': "13.10", 'trusty': "14.04", 'utopic': "14.10", 'vivid': "15.04", 'wily': "15.10", 'xenial': "16.04", 'yakkety': "16.10"};
 distnamelist = distnametover.keys();
@@ -103,6 +108,13 @@ standverdata = standverfile.read();
 standverfile.close();
 getstandver = re.findall("([0-9]\.[0-9]\.[0-9])\s+([0-9]+)", standverdata);
 getcurstandver = getstandver[0][0];
+dpkglocatout = which_exec("dpkg");
+pydpkglistp = subprocess.Popen([dpkglocatout, "-s", "debhelper"], stdout=subprocess.PIPE, stderr=subprocess.PIPE);
+pydpkgout, pydpkgerr = pydpkglistp.communicate();
+if(sys.version[0]=="3"):
+ pydpkgout = pydpkgout.decode("utf-8");
+pydpkg_esc = re.escape("Version:")+'\s+([0-9])'+re.escape(".");
+pydpkg_val = re.findall(pydpkg_esc, pydpkgout)[0];
 
 if(sys.version[0]=="2"):
  pkgsource = "py2motherless";
@@ -110,7 +122,7 @@ if(sys.version[0]=="3"):
  pkgsource = "py3motherless";
 pkgupstreamname = "PyMotherless";
 pkgveralt = str(setuppy_verinfo[0])+"."+str(setuppy_verinfo[1])+"."+str(setuppy_verinfo[2]);
-pkgver = str(pkgveralt)+"rc"+str(setuppy_verinfo[4])+"~"+getargs.codename+str(distnametover.get(getargs.codename, "1").replace(".", ""));
+pkgver = str(pkgveralt)+"~rc"+str(setuppy_verinfo[4])+"~"+getargs.codename+str(distnametover.get(getargs.codename, "1").replace(".", ""));
 pkgdistname = getargs.codename;
 pkgurgency = "urgency=low";
 pkgauthorname = setuppy_author;
@@ -183,7 +195,7 @@ os.chmod(debpkg_changelog_file, int("0644", 8));
 
 debpkg_compat_file = os.path.realpath(debpkg_debian_dir+os.path.sep+"compat");
 print("generating file "+debpkg_compat_file);
-debpkg_string_temp = "9\n";
+debpkg_string_temp = str(pydpkg_val)+"\n";
 debpkg_file_temp = open(debpkg_compat_file, "w");
 debpkg_file_temp.write(debpkg_string_temp);
 debpkg_file_temp.close();
-- 
2.11.4.GIT