Merge lp:~cjwatson/kvpm/ext4 into lp:~kubuntu-packagers/kubuntu-packaging/kvpm

Proposed by Colin Watson
Status: Merged
Merged at revision: 21
Proposed branch: lp:~cjwatson/kvpm/ext4
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kvpm
Diff against target: None lines
To merge this branch: bzr merge lp:~cjwatson/kvpm/ext4
Reviewer Review Type Date Requested Status
Harald Sitter Approve
Guillaume Martres Pending
Review via email: mp+5270@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

I've uploaded this to Jaunty; see bug 335972.

Revision history for this message
Harald Sitter (apachelogger) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2008-12-12 12:20:14 +0000
3+++ debian/changelog 2009-04-07 01:36:07 +0000
4@@ -1,3 +1,9 @@
5+kvpm (0.4.5b-0ubuntu5) jaunty; urgency=low
6+
7+ * Add ext4 support (LP: #335972).
8+
9+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 07 Apr 2009 02:32:50 +0100
10+
11 kvpm (0.4.5b-0ubuntu4) jaunty; urgency=low
12
13 * No change rebuild for libparted1.8-9 -> libparted1.8-10 transition
14
15=== added file 'debian/patches/kubuntu_03_ext4.diff'
16--- debian/patches/kubuntu_03_ext4.diff 1970-01-01 00:00:00 +0000
17+++ debian/patches/kubuntu_03_ext4.diff 2009-04-07 01:24:00 +0000
18@@ -0,0 +1,194 @@
19+--- kvpm/devicesizechartseg.cpp.orig
20++++ kvpm/devicesizechartseg.cpp
21+@@ -54,6 +54,8 @@
22+ colorset->setColor(QPalette::Window, Qt::blue);
23+ else if(use == "ext3")
24+ colorset->setColor(QPalette::Window, Qt::darkBlue);
25++ else if(use == "ext4")
26++ colorset->setColor(QPalette::Window, Qt::darkGreen);
27+ else if(use == "reiserfs")
28+ colorset->setColor(QPalette::Window, Qt::red);
29+ else if(use == "vfat")
30+--- kvpm/lvcreate.cpp.orig
31++++ kvpm/lvcreate.cpp
32+@@ -59,7 +59,7 @@
33+ QString mount_point;
34+
35+ QString fs = logicalVolume->getFilesystem();
36+- QString warning_message = "Currently only the ext2, ext3 and reiserfs file systems are";
37++ QString warning_message = "Currently only the ext2, ext3, ext4 and reiserfs file systems are";
38+ warning_message.append(" supported for file system extention. If this logical volume has ");
39+ warning_message.append(" a filesystem or data, it will need to be extended separately!");
40+
41+@@ -125,7 +125,7 @@
42+ return false;
43+ }
44+ }
45+- else if( (fs != "ext2") && (fs != "ext3") && (fs != "reiserfs") ){
46++ else if( (fs != "ext2") && (fs != "ext3") && (fs != "ext4") && (fs != "reiserfs") ){
47+ if(KMessageBox::warningContinueCancel(0, warning_message) != KMessageBox::Continue)
48+ return false;
49+ else{
50+@@ -987,7 +987,7 @@
51+ if( fs == "xfs" ){
52+ args << "xfs_growfs" << mount_point;
53+ }
54+- else if( (fs == "ext2") || (fs == "ext3") ){
55++ else if( (fs == "ext2") || (fs == "ext3") || (fs == "ext4") ){
56+ args << "resize2fs" << "-f"
57+ << "/dev/" + m_vg->getName() + "/" + m_lv->getName();
58+ }
59+--- kvpm/lvreduce.cpp.orig
60++++ kvpm/lvreduce.cpp
61+@@ -31,7 +31,7 @@
62+ fs = logicalVolume->getFilesystem();
63+ state = logicalVolume->getState();
64+
65+- QString warning_message = "Currently only the ext2 and ext3 file systems are supported";
66++ QString warning_message = "Currently only the ext2, ext3 and ext4 file systems are supported";
67+ warning_message.append("for file system reduction. If this logical volume is reduced");
68+ warning_message.append(" any data it contains will be lost!");
69+
70+@@ -75,7 +75,7 @@
71+ KMessageBox::error(0, "The filesystem must be unmounted first");
72+ return false;
73+ }
74+- else if( (fs != "ext2") && (fs != "ext3") ){
75++ else if( (fs != "ext2") && (fs != "ext3") && (fs != "ext4") ){
76+ if(KMessageBox::warningContinueCancel(0, warning_message) != KMessageBox::Continue)
77+ return false;
78+ else{
79+@@ -172,7 +172,8 @@
80+ long long new_size = getSizeEditExtents( m_size_combo->currentIndex() );
81+ new_size *= m_vg->getExtentSize();
82+
83+- if( (m_lv->getFilesystem() == "ext2") || (m_lv->getFilesystem() == "ext3") ){
84++ if( (m_lv->getFilesystem() == "ext2") || (m_lv->getFilesystem() == "ext3") ||
85++ (m_lv->getFilesystem() == "ext4") ){
86+ fs_arguments << "resize2fs"
87+ << "-f"
88+ << "/dev/mapper/" + m_vg->getName() + "-" + m_lv->getName()
89+--- kvpm/lvsizechartseg.cpp.orig
90++++ kvpm/lvsizechartseg.cpp
91+@@ -53,6 +53,8 @@
92+ colorset->setColor(QPalette::Window, Qt::blue);
93+ else if(use == "ext3")
94+ colorset->setColor(QPalette::Window, Qt::darkBlue);
95++ else if(use == "ext4")
96++ colorset->setColor(QPalette::Window, Qt::darkGreen);
97+ else if(use == "reiserfs")
98+ colorset->setColor(QPalette::Window, Qt::red);
99+ else if(use == "reiser4")
100+--- kvpm/mkfs.cpp.orig
101++++ kvpm/mkfs.cpp
102+@@ -117,6 +117,7 @@
103+ radio_box = new QGroupBox("Filesystem");
104+ ext2 = new QRadioButton("Ext2", this);
105+ ext3 = new QRadioButton("Ext3", this);
106++ ext4 = new QRadioButton("Ext4", this);
107+ reiser = new QRadioButton("Reiser", this);
108+ jfs = new QRadioButton("jfs", this);
109+ xfs = new QRadioButton("xfs", this);
110+@@ -124,8 +125,9 @@
111+ vfat = new QRadioButton("ms-dos", this);
112+ radio_left_layout->addWidget(ext2);
113+ radio_left_layout->addWidget(ext3);
114++ radio_left_layout->addWidget(ext4);
115+ radio_left_layout->addWidget(reiser);
116+- radio_left_layout->addWidget(jfs);
117++ radio_right_layout->addWidget(jfs);
118+ radio_right_layout->addWidget(xfs);
119+ radio_right_layout->addWidget(vfat);
120+ radio_right_layout->addWidget(swap);
121+@@ -144,6 +146,8 @@
122+ type = "ext2";
123+ if(ext3->isChecked())
124+ type = "ext3";
125++ if(ext4->isChecked())
126++ type = "ext4";
127+ if(reiser->isChecked()){
128+ mkfs_options << "-q";
129+ type = "reiserfs";
130+--- kvpm/mkfs.h.orig
131++++ kvpm/mkfs.h
132+@@ -30,7 +30,7 @@
133+ class MkfsDialog : public KDialog
134+ {
135+ QGroupBox *radio_box;
136+- QRadioButton *ext2, *ext3, *reiser, *jfs, *xfs, *vfat, *swap;
137++ QRadioButton *ext2, *ext3, *ext4, *reiser, *jfs, *xfs, *vfat, *swap;
138+ QString type;
139+ QString path;
140+
141+--- kvpm/mount.cpp.orig
142++++ kvpm/mount.cpp
143+@@ -75,6 +75,7 @@
144+
145+ ext2_button = new QRadioButton("Ext2", this);
146+ ext3_button = new QRadioButton("Ext3", this);
147++ ext4_button = new QRadioButton("Ext4", this);
148+ reiserfs3_button = new QRadioButton("Reiserfs Ver. 3", this);
149+ reiserfs4_button = new QRadioButton("Reiserfs Ver. 4", this);
150+ xfs_button = new QRadioButton("Xfs", this);
151+@@ -90,6 +91,8 @@
152+ ext2_button->setChecked(true);
153+ else if( m_filesystem_type == "ext3" )
154+ ext3_button->setChecked(true);
155++ else if( m_filesystem_type == "ext4" )
156++ ext4_button->setChecked(true);
157+ else if( m_filesystem_type == "reiserfs" )
158+ reiserfs3_button->setChecked(true);
159+ else if( m_filesystem_type == "reiser4" )
160+@@ -116,6 +119,7 @@
161+
162+ layout_left->addWidget(ext2_button);
163+ layout_left->addWidget(ext3_button);
164++ layout_left->addWidget(ext4_button);
165+ layout_left->addWidget(vfat_button);
166+ layout_center->addWidget(reiserfs3_button);
167+ layout_center->addWidget(reiserfs4_button);
168+@@ -243,6 +247,9 @@
169+ connect(ext3_button, SIGNAL( toggled(bool) ),
170+ this, SLOT( toggleAdditionalOptions(bool)));
171+
172++ connect(ext4_button, SIGNAL( toggled(bool) ),
173++ this, SLOT( toggleAdditionalOptions(bool)));
174++
175+ connect(reiserfs3_button, SIGNAL( toggled(bool) ),
176+ this, SLOT( toggleAdditionalOptions(bool)));
177+
178+@@ -323,6 +330,8 @@
179+ m_filesystem_type = "ext2";
180+ else if( ext3_button->isChecked() )
181+ m_filesystem_type = "ext3";
182++ else if( ext4_button->isChecked() )
183++ m_filesystem_type = "ext4";
184+ else if( reiserfs3_button->isChecked() )
185+ m_filesystem_type = "reiserfs";
186+ else if( reiserfs4_button->isChecked() )
187+@@ -447,12 +456,13 @@
188+
189+ void MountDialog::toggleAdditionalOptions(bool)
190+ {
191+- if( ext3_button->isChecked() )
192++ if( ext3_button->isChecked() || ext4_button->isChecked() )
193+ m_filesystem_journal_box->setEnabled(true);
194+ else
195+ m_filesystem_journal_box->setEnabled(false);
196+
197+ if( ext2_button->isChecked() || ext3_button->isChecked() ||
198++ ext4_button->isChecked() ||
199+ reiserfs3_button->isChecked() || reiserfs4_button->isChecked() ){
200+
201+ acl_check->setEnabled(true);
202+--- kvpm/mount.h.orig
203++++ kvpm/mount.h
204+@@ -38,7 +38,7 @@
205+ m_device_to_mount, // The complete device path
206+ m_filesystem_type; // ext3, reiserfs, vfat etc.
207+
208+- QRadioButton *ext2_button, *ext3_button, *reiserfs3_button, *reiserfs4_button,
209++ QRadioButton *ext2_button, *ext3_button, *ext4_button, *reiserfs3_button, *reiserfs4_button,
210+ *xfs_button, *jfs_button, *vfat_button, *specify_button,
211+ *udf_button, *iso9660_button, *hfs_button,
212+ *atime_button, *noatime_button, *nodiratime_button, *relatime_button,
213
214=== modified file 'debian/patches/series'
215--- debian/patches/series 2008-07-21 14:30:44 +0000
216+++ debian/patches/series 2009-04-07 01:24:00 +0000
217@@ -1,2 +1,3 @@
218 kubuntu_01_add_install_target.diff
219 kubuntu_02_missing_include.diff
220+kubuntu_03_ext4.diff

Subscribers

People subscribed via source and target branches