[Python-apps-commits] r4261 - in packages/wtop/trunk/debian (8 files)

Tue Dec 8 12:05:54 UTC 2009

Date: Tuesday, December 8, 2009 @ 12:05:45
  Author: dktrkranz
Revision: 4261

Merge changes found in 0.6.3-2

Modified:
  packages/wtop/trunk/debian/README.source
  packages/wtop/trunk/debian/changelog
  packages/wtop/trunk/debian/control
  packages/wtop/trunk/debian/patches/10_apachelog.dpatch
  packages/wtop/trunk/debian/patches/20_absolute_path_for_logrep.dpatch
  packages/wtop/trunk/debian/rules
Deleted:
  packages/wtop/trunk/debian/postinst
  packages/wtop/trunk/debian/prerm

Modified: packages/wtop/trunk/debian/README.source
===================================================================

--- packages/wtop/trunk/debian/README.source	2009-12-07 19:24:05 UTC (rev 4260)
+++ packages/wtop/trunk/debian/README.source	2009-12-08 12:05:45 UTC (rev 4261)
@@ -16,5 +16,5 @@
 20_absolute_path_for_logrep.dpatch:
  Adds an absolute path for the command logrep.
 
- -- Mauro Lizaur <mauro at cacavoladora.org>  Wed, 02 Sep 2009 18:43:44 -0300
+ -- Mauro Lizaur <mauro at debian.org>  Wed, 02 Sep 2009 18:43:44 -0300
 

