On 11.08.2004 01:21:02, Julien Portalier wrote:
I can't reproduce the above bug, but i'm experiencing a strange behavior when upgrading from 0.16.6 to 0.16.7 : I lose every menus (when clicking on the desktop) on a fresh install (meaning i removed ~/.enlightenment).
The problem is even bigger: when trying some CVS build of 0.16.7 and upgrading from 0.16.7 (cvs or not) to a new one, I losed the menus too ! I had to take my old ~/.enlightenment from 0.16.6 (hopefully I add it in a backup) to get the menus back (meaning I lose every preferences I could have set since).
I'm running Debian Sarge, and 0.16.6 came from debian repository, while 0.16.7 are home made packages.
Replying to myself: the bug was within the debian builds (debian/ rules). Thanks goes to Jens Taprogge for pointing me to where the bug was. I did a lot of updates, bufixes and cleanup in the e16/e/debian directory, and everything is working as expected now.
I join a patch that applies to current CVS and should correct the debian packaging.
JMG
diff -urN e/configure.in e.deb/configure.in --- e/configure.in 2004-08-02 19:19:56.000000000 +0000 +++ e.deb/configure.in 2004-08-11 16:02:34.000000000 +0000 @@ -199,5 +199,4 @@ misc/Makefile po/Makefile.in intl/Makefile -debian/Makefile ]) diff -urN e/debian/changelog e.deb/debian/changelog --- e/debian/changelog 2000-05-24 19:45:43.000000000 +0000 +++ e.deb/debian/changelog 2004-08-11 16:26:08.000000000 +0000 @@ -1,3 +1,19 @@ +enlightenment (0.16.7.1-0cvs) unstable; urgency=high + + * cvs update + * bugfix on debian/rules + corrects bug with menus + some other corrections + cleanup + + -- Julien Portalier <[EMAIL PROTECTED]> Wed, 11 Aug 2004 00:27:51 +0000 + +enlightenment (0.16.7-1) unstable; urgency=low + + * new upstream release + + -- Julien Portalier <[EMAIL PROTECTED]> Sat, 31 Jul 2004 15:50:34 +0200 + enlightenment (0.16.4-3) unstable; urgency=low * removed xinerama from description diff -urN e/debian/control e.deb/debian/control --- e/debian/control 2000-05-24 19:23:33.000000000 +0000 +++ e.deb/debian/control 2004-08-11 16:24:56.000000000 +0000 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Laurence J. Lane <[EMAIL PROTECTED]> Standards-Version: 3.0.1 -Build-Depends: freetype2-dev, libjpeg62-dev, libungif3g-dev | giflib3g-dev, libesd0-dev, zlib1g-dev, libaudiofile-dev, libfnlib-dev, imlib-dev, libpng2-dev, libtiff3g-dev, gettext +Build-Depends: debhelper(>= 2.0), libfreetype6-dev, libjpeg62-dev, libimlib2-dev, libpng3-dev, gettext, zlib1g-dev Package: enlightenment Architecture: any -Depends: enlightenment-data (>= 0.16.4-1), ${shlibs:Depends} +Depends: enlightenment-data (>= 0.16.7.1), ${shlibs:Depends} Replaces: enlightenment-nosound, enlightenment-sound, enlightenment-theme-brushedmetal, enlightenment-dox Recommends: esound, menu Conflicts: dox, enlightenment-dox, enlightenment-docs, menu (<< 2.0), enlightenment-theme (<< 0.16.1-0) @@ -22,60 +22,15 @@ set of graphical images in a variety of formats. Theme makers can unleash their artistic talents without bounds. Themes are not limited to just different colors and background images on the same old desktop. - . - Enlightenment features the BrushedMetal theme, designed by gimp legend, - tigert. It is predominately grey with the subtle texture of - you - guessed it - brushed metal. The menus in particular look superb. The - sound files for BrushedMetal are in a separate package, - enlightenment-theme-brushedmetal. Package: enlightenment-data Architecture: all Suggests: enlightenment Pre-depends: dpkg (>= 1.4.1.17) Recommends: enlightenment -Conflicts: enlightenment (<< 0.16.3-3) -Replaces: enlightenment (<< 0.16.3-3) +Conflicts: enlightenment (<< 0.16.7.1-0) +Replaces: enlightenment (<< 0.16.7.1-0) Description: Enlightenment Window Manager Run Time Data Files These are the architecture independent runtime support files for the - Enlightenment Window Manger package. - -Package: enlightenment-theme-brushedmetal -Architecture: all -Provides: enlightenment-theme -Suggests: enlightenment -Pre-depends: dpkg (>= 1.4.1.17) -Description: Audio files for the BrushedMEtal-Tigert E Theme - Enlightenment features the BrushedMetal theme as a default. This is a - package contains the audio samples and sound configs that will enhance - your BrushedMetal-Tigert theme experience. - -Package: enlightenment-theme-shinymetal -Architecture: all -Provides: enlightenment-theme -Suggests: enlightenment -Description: Raster's ShinyMetal Theme for E - This is the theme formerly known as 'E15 default'. It is fairly - simple, by raster's standards, and attractive. The motif used is shiny - metal borders, with translucent dark orange highlights. It includes - some nice background pictures. - -Package: enlightenment-theme-bluesteel -Architecture: all -Provides: enlightenment-theme -Suggests: enlightenment -Description: Hunchback's BlueSteel theme for E - This theme really shows off what you can do with enlightenment. It's - by Daniel Erat, and shows off anti-aliased text, extensively shaped - windows, and is compliant with the 0.16.0 theme spec. - -Package: enlightenment-theme-ganymede -Architecture: all -Recommends: enlightenment -Provides: enlightenment-theme -Description: cK's Ganymede theme for E - This is cK's Ganymede theme. It contains pretty much everything that E - can currently do, including configurable pulldown menses, lots of - borders, themes for Eterm and gkrellm, and documentation. The dominant - colors are bright copper and dark blue. Fully up to date with the - E-0.16.0 specs. The author can be reached at [EMAIL PROTECTED] + Enlightenment Window Manager package. + It also contains the default Winter theme. diff -urN e/debian/enlightenment-theme-bluesteel.dirs e.deb/debian/enlightenment-theme-bluesteel.dirs --- e/debian/enlightenment-theme-bluesteel.dirs 2000-05-24 17:48:03.000000000 +0000 +++ e.deb/debian/enlightenment-theme-bluesteel.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/enlightenment/themes diff -urN e/debian/enlightenment-theme-bluesteel.files e.deb/debian/enlightenment-theme-bluesteel.files --- e/debian/enlightenment-theme-bluesteel.files 2000-05-24 17:48:03.000000000 +0000 +++ e.deb/debian/enlightenment-theme-bluesteel.files 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/enlightenment/themes/BlueSteel diff -urN e/debian/enlightenment-theme-brushedmetal.files e.deb/debian/enlightenment-theme-brushedmetal.files --- e/debian/enlightenment-theme-brushedmetal.files 2000-05-24 17:48:03.000000000 +0000 +++ e.deb/debian/enlightenment-theme-brushedmetal.files 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/enlightenment/themes/BrushedMetal-Tigert/sound* diff -urN e/debian/enlightenment-theme-ganymede.dirs e.deb/debian/enlightenment-theme-ganymede.dirs --- e/debian/enlightenment-theme-ganymede.dirs 2000-05-24 19:45:43.000000000 +0000 +++ e.deb/debian/enlightenment-theme-ganymede.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/enlightenment/themes diff -urN e/debian/enlightenment-theme-ganymede.files e.deb/debian/enlightenment-theme-ganymede.files --- e/debian/enlightenment-theme-ganymede.files 2000-05-24 19:45:43.000000000 +0000 +++ e.deb/debian/enlightenment-theme-ganymede.files 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/enlightenment/themes/Ganymede diff -urN e/debian/enlightenment-theme-shinymetal.dirs e.deb/debian/enlightenment-theme-shinymetal.dirs --- e/debian/enlightenment-theme-shinymetal.dirs 2000-05-24 17:48:03.000000000 +0000 +++ e.deb/debian/enlightenment-theme-shinymetal.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/enlightenment/themes diff -urN e/debian/enlightenment-theme-shinymetal.files e.deb/debian/enlightenment-theme-shinymetal.files --- e/debian/enlightenment-theme-shinymetal.files 2000-05-24 17:48:03.000000000 +0000 +++ e.deb/debian/enlightenment-theme-shinymetal.files 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/enlightenment/themes/ShinyMetal diff -urN e/debian/Makefile.am e.deb/debian/Makefile.am --- e/debian/Makefile.am 2001-02-19 23:30:16.000000000 +0000 +++ e.deb/debian/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -EXTRA_DIST = \ -README.Debian \ -changelog \ -control \ -copyright \ -e-utils.1 \ -e-utils.pod \ -enlightenment-theme-bluesteel.dirs \ -enlightenment-theme-bluesteel.files \ -enlightenment-theme-brushedmetal.files \ -enlightenment-theme-ganymede.dirs \ -enlightenment-theme-ganymede.files \ -enlightenment-theme-shinymetal.dirs \ -enlightenment-theme-shinymetal.files \ -enlightenment.conffiles \ -enlightenment.dirs \ -enlightenment.docs \ -enlightenment.files \ -enlightenment.links \ -enlightenment.menu \ -enlightenment.menu-method \ -enlightenment.postinst \ -enlightenment.prerm \ -menumangler.pl \ -rules diff -urN e/debian/README.Debian e.deb/debian/README.Debian --- e/debian/README.Debian 2000-05-24 17:48:03.000000000 +0000 +++ e.deb/debian/README.Debian 2004-08-11 16:02:35.000000000 +0000 @@ -8,9 +8,6 @@ enlightenment (executables, extended docs, scripts, etc.) enlightenment-data (most of /usr/share and brushedmetal) - enlightenment-theme-brushedmetal (sound samples and config) - enlightenment-theme-shinymetal - enlightenment-theme-bluesteel At a minimum, you'll need enlightenment and enlightenment-data installed. See /usr/share/doc/enlightenment for additional diff -urN e/debian/rules e.deb/debian/rules --- e/debian/rules 2000-05-24 17:56:48.000000000 +0000 +++ e.deb/debian/rules 2004-08-11 16:17:47.000000000 +0000 @@ -16,7 +16,7 @@ # Other Stuff pwd:=$(shell pwd) -cfg=--prefix=/usr --enable-upgrade=no --enable-fsstd=yes --mandir=/usr/share/man +cfg=--prefix=/usr --enable-xrandr=yes --enable-fsstd=yes --mandir=/usr/share/man INSTALL=/usr/bin/install -o root -g root build: build-stamp @@ -36,8 +36,8 @@ rm -f build-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean - #-$(MAKE) distclean + #-$(MAKE) clean + -$(MAKE) distclean rm -rf build-stamp dh_clean @@ -60,30 +60,24 @@ # Move files to sub-packages and remove empty directories dh_movefiles --sourcedir=debian/enlightenment-data cd debian/enlightenment-data/usr; rm -rf bin \ - share/enlightenment/themes/BlueSteel \ - share/enlightenment/themes/ShinyMetal \ - share/enlightenment/themes/Ganymede \ debian/enlightenment-data/usr/share/man # Populate /usr/share/doc/enlightenment with interesting looking stuff $(INSTALL) -m 644 ABOUT-NLS INSTALL README AUTHORS NEWS \ debian/enlightenment/usr/share/doc/enlightenment/ - $(INSTALL) -m 644 src/ChangeLog \ + $(INSTALL) -m 644 ChangeLog \ debian/enlightenment/usr/share/doc/enlightenment/changelog-src $(INSTALL) -m 755 sample-scripts/*.{pl,sh} \ debian/enlightenment/usr/share/doc/enlightenment/examples # Add stub to menus.cfg for Debian menus - perl -pw debian/menumangler.pl src/themes/configs/menus.cfg > \ + perl -pw debian/menumangler.pl config/menus.cfg > \ debian/enlightenment-data/usr/share/enlightenment/config/menus.cfg - + # Something is stuffed with EBIN in the install script, so hardcode it perl -pi -lwe 's/^EBIN=.*/EBIN=\/usr\/bin/' \ - debian/enlightenment/usr/bin/enlightenment.install + debian/enlightenment-data/usr/share/enlightenment/scripts/enlightenment.install - # *sigh* - -rm debian/enlightenment-theme-ganymede/usr/share/enlightenment/themes/Ganymede/dialogs/#dialogs.cfg# - # man page cp -v debian/e-utils.1 debian/enlightenment/usr/share/man/man1/ @@ -92,8 +86,6 @@ # affect _all_ packages. Anything you want to only affect one package # should be put in another target, such as the install target. binary-common: - # Need this version of debhelper for DH_OPTIONS to work. - dh_testversion 2.0 dh_testdir dh_testroot dh_installdocs @@ -124,7 +116,7 @@ manpage: pod2man debian/e-utils.pod \ --center="Debian GNU/Linux" \ - --release="woody" > debian/e-utils.1 + --release="sarge" > debian/e-utils.1 binary: install binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff -urN e/Makefile.am e.deb/Makefile.am --- e/Makefile.am 2004-07-19 19:32:24.000000000 +0000 +++ e.deb/Makefile.am 2004-08-11 16:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = intl dox eesh epp src config themes man scripts misc po debian +SUBDIRS = intl dox eesh epp src config themes man scripts misc po EXTRA_DIST = \ sample-scripts/bouncingball.pl \