diff -u libmtp-0.2.6.1/debian/changelog libmtp-0.2.6.1/debian/changelog --- libmtp-0.2.6.1/debian/changelog +++ libmtp-0.2.6.1/debian/changelog @@ -1,3 +1,20 @@ +libmtp (0.2.6.1-2ubuntu1) hardy; urgency=low + + * Sync with Debian. + * Install rules directly instead of a link. Closes LP: #197968 + * Install hal fdi information. Closes LP: #205749 + + -- Flávio Martins Sat, 05 Apr 2008 21:24:51 +0100 + +libmtp (0.2.6.1-2) unstable; urgency=low + + * debian/control.in: + + Change the relationship to udev from Depends to Recommends + (closes: #472048) + + Append trunk/ to the path in Vcs-Svn:, such that debcheckout works + + -- Rafael Laboissiere Fri, 28 Mar 2008 20:34:45 +0100 + libmtp (0.2.6.1-1) unstable; urgency=low * New upstream release diff -u libmtp-0.2.6.1/debian/libmtp.install.in libmtp-0.2.6.1/debian/libmtp.install.in --- libmtp-0.2.6.1/debian/libmtp.install.in +++ libmtp-0.2.6.1/debian/libmtp.install.in @@ -2 +2,2 @@ -../../libmtp@SOVERSION@.rules etc/udev +../../libmtp@SOVERSION@.rules etc/udev/rules.d +../../20-libmtp@SOVERSION@.fdi usr/share/hal/fdi/information/20thirdparty diff -u libmtp-0.2.6.1/debian/rules libmtp-0.2.6.1/debian/rules --- libmtp-0.2.6.1/debian/rules +++ libmtp-0.2.6.1/debian/rules @@ -9,9 +9,9 @@ SOVERSION = 7 SUBSTFILES = debian/libmtp$(SOVERSION).docs \ debian/libmtp$(SOVERSION).install \ - debian/libmtp$(SOVERSION).links \ - debian/libmtp$(SOVERSION).preinst -UDEVFILES = libmtp$(SOVERSION).rules + debian/libmtp$(SOVERSION).preinst \ + debian/libmtp$(SOVERSION).postinst +UDEVFILES = libmtp$(SOVERSION).rules 20-libmtp$(SOVERSION).fdi debdir = $(CURDIR)/debian debver = $(shell perl -ne '/([\d.-]+)/;print "$$1"; last' \ diff -u libmtp-0.2.6.1/debian/control.in libmtp-0.2.6.1/debian/control.in --- libmtp-0.2.6.1/debian/control.in +++ libmtp-0.2.6.1/debian/control.in @@ -6,13 +6,14 @@ dpkg-dev (>= 1.13.19), xsltproc, docbook-xsl, chrpath Standards-Version: 3.7.3 Homepage: http://libmtp.sourceforge.net/ -Vcs-Svn: svn://svn.debian.org/svn/private/rafael/deb-pkg/libmtp/ -Vcs-Browser: http://svn.debian.org/wsvn/private/rafael/deb-pkg/libmtp/ +Vcs-Svn: svn://svn.debian.org/svn/private/rafael/deb-pkg/libmtp/trunk +Vcs-Browser: http://svn.debian.org/wsvn/private/rafael/deb-pkg/libmtp Package: libmtp@SOVERSION@ Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${udev} +Depends: ${shlibs:Depends} +Recommends: ${udev} Description: Media Transfer Protocol (MTP) library A library for communicating with MTP aware devices. MTP (Media Transfer Protocol) is necessary to communicate with some USB portable diff -u libmtp-0.2.6.1/debian/libmtp.preinst.in libmtp-0.2.6.1/debian/libmtp.preinst.in --- libmtp-0.2.6.1/debian/libmtp.preinst.in +++ libmtp-0.2.6.1/debian/libmtp.preinst.in @@ -25,12 +25,30 @@ fi } +# Prepare to move a conffile without triggering a dpkg question +prep_mv_conffile() { + PKGNAME="$1" + CONFFILE="$2" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" = "$old_md5sum" ]; then + rm -f "$CONFFILE" + fi + fi +} + case "$1" in install|upgrade) if dpkg --compare-versions "$2" le 0.2.5-1 ; then rm_conffile $PACKAGE /etc/hotplug/usb/$PACKAGE.usermap rm_conffile $PACKAGE /etc/hotplug/usb/$PACKAGE.sh fi + if dpkg --compare-versions "$2" lt-nl 0.2.6.1-2ubuntu1 ; then + rm -f /etc/udev/rules.d/libmtp@SOVERSION@.rules + prep_mv_conffile $PACKAGE /etc/udev/libmtp@SOVERSION@.rules + fi + esac #DEBHELPER# diff -u libmtp-0.2.6.1/debian/control libmtp-0.2.6.1/debian/control --- libmtp-0.2.6.1/debian/control +++ libmtp-0.2.6.1/debian/control @@ -6,13 +6,14 @@ dpkg-dev (>= 1.13.19), xsltproc, docbook-xsl, chrpath Standards-Version: 3.7.3 Homepage: http://libmtp.sourceforge.net/ -Vcs-Svn: svn://svn.debian.org/svn/private/rafael/deb-pkg/libmtp/ -Vcs-Browser: http://svn.debian.org/wsvn/private/rafael/deb-pkg/libmtp/ +Vcs-Svn: svn://svn.debian.org/svn/private/rafael/deb-pkg/libmtp/trunk +Vcs-Browser: http://svn.debian.org/wsvn/private/rafael/deb-pkg/libmtp Package: libmtp7 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${udev} +Depends: ${shlibs:Depends} +Recommends: ${udev} Description: Media Transfer Protocol (MTP) library A library for communicating with MTP aware devices. MTP (Media Transfer Protocol) is necessary to communicate with some USB portable reverted: --- libmtp-0.2.6.1/debian/libmtp.links.in +++ libmtp-0.2.6.1.orig/debian/libmtp.links.in @@ -1 +0,0 @@ -etc/udev/libmtp@SOVERSION@.rules etc/udev/rules.d/libmtp@SOVERSION@.rules only in patch2: unchanged: --- libmtp-0.2.6.1.orig/debian/libmtp.postinst.in +++ libmtp-0.2.6.1/debian/libmtp.postinst.in @@ -0,0 +1,30 @@ +#!/bin/sh +# preinst script for libmtp + +set -e + +PACKAGE=libmtp@SOVERSION@ + +# Move a conffile without triggering a dpkg question +mv_conffile() { + OLDCONFFILE="$1" + NEWCONFFILE="$2" + if [ -e "$OLDCONFFILE" ]; then + echo "Preserving user changes to $NEWCONFFILE ..." + mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new + mv -f "$OLDCONFFILE" "$NEWCONFFILE" + fi +} + +case "$1" in +configure) + if dpkg --compare-versions "$2" lt-nl 0.2.6.1-2ubuntu1 ; then + mv_conffile /etc/udev/libmtp@SOVERSION@.rules \ + /etc/udev/rules.d/libmtp@SOVERSION@.rules + fi + +esac + +#DEBHELPER# + +exit 0