diff -Nru lxpanel-0.7.2/debian/changelog lxpanel-0.7.2/debian/changelog --- lxpanel-0.7.2/debian/changelog 2015-01-31 16:56:13.000000000 +0000 +++ lxpanel-0.7.2/debian/changelog 2015-02-03 18:57:15.000000000 +0000 @@ -1,3 +1,13 @@ +lxpanel (0.7.2-1ubuntu2) vivid; urgency=medium + + * debian/lxpanel.install + - Don't install /usr/share/locale and /usr/share/lxpanel, already installed + in lxpanel-data (LP: #1417244). + * debian/control: + - Update Replaces and Breaks. + + -- Julien Lavergne Tue, 03 Feb 2015 19:43:11 +0100 + lxpanel (0.7.2-1ubuntu1) vivid; urgency=medium * Merge with Debian. Ubuntu remaining changes: diff -Nru lxpanel-0.7.2/debian/control lxpanel-0.7.2/debian/control --- lxpanel-0.7.2/debian/control 2015-01-31 15:00:13.000000000 +0000 +++ lxpanel-0.7.2/debian/control 2015-02-03 18:41:49.000000000 +0000 @@ -59,8 +59,8 @@ Package: lxpanel-data Architecture: all Depends: ${misc:Depends} -Breaks: lxpanel (<< 0.7.0) -Replaces: lxpanel (<< 0.7.0) +Breaks: lxpanel (<< 0.7.2-1ubuntu2) +Replaces: lxpanel (<< 0.7.2-1ubuntu2) Description: LXDE panel (data files) LXPanel is a GUI application for the Lightweight X11 Desktop Environment (LXDE). diff -Nru lxpanel-0.7.2/debian/lxpanel.install lxpanel-0.7.2/debian/lxpanel.install --- lxpanel-0.7.2/debian/lxpanel.install 2015-01-31 15:16:53.000000000 +0000 +++ lxpanel-0.7.2/debian/lxpanel.install 2015-02-03 18:56:33.000000000 +0000 @@ -1,6 +1,5 @@ etc/xdg usr/bin -usr/share usr/include usr/lib/*/pkgconfig usr/lib/*/lxpanel/plugins/batt.so @@ -15,6 +14,7 @@ usr/lib/*/lxpanel/plugins/monitors.so usr/lib/*/lxpanel/plugins/netstat.so usr/lib/*/lxpanel/plugins/weather.so +usr/share/man debian/desktop/* /usr/share/applications debian/local/source_lxpanel.py usr/share/apport/package-hooks