Hello,
I've uploaded kaffeine 0.7.1-1.1 to fix these bugs. IMO, #329010 was
to be considered RC, so I've preferred to do this ASAP for the benefit
of our users.
NMU diff attached.
Cheers,
--
Adeodato Simó
EM: asp16 [ykwim] alu.ua.es | PK: DA6AE621
Listening to: Johnny Cash - Folsom Prison Blues (Live)
The total accumulated knowledge of all the men that ever walked the Earth
on the topic of women can fit in the period at the end of this sentence.
diff -u kaffeine-0.7.1/debian/changelog kaffeine-0.7.1/debian/changelog
--- kaffeine-0.7.1/debian/changelog
+++ kaffeine-0.7.1/debian/changelog
@@ -1,3 +1,18 @@
+kaffeine (0.7.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ * Make Kaffeine not crash at exist. For this, don't call ./configure with
+ --with-xorg and --with-xinit-workaround. Kudos to Christopher Martin for
+ diagnosing the issue. Closes: #329010, #329143
+
+ * Make Kaffeine not display the configuration wizard every time it starts.
+ For this, remove bogus patch kubuntu_04_locate_wizard_stamp.diff (bug:
+ even if locate() is used to check for system-wide configuration files, the
+ file to write must be obtained with locateLocal()). Closes: #329177
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Sun, 25 Sep 2005 20:08:28 +0200
+
kaffeine (0.7.1-1) unstable; urgency=low
* New upstream release. Closes: #326491
diff -u kaffeine-0.7.1/debian/rules kaffeine-0.7.1/debian/rules
--- kaffeine-0.7.1/debian/rules
+++ kaffeine-0.7.1/debian/rules
@@ -7,7 +7,6 @@
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
-DEB_CONFIGURE_EXTRA_FLAGS += --with-xorg --with-xinit-workaround
DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/
DEB_COMPRESS_EXCLUDE := .docbook
--- kaffeine-0.7.1/debian/patches/kubuntu_04_locate_wizard_stamp.diff
+++ kaffeine-0.7.1.orig/debian/patches/kubuntu_04_locate_wizard_stamp.diff
@@ -1,13 +0,0 @@
-Index: kaffeine/kaffeine.cpp
-===================================================================
---- kaffeine/kaffeine.cpp (revision 86)
-+++ kaffeine/kaffeine.cpp (working copy)
-@@ -141,7 +141,7 @@
- statusBar()->insertItem(i18n("Entries: %1, Playtime:
%2").arg("0").arg("0:00:00"), 9, 0, true);
- statusBar()->insertItem(i18n("No player"), 10, 0, true);
-
-- QString stamp = locateLocal("appdata", "wizard_stamp_v0.7.1");
-+ QString stamp = locate("appdata", "wizard_stamp_v0.7.1");
- if ((!QFile::exists(stamp)) || (wizard))
- {
- WizardDialog* wizardDlg = new WizardDialog( 0, "wizard" );
