Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/debian


Modified Files:
      Tag: branch-exp
        README.Debian changelog control rules 
Removed Files:
      Tag: branch-exp
        Makefile.am 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 


Log Message:
Merge.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/debian/README.Debian,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -3 -r1.1 -r1.1.2.1
--- README.Debian       24 May 2000 17:48:03 -0000      1.1
+++ README.Debian       15 Aug 2004 07:28:25 -0000      1.1.2.1
@@ -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
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/debian/changelog,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -3 -r1.13 -r1.13.2.1
--- changelog   24 May 2000 19:45:43 -0000      1.13
+++ changelog   15 Aug 2004 07:28:25 -0000      1.13.2.1
@@ -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
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/debian/control,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -3 -r1.16 -r1.16.2.1
--- control     24 May 2000 19:23:33 -0000      1.16
+++ control     15 Aug 2004 07:28:25 -0000      1.16.2.1
@@ -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.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/debian/rules,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -3 -r1.26 -r1.26.2.1
--- rules       24 May 2000 17:56:48 -0000      1.26
+++ rules       15 Aug 2004 07:28:26 -0000      1.26.2.1
@@ -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




-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to