Modified: packages/wtop/trunk/debian/changelog
===================================================================
--- packages/wtop/trunk/debian/changelog	2009-12-07 19:24:05 UTC (rev 4260)
+++ packages/wtop/trunk/debian/changelog	2009-12-08 12:05:45 UTC (rev 4261)
@@ -1,3 +1,9 @@
+wtop (0.6.3-2) experimental; urgency=low
+
+  * Removed '-n' flag from dh_pysupport. Silly me. (Closes: #553145)
+
+ -- Mauro Lizaur <mauro at debian.org>  Thu, 29 Oct 2009 7:30:06 -0300
+
 wtop (0.6.3-1) experimental; urgency=low
 
   * Initial release (Closes: #486749)
@@ -2,3 +8,3 @@
 
- -- Mauro Lizaur <mauro at cacavoladora.org>  Wed, 02 Sep 2009 18:43:44 -0300
+ -- Mauro Lizaur <mauro at debian.org>  Wed, 02 Sep 2009 18:43:44 -0300
 

Modified: packages/wtop/trunk/debian/control
===================================================================
--- packages/wtop/trunk/debian/control	2009-12-07 19:24:05 UTC (rev 4260)
+++ packages/wtop/trunk/debian/control	2009-12-08 12:05:45 UTC (rev 4261)
@@ -1,8 +1,8 @@
 Source: wtop
 Section: utils
 Priority: optional
-Maintainer: Mauro Lizaur <mauro at cacavoladora.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Maintainer: Mauro Lizaur <mauro at debian.org>
+Uploaders: Debian Python Apps Team <python-apps-team at lists.alioth.debian.org>
 XS-Python-Version: all
 Build-Depends: debhelper (>= 7), dpatch (>= 2.0.30)
 Build-Depends-Indep: python (>= 2.4), python-all-dev, python-setuptools, python-support (>= 1.0.3)

Modified: packages/wtop/trunk/debian/patches/10_apachelog.dpatch
===================================================================
--- packages/wtop/trunk/debian/patches/10_apachelog.dpatch	2009-12-07 19:24:05 UTC (rev 4260)
+++ packages/wtop/trunk/debian/patches/10_apachelog.dpatch	2009-12-08 12:05:45 UTC (rev 4261)
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_apachelog.dpatch by Mauro Lizaur <mauro at cacavoladora.org>
+## 10_apachelog.dpatch by Mauro Lizaur <mauro at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Corrects the fullpath of the Apache2 (default) log.
@@ -14,13 +14,4 @@
  LOG_ROOT=/var/log/apache2/
 -LOG_FILE=access_log
 +LOG_FILE=access.log
- 
- ## uncomment these lines for limited, experimental Microsoft IIS support
- # LOG_FILE_TYPE=iis
-@@ -42,4 +42,4 @@
- robots=^(-)$|(f(?:e(?:ed(?:fetcher-google|ster|whipbot|demon|tools)|tch)|a(?:ctbot|stsearch)|indexa)|a(?:(?:pach|rchiv)e|iderss)|h(?:ttpmonitor|eritrix|arvest|olmes)|y(?:a(?:hoo(?:feed)?seeker|cy|ndex)|e(?:bolbot|ti)|\!j-srd)|m(?:s[rn]bot|e(?:diapartners|chanize)|j12bot)|t(?:ranslate.google.com|ineye)|n(?:utch|icebot|g/2.0|oxtrum|etnewswire)|g(?:(?:ais|uruji|oogle)bot|rabperf)|s(?:n(?:ap(?:preview)?bot|iffer|oopy)|ogou|(?:[bp]id|cann|tackrambl)er|(?:urvey|eznam)bot|lurp|hopwiki)|v(?:a(?:dixbot|lidator)|isbot|oyager)|l(?:ibwww|arbin)|c(?:h(?:udo|arlotte)|u[ir]l|azoodlebot|(?:onverac)?rawler)|p(?:o(?:lybot|ckey)|agebull|ubsub|ear http_request)|b(?:ecomebot|logpulselive)|w(?:eb(?:images|alta|bot)|wwster|get|ordpress|inhttp)|i(?:n(?:formation-online|dexer)|lluminati|feed)|j(?:a(?:karta|va/1)|yxobot)|d(?:iscoveryengine|ownload)|o(?:gsearchspider|pennms)|(?:entirewe|urlli)b|keywen|xenu|rssmix)
- 
- # (original)
--##robots=Feedfetcher-Google|Apache|HttpMonitor|yacy|MSRBOT|translate.google.com|Feedster|Nutch|Gaisbot|Snapbot|VisBot|libwww|CazoodleBot|polybot|VadixBot|Sogou|SBider|BecomeBot|Yandex|Pagebull|chudo|Pockey|nicebot|entireweb|FeedwhipBOT|ConveraCrawler|NG/2.0|WebImages|Factbot|information-online|Jyxobot|BlogPulseLive|YahooFeedSeeker|GurujiBot|wwwster|Y\!J-SRD|Findexa|SurveyBot|discoveryengine|fastsearch|noxtrum|Googlebot|Snapbot|OGSearchSpider|heritrix|Slurp|msnbot|cuil|Mediapartners|YahooSeeker|GrabPERF|keywen|archive|spider|larbin|shopwiki|wget|WebAlta|webbot|crawler|download|harvest|fetch|xenu|mechanize|wordpress|indexer|sniffer|winhttp|validator|voyager|PubSub|Scanner|TinEye|urllib|ILLUMINATI|YebolBot|OpenNMS|Charlotte|SeznamBot|curl|iFeed|FeedDemon|Jakarta|AideRSS|Java/1|Yeti|NetNewsWire|holmes|PEAR HTTP_Request|SnapPreviewBot|RSSMix|MJ12bot|FeedTools|StackRambler|Snoopy|AideRSS
-\ No hay ningÃºn carÃ¡cter de nueva lÃnea al final del fichero
-+##robots=Feedfetcher-Google|Apache|HttpMonitor|yacy|MSRBOT|translate.google.com|Feedster|Nutch|Gaisbot|Snapbot|VisBot|libwww|CazoodleBot|polybot|VadixBot|Sogou|SBider|BecomeBot|Yandex|Pagebull|chudo|Pockey|nicebot|entireweb|FeedwhipBOT|ConveraCrawler|NG/2.0|WebImages|Factbot|information-online|Jyxobot|BlogPulseLive|YahooFeedSeeker|GurujiBot|wwwster|Y\!J-SRD|Findexa|SurveyBot|discoveryengine|fastsearch|noxtrum|Googlebot|Snapbot|OGSearchSpider|heritrix|Slurp|msnbot|cuil|Mediapartners|YahooSeeker|GrabPERF|keywen|archive|spider|larbin|shopwiki|wget|WebAlta|webbot|crawler|download|harvest|fetch|xenu|mechanize|wordpress|indexer|sniffer|winhttp|validator|voyager|PubSub|Scanner|TinEye|urllib|ILLUMINATI|YebolBot|OpenNMS|Charlotte|SeznamBot|curl|iFeed|FeedDemon|Jakarta|AideRSS|Java/1|Yeti|NetNewsWire|holmes|PEAR HTTP_Request|SnapPreviewBot|RSSMix|MJ12bot|FeedTools|StackRambler|Snoopy|AideRSS
+

Modified: packages/wtop/trunk/debian/patches/20_absolute_path_for_logrep.dpatch
===================================================================
--- packages/wtop/trunk/debian/patches/20_absolute_path_for_logrep.dpatch	2009-12-07 19:24:05 UTC (rev 4260)
+++ packages/wtop/trunk/debian/patches/20_absolute_path_for_logrep.dpatch	2009-12-08 12:05:45 UTC (rev 4261)
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_absolute_path_for_logrep.dpatch by Mauro Lizaur <mauro at cacavoladora.org>
+## 20_absolute_path_for_logrep.dpatch by Mauro Lizaur <mauro at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Adds an absolute path for the command logrep

Deleted: packages/wtop/trunk/debian/postinst
===================================================================
--- packages/wtop/trunk/debian/postinst	2009-12-07 19:24:05 UTC (rev 4260)
+++ packages/wtop/trunk/debian/postinst	2009-12-08 12:05:45 UTC (rev 4261)
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-if which update-python-modules >/dev/null 2>&1; then
-        update-python-modules  wtop.public
-fi
-

Deleted: packages/wtop/trunk/debian/prerm
===================================================================
--- packages/wtop/trunk/debian/prerm	2009-12-07 19:24:05 UTC (rev 4260)
+++ packages/wtop/trunk/debian/prerm	2009-12-08 12:05:45 UTC (rev 4261)
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-if which update-python-modules >/dev/null 2>&1; then
-        update-python-modules -c  wtop.public
-fi

Modified: packages/wtop/trunk/debian/rules
===================================================================
--- packages/wtop/trunk/debian/rules	2009-12-07 19:24:05 UTC (rev 4260)
+++ packages/wtop/trunk/debian/rules	2009-12-08 12:05:45 UTC (rev 4261)
@@ -13,7 +13,7 @@
 clean:  unpatch
 	dh_testdir
 	dh_testroot
-	rm -fr build-stamp $(d) debian/*.log
+	rm -fr build-stamp $(d) debian/*.log debian/*.debhelper debian/wtop.substvars debian/files
 	dh_auto_clean
 
 install: build install-stamp
@@ -23,7 +23,7 @@
 	dh_installdirs
 	python setup.py install --root=$(d);
 	# removing the two unnecessary Windows shell scripts
-	rm $(d)/usr/bin/wtop.bat $(d)/usr/bin/logrep.bat
+	rm -f $(d)/usr/bin/{wtop,logrep}.bat
 
 binary-indep: build install
 	dh_testdir
@@ -34,7 +34,7 @@
 	dh_link usr/share/man/man1/logrep.1.gz usr/share/man/man1/wtop.1.gz
 	dh_compress -X.py
 	dh_fixperms
-	dh_pysupport -n
+	dh_pysupport
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums


