diff -u libmtp-0.2.2/debian/control libmtp-0.2.2/debian/control --- libmtp-0.2.2/debian/control +++ libmtp-0.2.2/debian/control @@ -1,10 +1,12 @@ Source: libmtp Section: libs Priority: optional -Maintainer: Rafael Laboissiere +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Rafael Laboissiere Build-Depends: libusb-dev, doxygen, debhelper (>= 5), cdbs, dpkg-dev (>= 1.13.19), xsltproc, docbook-xsl Standards-Version: 3.7.2 +Homepage: http://libmtp.sourceforge.net/ XS-Vcs-Svn: svn://svn.debian.org/svn/private/rafael/deb-pkg/libmtp/ XS-Vcs-Browser: http://svn.debian.org/wsvn/private/rafael/deb-pkg/libmtp/ diff -u libmtp-0.2.2/debian/control.in libmtp-0.2.2/debian/control.in --- libmtp-0.2.2/debian/control.in +++ libmtp-0.2.2/debian/control.in @@ -1,7 +1,8 @@ Source: libmtp Section: libs Priority: optional -Maintainer: Rafael Laboissiere +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Rafael Laboissiere Build-Depends: libusb-dev, doxygen, debhelper (>= 5), cdbs, dpkg-dev (>= 1.13.19), xsltproc, docbook-xsl Standards-Version: 3.7.2 diff -u libmtp-0.2.2/debian/changelog libmtp-0.2.2/debian/changelog --- libmtp-0.2.2/debian/changelog +++ libmtp-0.2.2/debian/changelog @@ -1,3 +1,12 @@ +libmtp (0.2.2-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Munge Maintainer field as per spec. + - Remove hotplug from the Depends of lib. + * Remove bashism in debian/rules to rename udev files. + + -- Flávio Martins Thu, 22 Nov 2007 20:37:15 +0000 + libmtp (0.2.2-2) unstable; urgency=low * Releasing to unstable @@ -40,6 +49,33 @@ -- Rafael Laboissiere Fri, 24 Aug 2007 11:50:56 +0200 +libmtp (0.2.1-0ubuntu3) gutsy; urgency=low + + [ Flávio Martins ] + * debian/control: Add Conflicts on libmtp5 to fix upgrades. (LP: #133165) + + [ Sarah Hobbs ] + * Removed libmtp2 conflicts - no longer needed. + this is only in edgy, and we dont support edgy --> gutsy upgrades + + -- Sarah Hobbs Sat, 18 Aug 2007 11:36:18 +1000 + +libmtp (0.2.1-0ubuntu2) gutsy; urgency=low + + * debian/rules: Really fix the udev rules file + + -- Flávio Martins Thu, 16 Aug 2007 2:56:57 +0000 + +libmtp (0.2.1-0ubuntu1) gutsy; urgency=low + + * New upstream release + * ABI bump to 6 + * debian/rules: Adapt upstream udev rules file to our kernel + + Thanks to Flávio Martins for testing! + + -- Mario Danic Tue, 14 Aug 2007 19:40:57 +0200 + libmtp (0.2.0-1) experimental; urgency=low * New upstream release (closes: #436060) @@ -51,6 +87,17 @@ -- Rafael Laboissiere Sun, 5 Aug 2007 10:38:03 +0200 +libmtp (0.1.5-2ubuntu1) gutsy; urgency=low + + * Manually merge from Debian unstable. + * Remaining Ubuntu changes: + - Conflict against libmtp2. + - Don't use a bashism in debian/rules to rename manual pages. + * Munge Maintainer field as per spec. + * Remove hotplug from the Depends of libmtp5. + + -- Steve Kowalik Wed, 30 May 2007 10:14:07 +1000 + libmtp (0.1.5-2) unstable; urgency=low * debian/control: Added XS-Vcs-Svn and XS-Vcs-Browser fields @@ -142,6 +189,39 @@ -- Rafael Laboissiere Wed, 31 Jan 2007 16:13:17 +0100 +libmtp (0.1.3-0ubuntu2) feisty; urgency=low + + * added conflict against libmtp2 (LP#90634) + + -- Michael Vogt Thu, 8 Mar 2007 18:03:18 +0100 + +libmtp (0.1.3-0ubuntu1) feisty; urgency=low + + * New upstream release + * Rename binary package to libmtp5 for new SONAME + * Move /usr/bin files to libmtp5 (not -dev) + + -- Jonathan Riddell Wed, 7 Feb 2007 11:23:32 +0000 + +libmtp (0.1.0-0ubuntu1) feisty; urgency=low + + * New Upstream Version + + -- Sarah Hobbs Sun, 17 Dec 2006 19:26:45 +1100 + +libmtp (0.0.18-0ubuntu2) edgy; urgency=low + + * Install the documentation for libmtp-dev to the correct directory + * Closes Malone: #62818 + + -- Brandon Holtsclaw Thu, 28 Sep 2006 18:58:57 -0500 + +libmtp (0.0.18-0ubuntu1) edgy; urgency=low + + * Initial release + + -- Brandon Holtsclaw Wed, 13 Sep 2006 21:34:10 -0500 + libmtp (0.0.10-1) unstable; urgency=low * Initial release (Closes: #382195) diff -u libmtp-0.2.2/debian/rules libmtp-0.2.2/debian/rules --- libmtp-0.2.2/debian/rules +++ libmtp-0.2.2/debian/rules @@ -42,8 +42,8 @@ perl -pi -e 's/MODE.*/MODE="660", GROUP="audio"/ if /MODE/' \ libmtp.rules # Rename udev and hotplug files - for f in $(UDEVFILES) ; do \ - cp $${f/libmtp$(SOVERSION)/libmtp} $$f ; \ + for f in $(UDEVFILES) ; do \ + cp "$$(printf %s "$$f" | sed 's/$(SOVERSION)//')" "$$f" ; \ done mtp-tools.1: debian/mtp-tools.dbk reverted: --- libmtp-0.2.2/debian/mtp-tools.lintian.in +++ libmtp-0.2.2.orig/debian/mtp-tools.lintian.in @@ -1 +0,0 @@ -mtp-tools: package-has-a-duplicate-relation depends: libmtp@SOVERSION@ (= @DEBVERSION@), libmtp@SOVERSION@ diff -u libmtp-0.2.2/debian/mtp-tools.links libmtp-0.2.2/debian/mtp-tools.links --- libmtp-0.2.2/debian/mtp-tools.links +++ libmtp-0.2.2/debian/mtp-tools.links @@ -13,7 +13,6 @@ usr/share/man/man1/mtp-tools.1 usr/share/man/man1/mtp-newfolder.1 usr/share/man/man1/mtp-tools.1 usr/share/man/man1/mtp-newplaylist.1 usr/share/man/man1/mtp-tools.1 usr/share/man/man1/mtp-playlists.1 -usr/share/man/man1/mtp-tools.1 usr/share/man/man1/mtp-reset.1 usr/share/man/man1/mtp-tools.1 usr/share/man/man1/mtp-sendfile.1 usr/share/man/man1/mtp-tools.1 usr/share/man/man1/mtp-sendtr.1 usr/share/man/man1/mtp-tools.1 usr/share/man/man1/mtp-thumb.1 only in patch2: unchanged: --- libmtp-0.2.2.orig/README +++ libmtp-0.2.2/README @@ -265,6 +265,14 @@ /lib/modules//kernel/drivers/usb/storage/usb-storage.ko manually. +Another method is to run (as root) something like: + +> rmmod usb_storage ; mtp-detect + +You can run most any command or a client like gnomad2 or +Amarok immediately after the rmmod command. This works +sometimes. + If you find the PerfectSolution(TM) to this dilemma, so you can properly switch for individual devices whether to use it as USB mass storage or not, please tell us how you did it. We