r2086 - in van.pydeb/trunk/debian (changelog dh_pydeb)

[menesis-guest at users.alioth.debian.org]

    Date: Wednesday, July 28, 2010 @ 17:00:27
  Author: menesis-guest
Revision: 2086

Grep debian/control directly, fix typos.

Modified:
  van.pydeb/trunk/debian/changelog
  van.pydeb/trunk/debian/dh_pydeb

Modified: van.pydeb/trunk/debian/changelog
===================================================================
--- van.pydeb/trunk/debian/changelog	2010-07-28 16:50:58 UTC (rev 2085)
+++ van.pydeb/trunk/debian/changelog	2010-07-28 17:00:27 UTC (rev 2086)
@@ -28,7 +28,7 @@
 
 van.pydeb (1.3.0-2) unstable; urgency=low
 
-  * Accomodate differences in the .egg-info directory naming between
+  * Accommodate differences in the .egg-info directory naming between
     distribute and setuptools by also moving .egg-info files without
     -py$*. (Closes: #552945)
 
@@ -75,10 +75,10 @@
 
   * New upstream release
 
- --  <brian at vanguardistas.net>  Tue, 26 May 2009 19:33:09 +0000
+ -- Brian Sutherland <brian at vanguardistas.net>  Tue, 26 May 2009 19:33:09 +0000
 
 van.pydeb (1.0.0-1) unstable; urgency=low
 
-  * Intial Upload
+  * Initial Upload
 
- --  <brian at vanguardistas.net>  Tue, 26 May 2009 13:40:44 +0000
+ -- Brian Sutherland <brian at vanguardistas.net>  Tue, 26 May 2009 13:40:44 +0000

Modified: van.pydeb/trunk/debian/dh_pydeb
===================================================================
--- van.pydeb/trunk/debian/dh_pydeb	2010-07-28 16:50:58 UTC (rev 2085)
+++ van.pydeb/trunk/debian/dh_pydeb	2010-07-28 17:00:27 UTC (rev 2086)
@@ -5,13 +5,13 @@
 # XXX: This should be written in perl, but the original author only knows python well. Volunteers?
 
 # Figure out what packages to operate on
-echo pydeb: Working on source package ${PYDEB_SRC_PACKAGE:=`dpkg-parsechangelog -c1 -ldebian/changelog | grep 'Source: ' | sed 's/Source: //'`}
+echo pydeb: Working on source package ${PYDEB_SRC_PACKAGE:=`grep 'Source: ' debian/control | sed 's/Source: //'`}
 echo pydeb: Working on python distribution ${PYDEB_PY_PACKAGE:=`van-pydeb src_to_py $PYDEB_SRC_PACKAGE`}
 echo pydeb: Working on binary package ${PYDEB_BIN_PACKAGE:=`van-pydeb py_to_bin $PYDEB_PY_PACKAGE`}
 
 # Sanity checks
-if [ `cat debian/control | grep -c "^Package: ${PYDEB_BIN_PACKAGE}$"` == 0 ]; then
-	echo ERROR: Expected binary package ${PYDEB_BIN_PACKAGE} in debian/changelog but did not find it.
+if [ `grep -c "^Package: ${PYDEB_BIN_PACKAGE}$" debian/control` == 0 ]; then
+	echo ERROR: Expected binary package ${PYDEB_BIN_PACKAGE} in debian/control but did not find it.
 	exit 1
 fi
 
@@ -29,7 +29,7 @@
 
 # Extras to be assigned to Recommends: PYDEB_RECOMMENDS_EXTRAS
 for extra in $PYDEB_RECOMMENDS_EXTRAS; do
-	recomends_extras="--extra ${extra} ${recomends_extras}"
+	recommends_extras="--extra ${extra} ${recommends_extras}"
 	# exclude recommends dependencies from the main package dependencies
 	excluded_extras="--exclude-extra ${extra} ${excluded_extras}"
 done
@@ -41,7 +41,7 @@
 	excluded_extras="--exclude-extra ${extra} ${excluded_extras}"
 done
 
-# TODO: We need a a way to assign multiple extras to a arbitrarily named metapackage. But a good format for the environment variable to do this escapes me.
+# TODO: We need a way to assign multiple extras to a arbitrarily named metapackage. But a good format for the environment variable to do this escapes me.
 #	something like:
 #		mymetapackage1: extra1 extra2 mymetapackage2: extra3 extra4
 #		mymetapackage1 (extra1 extra2) mymetapackage2 (extra3 extra4)
@@ -65,15 +65,15 @@
 	(echo -n 'pydeb:Depends=' && van-pydeb depends --egg-info ${egg_info} ${excluded_extras}) >> debian/${PYDEB_BIN_PACKAGE}.substvars
 	# set provides for the extras included in the main package
 	(echo -n 'pydeb:Provides=' && van-pydeb provides --egg-info ${egg_info} ${excluded_extras}) >> debian/${PYDEB_BIN_PACKAGE}.substvars
-	# if some extras were moved to recomends, include them
-	if [ -n "${recomends_extras}" ]; then
-		(echo -n 'pydeb:Recommends=' && van-pydeb depends --egg-info ${egg_info} ${recomends_extras}) >> debian/${PYDEB_BIN_PACKAGE}.substvars
+	# if some extras were moved to recommends, include them
+	if [ -n "${recommends_extras}" ]; then
+		(echo -n 'pydeb:Recommends=' && van-pydeb depends --egg-info ${egg_info} ${recommends_extras}) >> debian/${PYDEB_BIN_PACKAGE}.substvars
 	fi
 	# if some extras were moved to suggests, include them
 	if [ -n "${suggests_extras}" ]; then
 		(echo -n 'pydeb:Suggests=' && van-pydeb depends --egg-info ${egg_info} ${suggests_extras}) >> debian/${PYDEB_BIN_PACKAGE}.substvars
 	fi
-	# setup the dependencies/provides of dependencies moved to metapcakages
+	# setup the dependencies of metapackages
 	for extra in $PYDEB_METAPACKAGE_EXTRAS; do
 		(echo -n 'pydeb:Depends=' && van-pydeb depends --egg-info ${egg_info} --extra ${extra}) >> debian/${PYDEB_BIN_PACKAGE}-${extra}.substvars
 	done