diff -Nru system-config-lvm-1.1.14/debian/changelog system-config-lvm-1.1.14/debian/changelog --- system-config-lvm-1.1.14/debian/changelog 2010-06-20 15:08:05.000000000 +0530 +++ system-config-lvm-1.1.14/debian/changelog 2010-07-06 17:25:23.000000000 +0530 @@ -1,9 +1,25 @@ +system-config-lvm (1.1.14-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable. (LP: #602262) Remaining changes: + - In Ubuntu, we use udev rather than an init script to activate lvm2, so + don't try to invoke the init script + + -- Bhavani Shankar Tue, 06 Jul 2010 17:24:25 +0530 + system-config-lvm (1.1.14-1) unstable; urgency=low * New upstream release -- Philipp Huebner Sun, 20 Jun 2010 11:38:05 +0200 +system-config-lvm (1.1.12-2ubuntu1) maverick; urgency=low + + * Merge from Debian unstable. Remaining changes: + - In Ubuntu, we use udev rather than an init script to activate lvm2, so + don't try to invoke the init script + + -- Fabrice Coutadeur Mon, 10 May 2010 21:32:40 +0200 + system-config-lvm (1.1.12-2) unstable; urgency=low * Added gawk to Build-Depends (Closes: #577295) @@ -36,6 +52,14 @@ -- Philipp Huebner Thu, 04 Feb 2010 17:44:11 +0100 +system-config-lvm (1.1.11-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable. Remaining changes: + - In Ubuntu, we use udev rather than an init script to activate lvm2, so + don't try to invoke the init script + + -- Fabrice Coutadeur Fri, 22 Jan 2010 20:04:42 +0000 + system-config-lvm (1.1.11-1) unstable; urgency=low * New upstream release @@ -75,6 +99,21 @@ -- Philipp Huebner Thu, 09 Jul 2009 10:47:33 +0200 +system-config-lvm (1.1.4-4ubuntu2) lucid; urgency=low + + * Add support for ext4 and xfs via patch in upstream tracker + (thanks, Andres Mujica; LP: #390423) + + -- Barry A. Warsaw Thu, 10 Dec 2009 10:56:03 -0500 + +system-config-lvm (1.1.4-4ubuntu1) karmic; urgency=low + + * In Ubuntu, we use udev rather than an init script to activate lvm2, so + don't try to invoke the init script (thanks, Andres Mujica; LP: + #390421). + + -- Colin Watson Thu, 02 Jul 2009 11:09:51 +0100 + system-config-lvm (1.1.4-4) unstable; urgency=low * Removed creation of /usr/bin/system-config-lvm from redhat2debian.dpatch diff -Nru system-config-lvm-1.1.14/debian/control system-config-lvm-1.1.14/debian/control --- system-config-lvm-1.1.14/debian/control 2010-04-12 20:21:31.000000000 +0530 +++ system-config-lvm-1.1.14/debian/control 2010-07-01 18:12:52.000000000 +0530 @@ -1,7 +1,8 @@ Source: system-config-lvm Section: admin Priority: extra -Maintainer: Philipp Huebner +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Philipp Huebner Build-Depends: debhelper (>= 7.0.50~) Build-Depends-Indep: autotools-dev, gawk, gettext (>= 0.17), intltool, libxml-parser-perl (>= 2.36), python (>= 2.2), python-support (>=0.8.1) Standards-Version: 3.8.4 diff -Nru system-config-lvm-1.1.14/debian/system-config-lvm.sh system-config-lvm-1.1.14/debian/system-config-lvm.sh --- system-config-lvm-1.1.14/debian/system-config-lvm.sh 2010-01-16 15:56:32.000000000 +0530 +++ system-config-lvm-1.1.14/debian/system-config-lvm.sh 2010-07-01 18:12:52.000000000 +0530 @@ -2,8 +2,7 @@ set -e if [ `id -u` -eq 0 ]; then - invoke-rc.d lvm2 start; /usr/share/system-config-lvm/system-config-lvm.py; else - su-to-root -X -c "invoke-rc.d lvm2 start ; /usr/share/system-config-lvm/system-config-lvm.py"; + su-to-root -X -c "/usr/share/system-config-lvm/system-config-lvm.py"; fi