[Python-apps-commits] r1543 - in packages/phenny/trunk/debian (5 files)

Fri Jul 11 11:09:47 UTC 2008

Date: Friday, July 11, 2008 @ 11:09:46
  Author: nslater-guest
Revision: 1543

general improvements

Added:
  packages/phenny/trunk/debian/README.source
Modified:
  packages/phenny/trunk/debian/changelog
  packages/phenny/trunk/debian/control
  packages/phenny/trunk/debian/copyright
  packages/phenny/trunk/debian/rules

Added: packages/phenny/trunk/debian/README.source
===================================================================

--- packages/phenny/trunk/debian/README.source	                        (rev 0)
+++ packages/phenny/trunk/debian/README.source	2008-07-11 11:09:46 UTC (rev 1543)
@@ -0,0 +1,12 @@
+Source README
+=============
+
+The upstream source can be downloaded with the following command:
+
+  ./debian/rules get-orig-source
+
+You will need the following packages installed:
+
+  mercurial
+
+ -- Noah Slater <nslater at bytesexual.org>, Fri, 11 Jul 2008 11:33:36 +0100

Modified: packages/phenny/trunk/debian/changelog
===================================================================
--- packages/phenny/trunk/debian/changelog	2008-07-11 10:46:50 UTC (rev 1542)
+++ packages/phenny/trunk/debian/changelog	2008-07-11 11:09:46 UTC (rev 1543)
@@ -1,3 +1,12 @@
+phenny (2~hg19-2) unstable; urgency=low
+
+  * Added debian/README.source for upstream source information.
+  * Updated debian/rules to make better use of CDBS variables.
+  * Updated debian/copyright per latest proposed format.
+  * Updated Standards-Version to 3.8.0.
+
+ -- Noah Slater <nslater at bytesexual.org>  Fri, 11 Jul 2008 11:56:56 +0100
+
 phenny (2~hg19-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/phenny/trunk/debian/control
===================================================================
--- packages/phenny/trunk/debian/control	2008-07-11 10:46:50 UTC (rev 1542)
+++ packages/phenny/trunk/debian/control	2008-07-11 11:09:46 UTC (rev 1543)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Noah Slater <nslater at bytesexual.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5)
 Build-Depends-Indep: help2man, python-support (>= 0.6.4), python2.5
 Homepage: http://inamidst.com/phenny/

Modified: packages/phenny/trunk/debian/copyright
===================================================================
--- packages/phenny/trunk/debian/copyright	2008-07-11 10:46:50 UTC (rev 1542)
+++ packages/phenny/trunk/debian/copyright	2008-07-11 11:09:46 UTC (rev 1543)
@@ -1,20 +1,11 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Noah Slater <nslater at bytesexual.org>
-X-Debianized-Date: Fri, 29 Feb 2008 19:38:18 +0000
-X-Source-Downloaded-From: http://inamidst.com/phenny/
-X-Source-Get-Original: ./debian/rules get-orig-source
-X-Source-Original-Depends: mercurial
-X-Upstream-Author: Sean B. Palmer <http://inamidst.com/sbp/>
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=179
+Upstream-Name: Phenny
+Upstream-Maintainer: Sean B. Palmer <http://inamidst.com/sbp/>
+Upstream-Source: http://inamidst.com/phenny/
 
 Files: *
 Copyright: Copyright 2008, Sean B. Palmer <http://inamidst.com/sbp/>
 License: EFL-2
-
-Files: debian/*
-Copyright: Copyright 2008, Noah Slater <nslater at bytesexual.org>
-License: GAP
-
-License: EFL-2
    Eiffel Forum License, version 2
  .
     1. Permission is hereby granted to use, copy, modify and/or
@@ -38,6 +29,8 @@
  .
  ***********************
 
+Files: debian/*
+Copyright: Copyright 2008, Noah Slater <nslater at bytesexual.org>
 License: GAP
  Copying and distribution of this package, with or without modification, are
  permitted in any medium without royalty provided the copyright notice and this

Modified: packages/phenny/trunk/debian/rules
===================================================================
--- packages/phenny/trunk/debian/rules	2008-07-11 10:46:50 UTC (rev 1542)
+++ packages/phenny/trunk/debian/rules	2008-07-11 11:09:46 UTC (rev 1543)
@@ -10,13 +10,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-REPOSITORY_URI = static-http://inamidst.com/phenny/
+DEB_ORIG_URI = static-http://inamidst.com/phenny/
+DEB_ORIG_DIRECTORY=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+DEB_ORIG_FILENAME=$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+DEB_REPOS_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r "s/.*~hg//")
 
-PACKAGE_NAME = phenny
-PACKAGE_VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*~hg([^-]+).*,\1,p')
-PACKAGE_DIRECTORY = $(PACKAGE_NAME)-2~hg$(PACKAGE_VERSION).orig
-PACKAGE_FILENAME = $(PACKAGE_NAME)_2~hg$(PACKAGE_VERSION).orig.tar.gz
-
 clean::
 	find . -name '*\.pyc' -delete
 	rm -f phenny.1
@@ -27,15 +25,14 @@
 	chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/*.py
 	chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/modules/*.py
 	cp phenny debian/phenny/usr/bin
-	help2man -N -n "an extensible IRC bot written in Python" \
-	    debian/phenny/usr/bin/phenny > phenny.1
+	help2man -N -n "an extensible IRC bot written in Python" ./phenny > phenny.1
 
 binary-install/phenny::
 	dh_pysupport -pphenny
 
 get-orig-source:
-	hg clone -r $(PACKAGE_VERSION) $(REPOSITORY_URI) $(PACKAGE_DIRECTORY)
-	tar -czf $(PACKAGE_FILENAME) $(PACKAGE_DIRECTORY) --exclude .hg
-	rm -fr $(PACKAGE_DIRECTORY)
+	hg clone -r $(DEB_REPOS_VERSION) $(DEB_ORIG_URI) $(DEB_ORIG_DIRECTORY)
+	tar -czf $(DEB_ORIG_FILENAME) $(DEB_ORIG_DIRECTORY) --exclude .hg
+	rm -fr $(DEB_ORIG_DIRECTORY)
 
 .PHONY: get-orig-source


