Skip to content

Commit

Permalink
resolve name conflict debian packate pyjwt
Browse files Browse the repository at this point in the history
Working on privacyidea#301
  • Loading branch information
cornelinux committed Jan 13, 2016
1 parent 96159a4 commit db8cfda
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
3 changes: 2 additions & 1 deletion contrib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ pyjwt:
(cd $(CONTRIB2); cd PyJWT-$(VERSION2); find . -name \*.pyc -exec rm {} \;)
(cd $(CONTRIB2); cd PyJWT-$(VERSION2); python setup.py sdist; cp dist/* ..)
(cd $(CONTRIB2); py2dsc -m '$(ME)' PyJWT-$(VERSION2).tar.gz)
(cd $(CONTRIB2)/deb_dist/pyjwt-$(VERSION2); dch -v $(VERSION2)-1$(series)1 --distribution $(series) -M "built for privacyidea")
(cd $(CONTRIB2)/deb_dist/pyjwt-$(VERSION2)/debian/; patch < ../../../../patches/jwt_add_provides)
(cd $(CONTRIB2)/deb_dist/pyjwt-$(VERSION2); dch -v $(VERSION2)-2$(series)1 --distribution $(series) -M "built for privacyidea")
(cd $(CONTRIB2)/deb_dist/pyjwt-$(VERSION2); debuild -sa -S)
(cd $(CONTRIB2)/deb_dist/pyjwt-$(VERSION2); debuild -b)
(cp $(CONTRIB2)/deb_dist/* DEBUILD || true)
Expand Down
13 changes: 13 additions & 0 deletions contrib/patches/jwt_add_provides
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- control 2016-01-12 21:57:02.510959191 +0100
+++ control.new 2016-01-12 21:58:42.910964191 +0100
@@ -6,8 +6,8 @@
Standards-Version: 3.9.1


-
Package: python-pyjwt
+Provides: python-jwt
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}
Description: JSON Web Token implementation in Python

0 comments on commit db8cfda

Please sign in to comment.