[Pkg-zenoss-commits] r277 - in /trunk/packages/zenoss/debian: changelog rules zenoss.bash_profile zenoss.bashrc zenoss.install

[zack at users.alioth.debian.org]

Author: zack
Date: Mon Aug 13 15:15:46 2007
New Revision: 277

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=277
Log:
- bugfix in bashrc: ~/bin can't be the only entry in PATH, ls is useful as well :)
- add a bash_profile which simply invokes bashrc (in case one "su -"s)

Added:
    trunk/packages/zenoss/debian/zenoss.bash_profile
      - copied, changed from r275, trunk/packages/zenoss/debian/zenoss.bashrc
Modified:
    trunk/packages/zenoss/debian/changelog
    trunk/packages/zenoss/debian/rules
    trunk/packages/zenoss/debian/zenoss.bashrc
    trunk/packages/zenoss/debian/zenoss.install

Modified: trunk/packages/zenoss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/changelog?rev=277&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/changelog (original)
+++ trunk/packages/zenoss/debian/changelog Mon Aug 13 15:15:46 2007
@@ -1,5 +1,5 @@
-zenoss (2.0.4-0) UNRELEASED; urgency=low
+zenoss (2.0.4-1) UNRELEASED; urgency=low
 
   * Initial release (closes: #361253)
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 13 Aug 2007 16:35:53 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 13 Aug 2007 17:01:23 +0200

Modified: trunk/packages/zenoss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules?rev=277&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules (original)
+++ trunk/packages/zenoss/debian/rules Mon Aug 13 15:15:46 2007
@@ -55,6 +55,7 @@
 	cat $(INST_SQL_SNIPPETS) > debian/sql.install/install-dbadmin/mysql
 	cp debian/sql/mysql-remove.sql debian/sql.install/remove/mysql
 	cp debian/zenoss.bashrc debian/.bashrc
+	cp debian/zenoss.bash_profile debian/.bash_profile
 	touch $@
 
 clean: clean-arch clean-indep unpatch
@@ -74,7 +75,7 @@
 	[ -d PDIS-XPath-0.3 ] && (cd PDIS-XPath-0.3; $(PYTHON) setup.py clean -a) || true
 	[ -d testgen ] && (cd testgen; $(PYTHON) setup.py clean -a) || true
 	[ -d PDIS-XPath-0.3 ] && (find testgen PDIS-XPath-0.3 -name \*.pyc -exec rm -f {} \;) || true
-	rm -f debian/.bashrc
+	rm -f debian/.bashrc debian/.bash_profile
 	rm -rf debian/sql.install/
 
 install: install-indep install-arch

Copied: trunk/packages/zenoss/debian/zenoss.bash_profile (from r275, trunk/packages/zenoss/debian/zenoss.bashrc)
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.bash_profile?rev=277&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.bashrc (original)
+++ trunk/packages/zenoss/debian/zenoss.bash_profile Mon Aug 13 15:15:46 2007
@@ -1,21 +1,7 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
+# ~/.bash_profile: executed by bash(1) for login shells.
 
-export PS1='\h:\w\$ '
-umask 022
+# include .bashrc if it exists
+if [ -f ~/.bashrc ]; then
+    . ~/.bashrc
+fi
 
-# You may uncomment the following lines if you want `ls' to be colorized:
-# export LS_OPTIONS='--color=auto'
-# eval "`dircolors`"
-# alias ls='ls $LS_OPTIONS'
-# alias ll='ls $LS_OPTIONS -l'
-# alias l='ls $LS_OPTIONS -lA'
-#
-# Some more alias to avoid making mistakes:
-# alias rm='rm -i'
-# alias cp='cp -i'
-# alias mv='mv -i'
-
-
-export ZENHOME=$HOME
-export PYTHON=/usr/bin/python2.4
-export PATH=$ZENHOME/bin

Modified: trunk/packages/zenoss/debian/zenoss.bashrc
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.bashrc?rev=277&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.bashrc (original)
+++ trunk/packages/zenoss/debian/zenoss.bashrc Mon Aug 13 15:15:46 2007
@@ -18,4 +18,5 @@
 
 export ZENHOME=$HOME
 export PYTHON=/usr/bin/python2.4
-export PATH=$ZENHOME/bin
+export PATH=$ZENHOME/bin:"${PATH}"
+

Modified: trunk/packages/zenoss/debian/zenoss.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.install?rev=277&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.install (original)
+++ trunk/packages/zenoss/debian/zenoss.install Mon Aug 13 15:15:46 2007
@@ -2,4 +2,5 @@
 inst/conf/*		usr/lib/zenoss/skel/etc/
 bin/*			usr/lib/zenoss/skel/bin/
 debian/.bashrc		usr/lib/zenoss/skel/
+debian/.bash_profile	usr/lib/zenoss/skel/
 debian/sql.install/*	usr/share/dbconfig-common/data/zenoss/