Maximiliano Curia noticed the old bugs that were still present in iceconf
and that are quite simple to fix. And between him and me we prepared a
very loving NMU for iceconf, that fixes practically all the bugs.
I'm attaching the full interdiff of the changes made. I believe they are
really a very well done.
--
Besitos, {o_
Marga. (')_
diff -u iceconf-0.99.33/debian/changelog iceconf-0.99.33/debian/changelog
--- iceconf-0.99.33/debian/changelog
+++ iceconf-0.99.33/debian/changelog
@@ -1,3 +1,19 @@
+iceconf (0.99.33-1.3) unstable; urgency=low
+
+ * Non-maintainer upload to take care of very old bugs. Done with the help
+ of Maximiliano Curia <[EMAIL PROTECTED]>.
+ * Use WorkspacesNames instead of AddWorkspaces
+ (Closes: #39251, #55795, #55802)
+ * Move ~/.icewm if it's a file, instead of failing (Closes: #52363)
+ * Extended description in debian/control (Closes: #209562)
+ * Upgraded debian/control to Standards-Version 3.7.2:
+ - Removed link to undocumented manpage.
+ * Added dpatch support so that all the patches to the previous bugs are
+ stored separately
+ * Removed unneeded rules from debian/rules and tidy it up.
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Thu, 3 Aug 2006 00:58:41 -0300
+
iceconf (0.99.33-1.2) unstable; urgency=low
* Non-maintainer upload.
diff -u iceconf-0.99.33/debian/control iceconf-0.99.33/debian/control
--- iceconf-0.99.33/debian/control
+++ iceconf-0.99.33/debian/control
@@ -5,9 +5,10 @@
-Standards-Version: 3.5.2
-Build-Depends: debhelper (>=4), icewm, libgtk-perl
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>=4), icewm, libgtk-perl, dpatch
Package: iceconf
Architecture: all
Recommends: icewm | icewm-gnome
-Depends: libgtk-perl
+Depends: libgtk-perl
Description: Configuration tool for icewm
- A nice, graphical configuration tool for the icewm window manager.
+ A simple graphical configuration tool for icewm written in perl. It's a quick
+ way to get to know the ~/.icewm/preferences options.
diff -u iceconf-0.99.33/debian/dirs iceconf-0.99.33/debian/dirs
--- iceconf-0.99.33/debian/dirs
+++ iceconf-0.99.33/debian/dirs
@@ -3 +2,0 @@
-usr/share/man/man1
diff -u iceconf-0.99.33/debian/docs iceconf-0.99.33/debian/docs
--- iceconf-0.99.33/debian/docs
+++ iceconf-0.99.33/debian/docs
@@ -1 +1 @@
-ChangeLog README TODO
+README TODO
diff -u iceconf-0.99.33/debian/rules iceconf-0.99.33/debian/rules
--- iceconf-0.99.33/debian/rules
+++ iceconf-0.99.33/debian/rules
@@ -8,8 +8,11 @@
export DH_COMPAT=4
+#include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+
build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
dh_testdir
./configure --prefix=/usr --mandir=/usr/share/man \
@@ -19,7 +22,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp install-stamp
@@ -50,23 +53,14 @@
dh_testdir
dh_testroot
dh_installdocs
- dh_installexamples
dh_installmenu
- dh_installcron
- dh_installman
- ln -s ../man7/undocumented.7.gz
debian/iceconf/usr/share/man/man1/iceconf.1.gz
- rm -f debian/iceconf/usr/doc/iceconf/ChangeLog
- dh_undocumented
+# dh_installman
dh_installchangelogs ChangeLog
- gzip -9 `pwd`/debian/iceconf/usr/share/doc/iceconf/ChangeLog
install -m 644 icemenu `pwd`/debian/iceconf/usr/share/doc/iceconf
- dh_strip
dh_fixperms
dh_compress
dh_installdeb
- dh_shlibdeps
dh_gencontrol
-# dh_makeshlibs
dh_md5sums
dh_builddeb
@@ -77 +71 @@
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary patch unpatch
only in patch2:
unchanged:
--- iceconf-0.99.33.orig/debian/patches/00list
+++ iceconf-0.99.33/debian/patches/00list
@@ -0,0 +1,2 @@
+10_check_icewm_file
+20_WorkspaceNames
only in patch2:
unchanged:
--- iceconf-0.99.33.orig/debian/patches/20_WorkspaceNames.dpatch
+++ iceconf-0.99.33/debian/patches/20_WorkspaceNames.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
[EMAIL PROTECTED]@
+--- iceconf-0.99.33.orig/iceconf.in
++++ iceconf-0.99.33/iceconf.in
+@@ -479,6 +481,9 @@
+ if ($line =~ /\s*AddWorkspace\=\"(.*?)\".*\#?.*$/) {
+ push @Workspaces, $1;
+ }
++ elsif ($line =~ /\s*WorkspaceNames\=\"(.*?)\"$/) {
++ @Workspaces = split("\",\"", $1);
++ }
+ else {
+ eval "\$$line\;\n";
+ }
+@@ -603,10 +608,13 @@
+ $Theme=$$entry->get_text();
+ print PREFS "Theme=\"$Theme\"\n";
+
+-foreach $name (@Workspaces) {
+- print PREFS "AddWorkspace=\"$name\"\n";
++if (@Workspaces) {
++ print PREFS "WorkspaceNames=\"";
++ print PREFS join("\",\"",@Workspaces);
++ print PREFS "\"\n";
+ }
+
++
+ close PREFS;
+ }
+
only in patch2:
unchanged:
--- iceconf-0.99.33.orig/debian/patches/10_check_icewm_file.dpatch
+++ iceconf-0.99.33/debian/patches/10_check_icewm_file.dpatch
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
[EMAIL PROTECTED]@
+--- iceconf-0.99.33.orig/iceconf.in
++++ iceconf-0.99.33/iceconf.in
+@@ -452,7 +452,9 @@
+ # WARNING! This code is naive and lazy. It probably should not be run as root.
+ # I take no responsibility for things it does.
+
+-
++if ( -f "$home/.icewm" ) {
++ system("mv -f $home/.icewm $home/.icewm.old");
++}
+ if ((!(-d "$home/.icewm")) or (!(-e "$home/.icewm/preferences"))) {
+ if (!(-d "$home/.icewm")) {
+ print ".icewm directory not found.
creating...\n";
+
