--- kvpm-0.4.5b.orig/debian/kvpm.1 +++ kvpm-0.4.5b/debian/kvpm.1 @@ -0,0 +1,48 @@ +.TH KVPM "1" "July 2008" KDE "KDE Application" +.SH NAME +kvpm \- LVM Frontend for KDE +.SH SYNOPSIS +.B kolourpaint +[\fIQt-options\fR] [\fIKDE-options\fR] +.SH DESCRIPTION +This manual page documents briefly the +.B KVPM +KDE Application. +.P +.B KVPM +is a GUI for the Linux Volume Manager project and libparted. +It uses the standard LVM tools and programs to work with logical volumes. +It can also format volumes and mount them. +.SS "Generic options:" +.TP +\fB\-\-help\fR +Show help about options +.TP +\fB\-\-help\-qt\fR +Show Qt specific options +.TP +\fB\-\-help\-kde\fR +Show KDE specific options +.TP +\fB\-\-help\-all\fR +Show all options +.TP +\fB\-\-author\fR +Show author information +.TP +\fB\-v\fR, \fB\-\-version\fR +Show version information +.TP +\fB\-\-license\fR +Show license information +.TP +\fB\-\-\fR +End of options +.SH AUTHOR +KVPM was written by +.nh +Benjamin Scott +.hy +.br +This manual page was written by Guillaume Martres from +the output of kvpm \-\-help for the Ubuntu project (but may be used by others). --- kvpm-0.4.5b.orig/debian/watch +++ kvpm-0.4.5b/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/kvpm/kvpm-([^alpha]+)\.tar\.gz --- kvpm-0.4.5b.orig/debian/manpages +++ kvpm-0.4.5b/debian/manpages @@ -0,0 +1 @@ +debian/kvpm.1 --- kvpm-0.4.5b.orig/debian/control +++ kvpm-0.4.5b/debian/control @@ -0,0 +1,18 @@ +Source: kvpm +Section: kde +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Guillaume Martres +Build-Depends: cdbs (>= 0.4.52ubuntu2), debhelper (>= 7), quilt, cmake, kdelibs5-dev, + libparted-dev, libblkid-dev +Standards-Version: 3.8.0.1 +Vcs-Bzr: lp:~kubuntu-members/kvps/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kvps/ubuntu + +Package: kvpm +Architecture: any +Depends: ${shlibs:Depends}, lvm2 +Description: LVM frontend for KDE + The KDE Volume Partition Manager is a GUI for the Linux Volume Manager + project and libparted. It uses the standard LVM tools and programs to work + with logical volumes. It can also format volumes and mount them. --- kvpm-0.4.5b.orig/debian/copyright +++ kvpm-0.4.5b/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Guillaume Martres on +Sat, 28 Jun 2008 18:54:50 +0200. + +It was downloaded from + +Upstream Author: + + Benjamin Scott + +Copyright: + + Copyright (C) 2008 Benjamin Scott + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in '/usr/share/common-licenses/GPL-3'. + +The Debian packaging is (C) 2008, Guillaume Martres and +is licensed under the GPL, see above. --- kvpm-0.4.5b.orig/debian/changelog +++ kvpm-0.4.5b/debian/changelog @@ -0,0 +1,37 @@ +kvpm (0.4.5b-0ubuntu5) jaunty; urgency=low + + * Add ext4 support (LP: #335972). + + -- Colin Watson Tue, 07 Apr 2009 02:32:50 +0100 + +kvpm (0.4.5b-0ubuntu4) jaunty; urgency=low + + * No change rebuild for libparted1.8-9 -> libparted1.8-10 transition + + -- David Futcher Thu, 11 Dec 2008 22:26:11 +0000 + +kvpm (0.4.5b-0ubuntu3) intrepid; urgency=low + + * debian/rules: + - includes /usr/share/cdbs/1/class/kde4.mk + - override DEB_DH_INSTALL_SOURCEDIR so that debian/install can install + files from debian/ + * Removed debian/cdbs: + - not needed with kde4.mk + * debian/control: + - ensure cdbs version is (>= 0.4.52ubuntu2) for kde4.mk support + + -- Guillaume Martres Tue, 26 Aug 2008 21:28:41 +0200 + +kvpm (0.4.5b-0ubuntu2) intrepid; urgency=low + + * Added kubuntu_02_missing_include.diff, fix FTBFS (LP: #250551) + + -- Guillaume Martres Mon, 21 Jul 2008 16:29:25 +0200 + +kvpm (0.4.5b-0ubuntu1) intrepid; urgency=low + + * Initial release (LP: #246032) + + -- Guillaume Martres Sat, 28 Jun 2008 18:54:50 +0200 + --- kvpm-0.4.5b.orig/debian/rules +++ kvpm-0.4.5b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +THIS_SHOULD_GO_TO_UNSTABLE := 1 + +include /usr/share/cdbs/1/class/kde4.mk + +DEB_SRCDIR = kvpm +DEB_DH_INSTALL_SOURCEDIR = --- kvpm-0.4.5b.orig/debian/install +++ kvpm-0.4.5b/debian/install @@ -0,0 +1 @@ +debian/kvpm.desktop usr/share/applications --- kvpm-0.4.5b.orig/debian/kvpm.desktop +++ kvpm-0.4.5b/debian/kvpm.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +GenericName=LVM Frontend +Name=KVPM +Comment=KDE Volume Partition Manager +Exec=kvpm +X-KDE-SubstituteUID=true +Type=Application +Categories=System;KDE; --- kvpm-0.4.5b.orig/debian/compat +++ kvpm-0.4.5b/debian/compat @@ -0,0 +1 @@ +7 --- kvpm-0.4.5b.orig/debian/patches/kubuntu_03_ext4.diff +++ kvpm-0.4.5b/debian/patches/kubuntu_03_ext4.diff @@ -0,0 +1,194 @@ +--- kvpm/devicesizechartseg.cpp.orig ++++ kvpm/devicesizechartseg.cpp +@@ -54,6 +54,8 @@ + colorset->setColor(QPalette::Window, Qt::blue); + else if(use == "ext3") + colorset->setColor(QPalette::Window, Qt::darkBlue); ++ else if(use == "ext4") ++ colorset->setColor(QPalette::Window, Qt::darkGreen); + else if(use == "reiserfs") + colorset->setColor(QPalette::Window, Qt::red); + else if(use == "vfat") +--- kvpm/lvcreate.cpp.orig ++++ kvpm/lvcreate.cpp +@@ -59,7 +59,7 @@ + QString mount_point; + + QString fs = logicalVolume->getFilesystem(); +- QString warning_message = "Currently only the ext2, ext3 and reiserfs file systems are"; ++ QString warning_message = "Currently only the ext2, ext3, ext4 and reiserfs file systems are"; + warning_message.append(" supported for file system extention. If this logical volume has "); + warning_message.append(" a filesystem or data, it will need to be extended separately!"); + +@@ -125,7 +125,7 @@ + return false; + } + } +- else if( (fs != "ext2") && (fs != "ext3") && (fs != "reiserfs") ){ ++ else if( (fs != "ext2") && (fs != "ext3") && (fs != "ext4") && (fs != "reiserfs") ){ + if(KMessageBox::warningContinueCancel(0, warning_message) != KMessageBox::Continue) + return false; + else{ +@@ -987,7 +987,7 @@ + if( fs == "xfs" ){ + args << "xfs_growfs" << mount_point; + } +- else if( (fs == "ext2") || (fs == "ext3") ){ ++ else if( (fs == "ext2") || (fs == "ext3") || (fs == "ext4") ){ + args << "resize2fs" << "-f" + << "/dev/" + m_vg->getName() + "/" + m_lv->getName(); + } +--- kvpm/lvreduce.cpp.orig ++++ kvpm/lvreduce.cpp +@@ -31,7 +31,7 @@ + fs = logicalVolume->getFilesystem(); + state = logicalVolume->getState(); + +- QString warning_message = "Currently only the ext2 and ext3 file systems are supported"; ++ QString warning_message = "Currently only the ext2, ext3 and ext4 file systems are supported"; + warning_message.append("for file system reduction. If this logical volume is reduced"); + warning_message.append(" any data it contains will be lost!"); + +@@ -75,7 +75,7 @@ + KMessageBox::error(0, "The filesystem must be unmounted first"); + return false; + } +- else if( (fs != "ext2") && (fs != "ext3") ){ ++ else if( (fs != "ext2") && (fs != "ext3") && (fs != "ext4") ){ + if(KMessageBox::warningContinueCancel(0, warning_message) != KMessageBox::Continue) + return false; + else{ +@@ -172,7 +172,8 @@ + long long new_size = getSizeEditExtents( m_size_combo->currentIndex() ); + new_size *= m_vg->getExtentSize(); + +- if( (m_lv->getFilesystem() == "ext2") || (m_lv->getFilesystem() == "ext3") ){ ++ if( (m_lv->getFilesystem() == "ext2") || (m_lv->getFilesystem() == "ext3") || ++ (m_lv->getFilesystem() == "ext4") ){ + fs_arguments << "resize2fs" + << "-f" + << "/dev/mapper/" + m_vg->getName() + "-" + m_lv->getName() +--- kvpm/lvsizechartseg.cpp.orig ++++ kvpm/lvsizechartseg.cpp +@@ -53,6 +53,8 @@ + colorset->setColor(QPalette::Window, Qt::blue); + else if(use == "ext3") + colorset->setColor(QPalette::Window, Qt::darkBlue); ++ else if(use == "ext4") ++ colorset->setColor(QPalette::Window, Qt::darkGreen); + else if(use == "reiserfs") + colorset->setColor(QPalette::Window, Qt::red); + else if(use == "reiser4") +--- kvpm/mkfs.cpp.orig ++++ kvpm/mkfs.cpp +@@ -117,6 +117,7 @@ + radio_box = new QGroupBox("Filesystem"); + ext2 = new QRadioButton("Ext2", this); + ext3 = new QRadioButton("Ext3", this); ++ ext4 = new QRadioButton("Ext4", this); + reiser = new QRadioButton("Reiser", this); + jfs = new QRadioButton("jfs", this); + xfs = new QRadioButton("xfs", this); +@@ -124,8 +125,9 @@ + vfat = new QRadioButton("ms-dos", this); + radio_left_layout->addWidget(ext2); + radio_left_layout->addWidget(ext3); ++ radio_left_layout->addWidget(ext4); + radio_left_layout->addWidget(reiser); +- radio_left_layout->addWidget(jfs); ++ radio_right_layout->addWidget(jfs); + radio_right_layout->addWidget(xfs); + radio_right_layout->addWidget(vfat); + radio_right_layout->addWidget(swap); +@@ -144,6 +146,8 @@ + type = "ext2"; + if(ext3->isChecked()) + type = "ext3"; ++ if(ext4->isChecked()) ++ type = "ext4"; + if(reiser->isChecked()){ + mkfs_options << "-q"; + type = "reiserfs"; +--- kvpm/mkfs.h.orig ++++ kvpm/mkfs.h +@@ -30,7 +30,7 @@ + class MkfsDialog : public KDialog + { + QGroupBox *radio_box; +- QRadioButton *ext2, *ext3, *reiser, *jfs, *xfs, *vfat, *swap; ++ QRadioButton *ext2, *ext3, *ext4, *reiser, *jfs, *xfs, *vfat, *swap; + QString type; + QString path; + +--- kvpm/mount.cpp.orig ++++ kvpm/mount.cpp +@@ -75,6 +75,7 @@ + + ext2_button = new QRadioButton("Ext2", this); + ext3_button = new QRadioButton("Ext3", this); ++ ext4_button = new QRadioButton("Ext4", this); + reiserfs3_button = new QRadioButton("Reiserfs Ver. 3", this); + reiserfs4_button = new QRadioButton("Reiserfs Ver. 4", this); + xfs_button = new QRadioButton("Xfs", this); +@@ -90,6 +91,8 @@ + ext2_button->setChecked(true); + else if( m_filesystem_type == "ext3" ) + ext3_button->setChecked(true); ++ else if( m_filesystem_type == "ext4" ) ++ ext4_button->setChecked(true); + else if( m_filesystem_type == "reiserfs" ) + reiserfs3_button->setChecked(true); + else if( m_filesystem_type == "reiser4" ) +@@ -116,6 +119,7 @@ + + layout_left->addWidget(ext2_button); + layout_left->addWidget(ext3_button); ++ layout_left->addWidget(ext4_button); + layout_left->addWidget(vfat_button); + layout_center->addWidget(reiserfs3_button); + layout_center->addWidget(reiserfs4_button); +@@ -243,6 +247,9 @@ + connect(ext3_button, SIGNAL( toggled(bool) ), + this, SLOT( toggleAdditionalOptions(bool))); + ++ connect(ext4_button, SIGNAL( toggled(bool) ), ++ this, SLOT( toggleAdditionalOptions(bool))); ++ + connect(reiserfs3_button, SIGNAL( toggled(bool) ), + this, SLOT( toggleAdditionalOptions(bool))); + +@@ -323,6 +330,8 @@ + m_filesystem_type = "ext2"; + else if( ext3_button->isChecked() ) + m_filesystem_type = "ext3"; ++ else if( ext4_button->isChecked() ) ++ m_filesystem_type = "ext4"; + else if( reiserfs3_button->isChecked() ) + m_filesystem_type = "reiserfs"; + else if( reiserfs4_button->isChecked() ) +@@ -447,12 +456,13 @@ + + void MountDialog::toggleAdditionalOptions(bool) + { +- if( ext3_button->isChecked() ) ++ if( ext3_button->isChecked() || ext4_button->isChecked() ) + m_filesystem_journal_box->setEnabled(true); + else + m_filesystem_journal_box->setEnabled(false); + + if( ext2_button->isChecked() || ext3_button->isChecked() || ++ ext4_button->isChecked() || + reiserfs3_button->isChecked() || reiserfs4_button->isChecked() ){ + + acl_check->setEnabled(true); +--- kvpm/mount.h.orig ++++ kvpm/mount.h +@@ -38,7 +38,7 @@ + m_device_to_mount, // The complete device path + m_filesystem_type; // ext3, reiserfs, vfat etc. + +- QRadioButton *ext2_button, *ext3_button, *reiserfs3_button, *reiserfs4_button, ++ QRadioButton *ext2_button, *ext3_button, *ext4_button, *reiserfs3_button, *reiserfs4_button, + *xfs_button, *jfs_button, *vfat_button, *specify_button, + *udf_button, *iso9660_button, *hfs_button, + *atime_button, *noatime_button, *nodiratime_button, *relatime_button, --- kvpm-0.4.5b.orig/debian/patches/series +++ kvpm-0.4.5b/debian/patches/series @@ -0,0 +1,3 @@ +kubuntu_01_add_install_target.diff +kubuntu_02_missing_include.diff +kubuntu_03_ext4.diff --- kvpm-0.4.5b.orig/debian/patches/kubuntu_01_add_install_target.diff +++ kvpm-0.4.5b/debian/patches/kubuntu_01_add_install_target.diff @@ -0,0 +1,8 @@ +diff -Nur -x '*.orig' -x '*~' kvpm-0.4.5b/kvpm/CMakeLists.txt kvpm-0.4.5b.new/kvpm/CMakeLists.txt +--- kvpm/CMakeLists.txt 2008-03-25 02:50:53.000000000 +0100 ++++ kvpm/CMakeLists.txt 2008-06-28 19:35:45.000000000 +0200 +@@ -25,3 +25,4 @@ + + kde4_add_executable(kvpm ${kvpm_SRCS}) + target_link_libraries(kvpm ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${QT_LIBRARIES} blkid parted) ++INSTALL(TARGETS kvpm DESTINATION bin) --- kvpm-0.4.5b.orig/debian/patches/kubuntu_02_missing_include.diff +++ kvpm-0.4.5b/debian/patches/kubuntu_02_missing_include.diff @@ -0,0 +1,11 @@ +diff -Nur -x '*.orig' -x '*~' kvpm-0.4.5b/kvpm/processprogress.h kvpm-0.4.5b.new/kvpm/processprogress.h +--- kvpm/processprogress.h 2008-03-17 03:15:24.000000000 +0100 ++++ kvpm/processprogress.h 2008-07-21 16:28:52.000000000 +0200 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + + class KProcess; --- kvpm-0.4.5b.orig/debian/cdbs/kde.mk +++ kvpm-0.4.5b/debian/cdbs/kde.mk @@ -0,0 +1,102 @@ +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config + +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_CMAKE_EXTRA_FLAGS += \ + -DCMAKE_BUILD_TYPE=Debian \ + $(KDE4-ENABLE-FINAL) \ + -DKDE4_BUILD_TESTS=false \ + -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" \ + -DCMAKE_SKIP_RPATH=true \ + -DKDE4_USE_ALWAYS_FULL_RPATH=false \ + -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \ + -DDATA_INSTALL_DIR=/usr/share/kde4/apps \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \ + -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \ + -DLIB_INSTALL_DIR=/usr/lib \ + -DSYSCONF_INSTALL_DIR=/etc + +# Set the one below to something else than 'yes' to disable linking +# with --as-needed (on by default) +DEB_KDE_LINK_WITH_AS_NEEDED ?= yes +ifneq (,$(findstring yes, $(DEB_KDE_LINK_WITH_AS_NEEDED))) + ifeq (,$(findstring no-as-needed, $(DEB_BUILD_OPTIONS))) + DEB_KDE_LINK_WITH_AS_NEEDED := yes + DEB_CMAKE_EXTRA_FLAGS += \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" + else + DEB_KDE_LINK_WITH_AS_NEEDED := no + endif +else + DEB_KDE_LINK_WITH_AS_NEEDED := no +endif + +#DEB_CMAKE_PREFIX = /usr/lib/kde4 +#DEB_DH_INSTALL_SOURCEDIR = debian/tmp +#DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/ +DEB_KDE_ENABLE_FINAL ?= +#DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share +#DEB_STRIP_EXCLUDE = so + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + KDE4-ENABLE-FINAL = $(if $(DEB_KDE_ENABLE_FINAL),-DKDE4_ENABLE_FINAL=true,) + else + KDE4-ENABLE-FINAL = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +clean:: +ifndef THIS_SHOULD_GO_TO_UNSTABLE + #guard against experimental uploads to unstable + #dpkg-parsechangelog | grep ^Distribution | grep -q 'experimental\|UNRELEASED' +endif + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -f CMakeCache.txt + + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ + done +