updates to packaging system

deb_control

@@ -11,5 +11,5 @@ Vcs-Browser: https://github.com/aebrahim/pidgin-gnome-keyring/
 Package: pidgin-gnome-keyring
 Architecture: any
 Depends: ${misc:Depends}, libsecret-1-0, libpurple0
-Description: integrates pidgin (and libpurple) with the GNOME keyring
- Pidgin usually stores passwords as plaintext with the "save password" function. This plugin instead saves all passwords to the gnome keyring, which some would argue is a more secure form of password storage. 
+Description: integrates pidgin (and libpurple) with the system keyring
+ Pidgin usually stores passwords as plaintext with the "save password" function. This plugin instead saves all passwords to the system keyring, which some would argue is a more secure form of password storage. 

deb_copyright

@@ -1,5 +1,6 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pidgin-gnome-keyring
+Upstream-Contact: Ali Ebrahim <ali.ebrahim314@gmail.com>
 Source: https://github.com/aebrahim/pidgin-gnome-keyring
 
 Files: *

make_package.py

@@ -9,7 +9,7 @@
 import time
 
 # declare strings up here
-ubuntunames = ["precise", "quantal", "trusty", "utopic"]
+ubuntunames = ["trusty", "utopic", "vivid"]
 author_name = "Ali Ebrahim"
 email = "ali.ebrahim314@gmail.com"
 basename = "pidgin-gnome-keyring"
@@ -28,39 +28,42 @@
     print debname
 
     if os.path.isdir(dirname):
-       os.system("rm -rf " + dirname) 
+        os.system("rm -rf " + dirname)
     os.mkdir(dirname)
     os.mkdir(debname)
     shutil.copy2("gnome-keyring.c", dirname)
     # copy everything in Makefile except for the install part at the end
     shutil.copy2("Makefile", dirname + "/Makefile")
     with open(dirname + "/VERSION", "w") as outfile:
-		outfile.write(version)
+        outfile.write(version)
 
-    #shutil.make_archive(tarname, "gztar", root_dir=dirname)
+    shutil.make_archive(tarname, "gztar", root_dir=dirname)
     # run dh_make
-    os.system("cd %s; dh_make -s -c gpl2 --createorig -y -a -e %s" % (dirname, email))
+    os.system("cd %s; dh_make -s -c gpl2 --createorig -y -a -e %s" %
+              (dirname, email))
     # remove extra files and copy source files
-    os.system("cd %s; rm -rf *.ex *.EX README*" %debname)
+    os.system("cd %s; rm -rf *.ex *.EX README*" % debname)
     shutil.copy2("deb_control", debname+"control")
     shutil.copy2("deb_copyright", debname+"copyright")
-    shutil.copy2("deb_rules", debname+"rules")
     # make the dirs and install files
-    os.system("echo '%s' > %sdirs" %(installdir, debname))
-    os.system("echo 'gnome-keyring.so %s' > %sinstall" \
-            %(installdir, debname))
+    os.system("echo '%s' > %sdirs" % (installdir, debname))
+    os.system("echo 'gnome-keyring.so %s' > %sinstall"
+              % (installdir, debname))
     # write the changelog
     changelog = open(debname + "changelog", "w")
     repo = Repository(".")
     for commit in repo.walk(repo.head.target, GIT_SORT_TIME):
-		changelog.write("%s (%s) %s; urgency=low\n\n" % (basename, package_version_str, ubuntuname))
-		for commit_line in commit.message.split("\n"):
-			if len(commit_line) > 0:
-				changelog.write("  " + commit_line + "\n")
-		changelog.write("\n")
-		date = time.strftime("%a, %d %b %Y %X", time.gmtime(commit.commit_time))
-		offset = "%+0.04d" % (commit.commit_time_offset / 60 * 1000)
-		changelog.write(" -- %s <%s>  %s %s\n" % (author_name, email, date, offset))
+        changelog.write("%s (%s) %s; urgency=low\n\n" %
+                        (basename, package_version_str, ubuntuname))
+        for commit_line in commit.message.split("\n"):
+            if len(commit_line) > 0:
+                changelog.write("  " + commit_line + "\n")
+        changelog.write("\n")
+        date = time.strftime("%a, %d %b %Y %X",
+                             time.gmtime(commit.commit_time))
+        offset = "%+0.04d" % (commit.commit_time_offset / 60 * 1000)
+        changelog.write(" -- %s <%s>  %s %s\n" %
+                        (author_name, email, date, offset))
     changelog.close()
     # call debuild
     os.system("cd %s; debuild -S -sa" % dirname)