[Pkg-zenoss-commits] r321 - in /trunk/packages/zenoss/debian: changelog control copyright rules-extras.mk testgen-convert.xml testgen-twill.xml zenoss-doc.doc-base zenoss-doc.install zenoss-doc.links zenoss-revisions zenoss.dzproduct.ZenTestRunner zenoss.dzproduct.ZenUITests
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Fri Nov 30 15:40:28 UTC 2007
Author: bzed-guest
Date: Fri Nov 30 15:40:28 2007
New Revision: 321
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=321
Log:
cleaning up things, adding dfsg to version number, removing a lot of unneeded stuff, removing zendocs source to put it into a package on its own later.
Removed:
trunk/packages/zenoss/debian/testgen-convert.xml
trunk/packages/zenoss/debian/testgen-twill.xml
trunk/packages/zenoss/debian/zenoss-doc.doc-base
trunk/packages/zenoss/debian/zenoss-doc.install
trunk/packages/zenoss/debian/zenoss-doc.links
trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestRunner
trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUITests
Modified:
trunk/packages/zenoss/debian/changelog
trunk/packages/zenoss/debian/control
trunk/packages/zenoss/debian/copyright
trunk/packages/zenoss/debian/rules-extras.mk
trunk/packages/zenoss/debian/zenoss-revisions
Modified: trunk/packages/zenoss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/changelog?rev=321&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/changelog (original)
+++ trunk/packages/zenoss/debian/changelog Fri Nov 30 15:40:28 2007
@@ -1,4 +1,4 @@
-zenoss (2.0.91~unreleased+r7078-1) UNRELEASED; urgency=low
+zenoss (2.1.1.dfsg-1) UNRELEASED; urgency=low
* Initial release (closes: #361253)
Modified: trunk/packages/zenoss/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/control?rev=321&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/control (original)
+++ trunk/packages/zenoss/debian/control Fri Nov 30 15:40:28 2007
@@ -44,17 +44,6 @@
.
Homepage: http://www.zenoss.com/
-Package: zenoss-doc
-Section: doc
-Architecture: all
-Description: Documentation for Zenoss
- This package contains the documentation for Zenoss, mainly
- the Zenoss Administrator's Guide, which will give an overview
- of the architecture of the Zenoss system and describe how to
- perform common managment tasks.
- .
- Homepage: http://www.zenoss.com/
-
Package: zenoss-zensocket
Architecture: any
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Modified: trunk/packages/zenoss/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/copyright?rev=321&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/copyright (original)
+++ trunk/packages/zenoss/debian/copyright Fri Nov 30 15:40:28 2007
@@ -16,8 +16,8 @@
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+ as published by the Free Software Foundation; version 2
+ of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -37,56 +37,6 @@
Files with different copyrights/licenses:
-
- * PDIS-XPath-0.3/*:
-
- Copyright 2004 Helsinki Institute for Information Technology (HIIT)
- and the authors. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- * testgen/*:
-FIXME FIXME FIXME
-
- Copyright (c) 2006, Matt Harrison and Duncan McGreggor
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-
* Products/ZenModel/tests/framework.py:
Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=321&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Fri Nov 30 15:40:28 2007
@@ -6,9 +6,10 @@
# Define the Zenoss' version we're packaging
VERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,~.*,,g;s,+r.*,,g;s,-.*,,g')
+DFSGVERSION = $(shell echo $(VERSION) | sed 's,\.dfsg,,')
EXTRAVERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,^$(VERSION),,g;;s,+r.*,,g;s,-.*,,g')
REVISION = $(shell dpkg-parsechangelog | grep '^Version' | grep '+r' | sed 's,.*+r,,g;s,-.*,,g')
-REVISION_RELEASE = $(shell grep '^$(VERSION)' $(CURDIR)/debian/zenoss-revisions | \
+REVISION_RELEASE = $(shell grep '^$(DFSGVERSION)' $(CURDIR)/debian/zenoss-revisions | \
awk '{print $$2}')
ifneq "$(REVISION_RELEASE)" ""
@@ -115,11 +116,9 @@
pushd . >/dev/null ;\
cd $$packdir ;\
\
- echo "extracting needed external libs, removing the rest" ;\
- tar xfz inst/externallibs/PDIS-XPath-0.3.tar.gz ;\
+ echo "removing what we don't want to have in the tarball" ;\
+ rm -f ZenWidgets/skins/zenui/flex/ZenNetMap.swf ;\
rm -rf inst/externallibs ;\
- \
- echo "removing what we don't want to have in the tarball" ;\
rm -rf Products/OFolder/ ;\
rm -rf Products/ManagableIndex/ ;\
rm -rf Products/AdvancedQuery/ ;\
@@ -130,26 +129,25 @@
rm -rf Products/PluginRegistry/ ;\
rm -f Products/DataCollector/plugins/setignore.sh ;\
rm -rf Products/Hotfix_20070320 ;\
+ rm -rf Products/ZenUITests ;\
+ rm -rf Products/ZenTestRunner ;\
rm -rf zenpacks ;\
rm -rf zdotnet ;\
rm -rf wmi ;\
rm -rf evtsys ;\
+ rm -rf testgen ;\
rm -rf zenwin ;\
rm -rf zenplugins ;\
rm -rf pynetsnmp ;\
rm -rf scripts ;\
+ rm -rf zendocs ;\
rmdir test || echo "----> please fix: directory test not empty anymore!" ;\
- for fileordir in ZenossDevGuide ZenossQStart-1.0.pdf Zenoss_UI_Changes.xls \
- Selenium Syslog-HOWTO_Screens zenjmx archive; do \
- rm -rf zendocs/$$fileordir ;\
- done ;\
find . -name .svnignore -print0 | xargs -0 rm -f ;\
find . -name .cvsignore -print0 | xargs -0 rm -f ;\
mv inst/* . ;\
rm -rf *.sh zen2dump.py autoinstall ZEN2UPGRADE.txt rpm fs \
docs/INSTALL_* docs/BUILD_* MacOS genpatchdeps.py \
GNUmakefile inst conf/sudoers docs/UPGRADE.txt ;\
- mv zendocs/Admin\ Guide\ 2.0 zendocs/Admin_Guide_2.0 ;\
\
echo "fixing broken file permissions" ;\
chmod 755 Products/ZenHub/zenhub.py \
Modified: trunk/packages/zenoss/debian/zenoss-revisions
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss-revisions?rev=321&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss-revisions (original)
+++ trunk/packages/zenoss/debian/zenoss-revisions Fri Nov 30 15:40:28 2007
@@ -8,3 +8,4 @@
2.0.3 5989
2.0.4 6064
2.0.90 6631
+2.1.1 7556
More information about the Pkg-zenoss-commits
mailing list