[Python-apps-commits] r1545 - in packages/planet-venus/trunk/debian (4 files)

Fri Jul 11 13:40:25 UTC 2008

Date: Friday, July 11, 2008 @ 13:40:24
  Author: nslater-guest
Revision: 1545

general updates

Added:
  packages/planet-venus/trunk/debian/README.source
Modified:
  packages/planet-venus/trunk/debian/changelog
  packages/planet-venus/trunk/debian/copyright
  packages/planet-venus/trunk/debian/rules

Added: packages/planet-venus/trunk/debian/README.source
===================================================================

--- packages/planet-venus/trunk/debian/README.source	                        (rev 0)
+++ packages/planet-venus/trunk/debian/README.source	2008-07-11 13:40:24 UTC (rev 1545)
@@ -0,0 +1,20 @@
+Source README
+=============
+
+The upstream source can be downloaded with the following command:
+
+  ./debian/rules get-orig-source
+
+You will need the following packages installed:
+
+  bzr
+
+You can patch the upstream source with the following command:
+
+  ./debian/rules patch
+
+You can add or edit patches using the following command:
+
+  cdbs-edit-patch
+
+ -- Noah Slater <nslater at bytesexual.org>, Fri, 11 Jul 2008 13:03:36 +0100

Modified: packages/planet-venus/trunk/debian/changelog
===================================================================
--- packages/planet-venus/trunk/debian/changelog	2008-07-11 11:47:22 UTC (rev 1544)
+++ packages/planet-venus/trunk/debian/changelog	2008-07-11 13:40:24 UTC (rev 1545)
@@ -1,3 +1,11 @@
+planet-venus (0~bzr95-2) UNRELEASED; 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.
+
+ -- Noah Slater <nslater at bytesexual.org>  Fri, 11 Jul 2008 13:04:19 +0100
+
 planet-venus (0~bzr95-1) unstable; urgency=medium
 
   * New upstream snapshot.
@@ -2,4 +10,4 @@
   * Added drscheme to Conflicts. Closes: #484716
-  * Improved debian/copyright file per the proposed standard.
-  * Minor formatting improvements to debian/rules.
+  * Updated formatting in debian/rules.
+  * Updated debian/copyright per latest proposed format.
   * Updated Standards-Version to 3.8.0.

Modified: packages/planet-venus/trunk/debian/copyright
===================================================================
--- packages/planet-venus/trunk/debian/copyright	2008-07-11 11:47:22 UTC (rev 1544)
+++ packages/planet-venus/trunk/debian/copyright	2008-07-11 13:40:24 UTC (rev 1545)
@@ -1,9 +1,7 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Packaged-By: Noah Slater <nslater at bytesexual.org>
-Packaged-Date: Wed, 13 Feb 2008 09:20:18 +0000
-Original-Source-Location: http://www.intertwingly.net/code/venus/
-Original-Source-Command: ./debian/rules get-orig-source
-Original-Source-Depends: bzr
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=179
+Upstream-Name: Planet Venus
+Upstream-Maintainer: Sam Ruby <rubys at intertwingly.net>
+Upstream-Source: http://www.intertwingly.net/code/venus/
 
 Files: *
 Copyright: Copyright 2008, Sam Ruby <rubys at intertwingly.net>
@@ -67,6 +65,26 @@
  permitted in any medium without royalty provided the copyright notice and this
  notice are preserved.
 
+Files: debian/patches/theme-diveintomark.patch
+Copyright: Copyright 2008, Mark Pilgrim <mark at diveintomark.org>
+License: MIT
+ 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.
+
 Files: planet/vendor/compat_logging/*
 Copyright: Copyright 2002, Vinay Sajip <vinay_sajip at yahoo.co.uk>
 License: MIT
@@ -139,23 +157,3 @@
  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
  ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.
-
-Files: debian/patches/theme-diveintomark.patch
-Copyright: Copyright 2008, Mark Pilgrim <mark at diveintomark.org>
-License: MIT
- 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.

Modified: packages/planet-venus/trunk/debian/rules
===================================================================
--- packages/planet-venus/trunk/debian/rules	2008-07-11 11:47:22 UTC (rev 1544)
+++ packages/planet-venus/trunk/debian/rules	2008-07-11 13:40:24 UTC (rev 1545)
@@ -12,13 +12,11 @@
 
 DEB_COMPRESS_EXCLUDE = .png .svg
 
-REPOSITORY_URI = http://intertwingly.net/code/venus/
+DEB_ORIG_URI = http://intertwingly.net/code/venus/
+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/.*~bzr//")
 
-PACKAGE_NAME = planet-venus
-PACKAGE_VERSION = $(shell dpkg-parsechangelog | sed -rne 's/^Version: .*~bzr([^-]+).*/\1/p')
-PACKAGE_DIRECTORY = $(PACKAGE_NAME)-0~bzr$(PACKAGE_VERSION).orig
-PACKAGE_FILENAME = $(PACKAGE_NAME)_0~bzr$(PACKAGE_VERSION).orig.tar.gz
-
 clean::
 	rm -f planet.sed.py
 
@@ -27,7 +25,7 @@
 # @@ nice as external packages.
 
 common-install-prehook-impl::
-	sed "s/@version@/$(PACKAGE_VERSION)/" planet.py > planet.sed.py
+	sed "s/@version@/$(DEB_REPOS_VERSION)/" planet.py > planet.sed.py
 	chmod 755 planet.sed.py
 	help2man -N -n "an aggregate feed generator" ./planet.sed.py > planet.1
 	cp -R docs debian/planet-venus/usr/share/doc/planet-venus/html
@@ -49,6 +47,9 @@
 	dh_pysupport -pplanet-venus -X example -X filter
 
 get-orig-source:
-	bzr export -r $(PACKAGE_VERSION) $(PACKAGE_FILENAME) $(REPOSITORY_URI)
+	bzr export -r $(DEB_REPOS_VERSION) $(DEB_ORIG_DIRECTORY) $(DEB_ORIG_URI)
+	tar -czf $(DEB_ORIG_FILENAME) $(DEB_ORIG_DIRECTORY)
+	rm -fr $(DEB_ORIG_DIRECTORY)
 
+
 .PHONY: get-orig-source


