diff -u libtorrent-rasterbar-0.14.2/debian/python-libtorrent.install libtorrent-rasterbar-0.14.2/debian/python-libtorrent.install --- libtorrent-rasterbar-0.14.2/debian/python-libtorrent.install +++ libtorrent-rasterbar-0.14.2/debian/python-libtorrent.install @@ -1 +1 @@ -usr/lib/python*/site-packages/libtorrent.so +usr/lib/python*/*-packages/libtorrent.so diff -u libtorrent-rasterbar-0.14.2/debian/rules libtorrent-rasterbar-0.14.2/debian/rules --- libtorrent-rasterbar-0.14.2/debian/rules +++ libtorrent-rasterbar-0.14.2/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/quilt/quilt.make + # The following configuration flags will work with both boost1.34.1 and # boost1.35 (or higher). There are two mutually exclusive options: # - the '--with-asio' option is enabled only when building against boost1.34.1 @@ -33,17 +35,17 @@ --with-boost-thread=boost_thread-mt \ --with-boost-regex=boost_regex-mt \ --with-boost-program-options=boost_program_options-mt \ - --with-boost-python=boost_python-mt-py25 + --with-boost-python=boost_python-mt-py26 build: build-stamp -build-stamp: +build-stamp: $(QUILT_STAMPFN) dh build --before configure dh_auto_configure -- PTHREAD_LIBS="-lpthread" CFLAGS="$(CFLAGS)" \ LDFLAGS="-Wl,--as-needed -lrt" $(CONFIGUREFLAGS) dh build --after configure touch $@ -clean: +clean: unpatch dh $@ install: build install-stamp diff -u libtorrent-rasterbar-0.14.2/debian/changelog libtorrent-rasterbar-0.14.2/debian/changelog --- libtorrent-rasterbar-0.14.2/debian/changelog +++ libtorrent-rasterbar-0.14.2/debian/changelog @@ -1,3 +1,16 @@ +libtorrent-rasterbar (0.14.2-1ubuntu1) jaunty; urgency=low + + * Merge from Debian. (LP: #335741) + * debian/python-libtorrent.install + - Install to usr/lib/python*/*-packages/ for python 2.6 transition. + * debian/rules: + - Use --with-boost-python=boost_python-mt-py26 flag. + * Patch makefile to use "setup.py install --install-layout=deb" + - debian/control, debian/rules: add build dependency on quilt. + - Add debian/patch/10_setuppy_instal-layout.diff + + -- Andrew Starr-Bochicchio Mon, 02 Mar 2009 02:43:39 -0500 + libtorrent-rasterbar (0.14.2-1) unstable; urgency=low * New upstream version. @@ -17,6 +30,14 @@ -- Cristian Greco Fri, 27 Feb 2009 07:46:38 +0100 +libtorrent-rasterbar (0.14.1-1ubuntu1) jaunty; urgency=low + + * Transition build-dep and -dev package dependsfrom libboost*-dev to + libboost*1.35-dev and drop version requirements (all 1.35 packages have + sufficent version) + + -- Scott Kitterman Thu, 19 Feb 2009 22:10:53 -0500 + libtorrent-rasterbar (0.14.1-1) experimental; urgency=low * New upstream version diff -u libtorrent-rasterbar-0.14.2/debian/control libtorrent-rasterbar-0.14.2/debian/control --- libtorrent-rasterbar-0.14.2/debian/control +++ libtorrent-rasterbar-0.14.2/debian/control @@ -1,8 +1,10 @@ Source: libtorrent-rasterbar Section: libs Priority: optional -Maintainer: Cristian Greco +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Cristian Greco Build-Depends: debhelper (>= 7), + quilt, libboost1.37-dev | libboost-dev (>= 1.34.1), libboost-filesystem1.37-dev | libboost-filesystem-dev (>= 1.34.1), libboost-thread1.37-dev | libboost-thread-dev (>= 1.34.1), only in patch2: unchanged: --- libtorrent-rasterbar-0.14.2.orig/debian/patches/series +++ libtorrent-rasterbar-0.14.2/debian/patches/series @@ -0,0 +1 @@ +10_setuppy_instal-layout.diff only in patch2: unchanged: --- libtorrent-rasterbar-0.14.2.orig/debian/patches/10_setuppy_instal-layout.diff +++ libtorrent-rasterbar-0.14.2/debian/patches/10_setuppy_instal-layout.diff @@ -0,0 +1,28 @@ +## Needed for python 2.6 transition. +## See LP: https://bugs.launchpad.net/bugs/335741 +Index: libtorrent-rasterbar-0.14.2/bindings/python/Makefile.am +=================================================================== +--- libtorrent-rasterbar-0.14.2.orig/bindings/python/Makefile.am 2009-03-03 14:16:14.177131727 -0500 ++++ libtorrent-rasterbar-0.14.2/bindings/python/Makefile.am 2009-03-03 14:52:29.030524511 -0500 +@@ -4,7 +4,7 @@ + $(PYTHON) setup.py build + + install-exec-local: +- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) ++ $(PYTHON) setup.py install --root=$(DESTDIR) --install-layout=deb + + uninstall-local: + rm -rf $(DESTDIR)$(libdir)/python*/site-packages/*libtorrent* +Index: libtorrent-rasterbar-0.14.2/bindings/python/Makefile.in +=================================================================== +--- libtorrent-rasterbar-0.14.2.orig/bindings/python/Makefile.in 2009-03-03 14:52:53.564116494 -0500 ++++ libtorrent-rasterbar-0.14.2/bindings/python/Makefile.in 2009-03-03 14:53:23.173104112 -0500 +@@ -373,7 +373,7 @@ + @ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py build + + @ENABLE_PYTHON_BINDING_TRUE@install-exec-local: +-@ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) ++@ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py install --root=$(DESTDIR) --install-layout=deb + + @ENABLE_PYTHON_BINDING_TRUE@uninstall-local: + @ENABLE_PYTHON_BINDING_TRUE@ rm -rf $(DESTDIR)$(libdir)/python*/site-packages/*libtorrent*