Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
Update Debian packaging files
Browse files Browse the repository at this point in the history
  • Loading branch information
mgedmin committed Apr 16, 2013
1 parent 819a449 commit e8b3f37
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 17 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@ bin/
parts/
eggs/
develop-eggs/
build/
debian/files
debian/cipher-googlepam/
debian/cipher-googlepam.debhelper.log
debian/cipher-googlepam.postinst.debhelper
debian/cipher-googlepam.prerm.debhelper
debian/cipher-googlepam.substvars
12 changes: 12 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
cipher.googlepam (1.6.0-1) precise; urgency=low

* New upstream version.

-- Marius Gedminas <marius@cipherhealth.com> Tue, 16 Apr 2013 12:42:03 +0300

cipher.googlepam (1.5.1-1) precise; urgency=low

* New upstream version.

-- Marius Gedminas <marius@cipherhealth.com> Thu, 11 Oct 2012 17:54:20 +0300

cipher.googlepam (1.4.0-1) unstable; urgency=low

* Initial release.
Expand Down
34 changes: 17 additions & 17 deletions debian/patches/debian_specifics
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@ The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Last-Update: 2012-10-08
Last-Update: 2013-04-16

--- cipher.googlepam-1.4.0.orig/setup.py
+++ cipher.googlepam-1.4.0/setup.py
--- cipher.googlepam-1.6.0.orig/setup.py
+++ cipher.googlepam-1.6.0/setup.py
@@ -50,7 +50,7 @@ setup(
),
),
install_requires=[
'gdata',
- 'py-bcrypt',
+ 'bcrypt',
'python-memcached',
'setuptools',
],
--- cipher.googlepam-1.4.0.orig/src/cipher/googlepam/pam_google.py
+++ cipher.googlepam-1.4.0/src/cipher/googlepam/pam_google.py
@@ -31,7 +31,7 @@ from gdata.apps.groups.service import Gr
from gdata.apps.service import AppsService, AppsForYourDomainException
'gdata',
- 'py-bcrypt',
+ 'bcrypt',
'python-memcached',
'setuptools',
],
--- cipher.googlepam-1.6.0.orig/src/cipher/googlepam/pam_google.py
+++ cipher.googlepam-1.6.0/src/cipher/googlepam/pam_google.py
@@ -32,7 +32,7 @@ from gdata.apps.groups.service import Gr
from gdata.service import BadAuthentication, CaptchaRequired


-DEFAULT_CONFIG = os.path.join(os.path.dirname(__file__), 'googlepam.conf')
+DEFAULT_CONFIG = '/etc/cipher-googlepam/pam_google.conf'
SECTION_NAME = 'googlepam'
LOG = logging.getLogger('cipher.googlepam.PAM')

--- cipher.googlepam-1.4.0.orig/src/cipher/googlepam/addusers.py
+++ cipher.googlepam-1.4.0/src/cipher/googlepam/addusers.py
@@ -27,7 +27,7 @@ parser.usage = '%prog [options]'
--- cipher.googlepam-1.6.0.orig/src/cipher/googlepam/addusers.py
+++ cipher.googlepam-1.6.0/src/cipher/googlepam/addusers.py
@@ -29,7 +29,7 @@ parser.usage = '%prog [options]'

log = logging.getLogger("add-google-users")

Expand Down

0 comments on commit e8b3f37

Please sign in to comment.