tag 604274 patch tag 410295 patch tag 428208 patch thanks Hi! I am attaching a patch for fixing #604274, wich in turn would close #410295 and #428208.
I will possibly upload this to delayed/10 as an NMU. Please, feel free to contac me if any doubt/comment arises. Kinds regards, Lisandro. -- You are the Doc, Doc! Marty McFly To Dr. Emmett Brown, Back to the Future III Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/
diff --git a/debian/changelog b/debian/changelog
index b75948a..fe22bea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+hotswap (0.4.0-11.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Do not build the KDE 3's GUI, removing kde4libs-dev B-D (Closes: #604274).
+ * Remove Qt 3 dependency, as it's not needed without kde4libs-dev.
+ * Add quilt as B-D for patching the makefiles and allow clean not to fail.
+ * Close the split wishlist bug, as it will not apply any further
+ (Closes: #428208).
+ * Close the innapropiate hdd icon bug as it will not longer apply
+ (Closes: #410295).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <perezme...@gmail.com> Thu, 10 Mar 2011 19:33:18 -0300
+
hotswap (0.4.0-11) unstable; urgency=low
* Clean up a bit, remove lintian errors/warnings
diff --git a/debian/control b/debian/control
index 50c544e..dae61f1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: hotswap
Section: admin
Priority: optional
Maintainer: Alberto Gonzalez Iniesta <a...@inittab.org>
-Build-Depends: debhelper (>> 4.0.0), lesstif2-dev, libxml2-dev, gettext, libqt3-mt-dev, kdelibs4-dev
+Build-Depends: debhelper (>> 4.0.0), lesstif2-dev, libxml2-dev, gettext, quilt (>= 0.46-7~)
Standards-Version: 3.7.3
Package: hotswap-text
@@ -36,7 +36,7 @@ Description: (de)register hotswappable IDE hardware (GUI front-ends)
Note that this utility is not required to insert or remove batteries
or floppy disk drives; only for IDE devices.
.
- This package includes the KDE and Motif front-ends to the command line tool.
+ This package includes the Motif front-end to the command line tool.
Package: hotswap
Architecture: all
diff --git a/debian/hotswap-gui.install b/debian/hotswap-gui.install
index 7a46938..9e3a756 100644
--- a/debian/hotswap-gui.install
+++ b/debian/hotswap-gui.install
@@ -1,29 +1,6 @@
-usr/bin/khotswap
usr/bin/xhotswap
-usr/share/locale/de/LC_MESSAGES/khotswap.mo
usr/share/locale/de/LC_MESSAGES/xhotswap.mo
-usr/share/locale/fr/LC_MESSAGES/khotswap.mo
usr/share/locale/fr/LC_MESSAGES/xhotswap.mo
-usr/share/locale/nl/LC_MESSAGES/khotswap.mo
usr/share/locale/nl/LC_MESSAGES/xhotswap.mo
-usr/share/locale/es/LC_MESSAGES/khotswap.mo
usr/share/locale/es/LC_MESSAGES/xhotswap.mo
-usr/share/locale/sv/LC_MESSAGES/khotswap.mo
usr/share/locale/sv/LC_MESSAGES/xhotswap.mo
-usr/share/apps/khotswap/icons/crystalsvg/16x16/apps/khotswap.png
-usr/share/apps/khotswap/icons/crystalsvg/16x16/devices/khotswap_no_device.png
-usr/share/apps/khotswap/icons/crystalsvg/22x22/devices/khotswap_no_device.png
-usr/share/apps/khotswap/icons/crystalsvg/32x32/devices/khotswap_no_device.png
-usr/share/apps/khotswap/icons/crystalsvg/32x32/apps/khotswap.png
-usr/share/apps/khotswap/icons/crystalsvg/48x48/apps/khotswap.png
-usr/share/apps/khotswap/icons/crystalsvg/48x48/devices/khotswap_no_device.png
-usr/share/apps/khotswap/icons/hicolor/16x16/actions/khotswap_insert.png
-usr/share/apps/khotswap/icons/hicolor/16x16/actions/khotswap_remove.png
-usr/share/apps/khotswap/icons/hicolor/16x16/actions/khotswap_swap.png
-usr/share/apps/khotswap/icons/hicolor/16x16/apps/khotswap.png
-usr/share/apps/khotswap/icons/hicolor/16x16/devices/khotswap_no_device.png
-usr/share/apps/khotswap/icons/hicolor/22x22/devices/khotswap_no_device.png
-usr/share/apps/khotswap/icons/hicolor/32x32/apps/khotswap.png
-usr/share/apps/khotswap/icons/hicolor/32x32/devices/khotswap_no_device.png
-usr/share/apps/khotswap/icons/hicolor/48x48/apps/khotswap.png
-usr/share/apps/khotswap/icons/hicolor/48x48/devices/khotswap_no_device.png
diff --git a/debian/hotswap-gui.manpages b/debian/hotswap-gui.manpages
index b92e892..0a4bf4b 100644
--- a/debian/hotswap-gui.manpages
+++ b/debian/hotswap-gui.manpages
@@ -1,2 +1 @@
-debian/tmp/usr/share/man/man1/khotswap.1
debian/tmp/usr/share/man/man1/xhotswap.1
diff --git a/debian/hotswap-gui.menu b/debian/hotswap-gui.menu
index 4dc5a4e..63d451e 100644
--- a/debian/hotswap-gui.menu
+++ b/debian/hotswap-gui.menu
@@ -1,2 +1 @@
?package(hotswap-gui):needs="x11" section="Applications/System/Hardware" title="xhotswap" command="/usr/bin/xhotswap"
-?package(hotswap-gui):needs="x11" section="Applications/System/Hardware" title="khotswap" command="/usr/bin/khotswap %i %m -caption \"%c\""
diff --git a/debian/patches/01_remove_kde_frontend.patch b/debian/patches/01_remove_kde_frontend.patch
new file mode 100644
index 0000000..286d01d
--- /dev/null
+++ b/debian/patches/01_remove_kde_frontend.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,6 +17,6 @@
+ ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ SUBDIRS = @subdirs@ src m4 po doc
+-DIST_SUBDIRS = kde-frontend motif-frontend src m4 po doc
++DIST_SUBDIRS = motif-frontend src m4 po doc
+
+ ACLOCAL_AMFLAGS = -I m4
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -132,7 +132,7 @@
+ target_alias = @target_alias@
+
+ SUBDIRS = @subdirs@ src m4 po doc
+-DIST_SUBDIRS = kde-frontend motif-frontend src m4 po doc
++DIST_SUBDIRS = motif-frontend src m4 po doc
+
+ ACLOCAL_AMFLAGS = -I m4
+ subdir = .
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..465859a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_remove_kde_frontend.patch
diff --git a/debian/rules b/debian/rules
index 6c3069f..18c1001 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,9 @@ endif
config.status: configure
dh_testdir
+ dh_quilt_patch
# Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-kde-frontend
build: build-stamp
@@ -57,10 +58,6 @@ clean:
-test -r /usr/share/misc/config.guess && \
cp -f /usr/share/misc/config.guess config.guess
-test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub kde-frontend/admin/config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess kde-frontend/admin/config.guess
- -test -r /usr/share/misc/config.sub && \
cp -f /usr/share/misc/config.sub motif-frontend/config.sub
-test -r /usr/share/misc/config.guess && \
cp -f /usr/share/misc/config.guess motif-frontend/config.guess
@@ -68,6 +65,7 @@ clean:
find . -name '*.gmo' -exec rm -f {} \;
+ dh_quilt_unpatch
dh_clean
install: build
signature.asc
Description: This is a digitally signed message part.
