* Jakub Wilk <jw...@debian.org> [2012-07-17 18:42]: > (I'm not the maintainer.)
Thanks for reviewing, anyway. > * David Riebenbauer <davr...@liegesta.at>, 2012-07-15, 14:51: > >+Breaks: gwibber-service (<= 3.0.0.1-2.1), > >+ gwibber-service-buzz (<= 3.0.0.1-2.1), > >+ gwibber-service-digg (<= 3.0.0.1-2.1), > >+ gwibber-service-facebook (<= 3.0.0.1-2.1), > >+ gwibber-service-flickr (<= 3.0.0.1-2.1), > >+ gwibber-service-foursquare (<= 3.0.0.1-2.1), > >+ gwibber-service-friendfeed (<= 3.0.0.1-2.1), > >+ gwibber-service-identica (<= 3.0.0.1-2.1), > >+ gwibber-service-pingfm (<= 3.0.0.1-2.1), > >+ gwibber-service-qaiku (<= 3.0.0.1-2.1), > >+ gwibber-service-statusnet (<= 3.0.0.1-2.1), > >+ gwibber-service-twitter (<= 3.0.0.1-2.1) > > Wow, that's a lot of Breaks. What are they for? >From <http://wiki.debian.org/Python/TransitionToDHPython2>: | Be sure to use Breaks or Depends relationships to ensure you cannot | mix installation of python-support-based packages with | dh_python2-based ones. But, thinking of it, all those are really not needed. A breaks for gwibber-service from gwibber-service-foo should be enough. Or a Depends on gwibber-service (>> 3.0.0.1-2.1). Any comments? > >Depends: gwibber-service (>> 2.33.0), > > ${python:Depends}, ${misc:Depends} > >Conflicts: gwibber-service (<= 2.33.0) > >+Breaks: gwibber (<= 3.0.0.1-2.1), > >+ gwibber-service (<= 3.0.0.1-2.1), > > Depends and Breaks against the same package (gwibber-service) looks a bit > unusual to me. Yeah, that was an oversight. > >-debian/custom.py /usr/lib/python2.6/site-packages/gwibber/microblog/util/ > >+debian/custom.py /usr/lib/python2.6/dist-packages/gwibber/microblog/util/ > > Hmm, 2.6? That doesn't look good. (Neither the old nor the new version.) Would something like that in override_dh_auto_install be better? | set -ex; for PYTHON in ${shell pyversions -r} do \ | install debian/custom.py \ | debian/tmp/usr/lib/$$PYTHON/dist-packages/gwibber/microblog/util/ \ | done Revised and hopefully better patch attached,. Cheers, David -- David Riebenbauer Jabber: davr...@jabber.ccc.de - ICQ: 322056002 http://liegesta.at
diff --git a/debian/control b/debian/control index 5166bbf..2cb80b4 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,9 @@ Section: net Priority: optional Maintainer: Kartik Mistry <kar...@debian.org> Uploaders: Filip Chabik <had...@gmail.com> -Build-Depends: cdbs (>= 0.4.89), - debhelper (>= 7.0.50~), - python-all, - python-distutils-extra, - python-support (>= 1.0) +Build-Depends: debhelper (>= 7.0.50~), + python-all (>= 2.6.6-3~), + python-distutils-extra Standards-Version: 3.9.2 Homepage: http://gwibber.com/ X-Python-Version: >= 2.6, << 2.7 @@ -75,8 +73,7 @@ Description: Open source social networking client for GNOME (service) Package: gwibber-service-facebook Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Facebook plugin for Gwibber @@ -88,8 +85,7 @@ Description: Facebook plugin for Gwibber Package: gwibber-service-twitter Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Twitter plugin for Gwibber @@ -101,8 +97,7 @@ Description: Twitter plugin for Gwibber Package: gwibber-service-identica Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Identi.ca plugin for Gwibber @@ -114,8 +109,7 @@ Description: Identi.ca plugin for Gwibber Package: gwibber-service-flickr Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Flickr plugin for Gwibber @@ -127,8 +121,7 @@ Description: Flickr plugin for Gwibber Package: gwibber-service-digg Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Digg plugin for Gwibber @@ -140,8 +133,7 @@ Description: Digg plugin for Gwibber Package: gwibber-service-buzz Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Buzz plugin for Gwibber @@ -153,8 +145,7 @@ Description: Buzz plugin for Gwibber Package: gwibber-service-statusnet Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Status.Net plugin for Gwibber @@ -166,8 +157,7 @@ Description: Status.Net plugin for Gwibber Package: gwibber-service-foursquare Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Foursquare plugin for Gwibber @@ -179,8 +169,7 @@ Description: Foursquare plugin for Gwibber Package: gwibber-service-friendfeed Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} Conflicts: gwibber-service (<= 2.33.0) Description: Friendfeed plugin for Gwibber @@ -192,10 +181,9 @@ Description: Friendfeed plugin for Gwibber Package: gwibber-service-pingfm Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} -Conflicts: gwibber-service (<= 2.33.0), +Conflicts: gwibber-service (<= 2.33.0) Description: pingfm plugin for Gwibber Gwibber is a social networking client for GNOME. It supports Facebook, Twitter, Identi.ca, StatusNet, Buzz, Foursquare, FriendFeed, Flickr, Qaiku, @@ -205,10 +193,9 @@ Description: pingfm plugin for Gwibber Package: gwibber-service-qaiku Architecture: all -XB-Python-Version: ${python:Versions} -Depends: gwibber-service (>> 2.33.0), +Depends: gwibber-service (>> 3.0.0.1-2.1), ${python:Depends}, ${misc:Depends} -Conflicts: gwibber-service (<= 2.33.0), +Conflicts: gwibber-service (<= 2.33.0) Description: Qaiku plugin for Gwibber Gwibber is a social networking client for GNOME. It supports Facebook, Twitter, Identi.ca, StatusNet, Buzz FriendFeed, Foursquare, Flickr, Qaiku, diff --git a/debian/gwibber-service.install b/debian/gwibber-service.install index 249e535..4aa7d64 100644 --- a/debian/gwibber-service.install +++ b/debian/gwibber-service.install @@ -1,6 +1,5 @@ debian/tmp/usr/bin/gwibber-service debian/tmp/usr/share/dbus-1/services/com.Gwibber.*.service -debian/custom.py /usr/lib/python2.6/site-packages/gwibber/microblog/util/ debian/tmp/usr/lib/python*/*/gwibber/__init__.py debian/tmp/usr/lib/python*/*/gwibber/microblog debian/tmp/usr/lib/python*/*/gwibber/lib/__init__.py diff --git a/debian/pycompat b/debian/pycompat deleted file mode 100644 index 0cfbf08..0000000 --- a/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/pyversions b/debian/pyversions deleted file mode 100644 index 5154b3f..0000000 --- a/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.6 diff --git a/debian/rules b/debian/rules index 6d5b8c3..7f59aac 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,20 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM=pysupport +%: + dh "$@" --with python2 -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk +override_dh_auto_clean: + rm -rf build + rm -f po/gwibber.pot + dh_auto_clean -install/gwibber:: +override_dh_auto_install: find debian/tmp/usr/share/gwibber/ui/icons/streams/scalable -type d -empty -delete find debian/tmp/usr/share/gwibber/plugins/buzz/ui/icons/scalable -type d -empty -delete install -D -m 0644 debian/gwibber.xpm \ debian/gwibber/usr/share/pixmaps/gwibber.xpm - -clean:: - rm -rf build/ - rm -f po/gwibber.pot + set -ex; for PYTHON in ${shell pyversions -r} do \ + install debian/custom.py \ + debian/tmp/usr/lib/$$PYTHON/dist-packages/gwibber/microblog/util/ \ + done + dh_auto_install
