[DRE-commits] r1728 - packages/libopenid-ruby/trunk/debian

terceiro-guest at alioth.debian.org terceiro-guest at alioth.debian.org
Wed Jun 20 18:41:55 UTC 2007 

Author: terceiro-guest
Date: 2007-06-20 18:41:55 +0000 (Wed, 20 Jun 2007)
New Revision: 1728

Added:
   packages/libopenid-ruby/trunk/debian/README.Debian-source
Modified:
   packages/libopenid-ruby/trunk/debian/TODO
   packages/libopenid-ruby/trunk/debian/changelog
   packages/libopenid-ruby/trunk/debian/copyright
   packages/libopenid-ruby/trunk/debian/rules
   packages/libopenid-ruby/trunk/debian/watch
Log:
repackaging by removing ruby-hmac files



Added: packages/libopenid-ruby/trunk/debian/README.Debian-source
===================================================================
--- packages/libopenid-ruby/trunk/debian/README.Debian-source	                        (rev 0)
+++ packages/libopenid-ruby/trunk/debian/README.Debian-source	2007-06-20 18:41:55 UTC (rev 1728)
@@ -0,0 +1,10 @@
+The pristine tarball distributed by openidenabled.com includes files from
+ruby-hmac (http://deisui.org/~ueno/ruby/hmac.html), which is provided in Debian
+by libruby-hmac.
+
+Then, the orig tarball used for the libopenid-ruby Debian package uses a
+repackaged tarball that is obtained by simply removing the ruby-hmac files. To
+obtain a repackaged tarball from the pristine tarball, you can use the
+"repackaged-orig-tar-gz" target on this package's debian/rules file.
+
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Wed, 20 Jun 2007 15:26:42 -0300

Modified: packages/libopenid-ruby/trunk/debian/TODO
===================================================================
--- packages/libopenid-ruby/trunk/debian/TODO	2007-06-19 10:54:18 UTC (rev 1727)
+++ packages/libopenid-ruby/trunk/debian/TODO	2007-06-20 18:41:55 UTC (rev 1728)
@@ -1,6 +1,2 @@
-* wait for Daigo Moriwaki's ruby-hmac package; then:
-  * repackage orig.tar.gz without lib/hmac*.rb (see Developers-reference
-    section 6.7.8.2)
-  * remove hmac*.rb copyright information from debian/copyright
 * close the ITP bug by hand since the initial upload of a -2 won't do it
   automatically (I guess).

Modified: packages/libopenid-ruby/trunk/debian/changelog
===================================================================
--- packages/libopenid-ruby/trunk/debian/changelog	2007-06-19 10:54:18 UTC (rev 1727)
+++ packages/libopenid-ruby/trunk/debian/changelog	2007-06-20 18:41:55 UTC (rev 1728)
@@ -1,10 +1,15 @@
 libopenid-ruby (1.1.4-2) unstable; urgency=low
 
-  * listing copyright information for every source file to which it's
-    available. Thanks to Joerg Jaspert for pointing this out in behalf of the
-    ftpmaster team.
+  * debian/copyright: listing copyright information for every source file to
+    which it's available. Thanks to Joerg Jaspert for pointing this out in
+    behalf of the ftpmaster team.
+  * debian/TODO: removing ruby-hmac files by repackaging the pristine tarball
+  * debian/rules: implementing automated repackaging of pristine source
+  * debian/README.Debian-source: documented the process
+  * debian/watch: now using orig tarball from the team's upstream-cache web
+    folder.
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Thu, 31 May 2007 12:40:43 -0300
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Wed, 20 Jun 2007 15:31:21 -0300
 
 libopenid-ruby (1.1.4-1) unstable; urgency=low
 

Modified: packages/libopenid-ruby/trunk/debian/copyright
===================================================================
--- packages/libopenid-ruby/trunk/debian/copyright	2007-06-19 10:54:18 UTC (rev 1727)
+++ packages/libopenid-ruby/trunk/debian/copyright	2007-06-20 18:41:55 UTC (rev 1728)
@@ -1,7 +1,10 @@
 This package was debianized by Antonio S. de A. Terceiro <terceiro at softwarelivre.org> on
 Fri,  9 Feb 2007 18:38:42 -0300.
 
-It was downloaded from http://www.openidenabled.com/openid/libraries/ruby/download
+It was downloaded from
+http://www.openidenabled.com/openid/libraries/ruby/download, and then
+repackaged removing hmac-ruby files that are provided by libhmac-ruby package
+by Daigo Moriwaki. Please see the README.Debian-source for details. 
 
 ---
 Copyright holder: JanRain, Inc. (http://www.janrain.com/)
@@ -31,11 +34,6 @@
 distributed under the same terms as Ruby.
 
 ---
-The files lib/hmac*.rb are part of ruby-hmac
-(http://deisui.org/~ueno/ruby/hmac.html) and are Copyright (C) 2001  Daiki Ueno
-<ueno at unixuser.org>, and are distributed under the terms of the Ruby license.
-
----
 File examples/rails_server/public/javascripts/controls.js is taken from
 script.aculo.us, and has the following copyright:
 

Modified: packages/libopenid-ruby/trunk/debian/rules
===================================================================
--- packages/libopenid-ruby/trunk/debian/rules	2007-06-19 10:54:18 UTC (rev 1727)
+++ packages/libopenid-ruby/trunk/debian/rules	2007-06-20 18:41:55 UTC (rev 1728)
@@ -3,4 +3,51 @@
 # CDBS file to build the Ruby OpenID package.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/buildvars.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+
+# where to do the work
+REPACKAGE_DIR ?= ../tarballs
+
+# the pristine source
+PRISTINE_TARBALL_URL = http://www.openidenabled.com/resources/downloads/ruby-openid/ruby-openid-$(DEB_UPSTREAM_VERSION).tar.gz
+PRISTINE_TARBALL_NAME = ruby-openid-$(DEB_UPSTREAM_VERSION).tar.gz
+PRISTINE_TARBALL_PATH = $(REPACKAGE_DIR)/$(PRISTINE_TARBALL_NAME)
+PRISTINE_SOURCE_DIR_NAME = ruby-openid-$(DEB_UPSTREAM_VERSION)
+PRISTINE_SOURCE_DIR_PATH = $(REPACKAGE_DIR)/$(PRISTINE_SOURCE_DIR_NAME)
+
+# the target repackaged source
+REPACKAGED_SOURCE_DIR_NAME = ruby-openid-$(DEB_UPSTREAM_VERSION).orig
+REPACKAGED_SOURCE_DIR_PATH = $(REPACKAGE_DIR)/$(REPACKAGED_SOURCE_DIR_NAME)
+REPACKAGED_TARBALL_NAME = libopenid-ruby_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+REPACKAGED_TARBALL_PATH = $(REPACKAGE_DIR)/$(REPACKAGED_TARBALL_NAME)
+
+# checking the results
+PRISTINE_LISTING = $(REPACKAGE_DIR)/pristine-listing
+REPACKAGED_LISTING = $(REPACKAGE_DIR)/repackaged-listing
+
+repackaged-orig-tar-gz::
+	mkdir -p $(REPACKAGE_DIR)
+	if [ ! -e $(PRISTINE_TARBALL_PATH) ]; then wget -O $(PRISTINE_TARBALL_PATH) $(PRISTINE_TARBALL_URL); fi
+	( \
+		cd $(REPACKAGE_DIR) && \
+		tar xzf $(PRISTINE_TARBALL_NAME) && \
+		mv $(PRISTINE_SOURCE_DIR_NAME) $(REPACKAGED_SOURCE_DIR_NAME) && \
+		rm -f $(REPACKAGED_SOURCE_DIR_NAME)/lib/hmac*.rb && \
+		tar czf $(REPACKAGED_TARBALL_NAME) $(REPACKAGED_SOURCE_DIR_NAME) && \
+		rm -rf $(REPACKAGED_SOURCE_DIR_NAME) \
+	)
+	tar tzf $(PRISTINE_TARBALL_PATH) | sed -e 's/\.orig//' | sort > $(PRISTINE_LISTING)
+	tar tzf $(REPACKAGED_TARBALL_PATH) | sed -e 's/\.orig//' | sort > $(REPACKAGED_LISTING)
+	# diff must return 1 (i.e. some differences were found)
+	( diff -u $(PRISTINE_LISTING) $(REPACKAGED_LISTING) ; if [ $$? -eq 1 ]; then true; else false; fi )
+	rm -f $(PRISTINE_LISTING) $(REPACKAGED_LISTING)
+	@echo "***********************************************************"
+	@echo "***********************************************************"
+	@echo "** Repackaged tarball in:"
+	@echo "** $(REPACKAGED_TARBALL_PATH)"
+	@echo "**"
+	@echo "** Please check the diff above to see if the hmac files were removed."
+	@echo "***********************************************************"
+	@echo "***********************************************************"

Modified: packages/libopenid-ruby/trunk/debian/watch
===================================================================
--- packages/libopenid-ruby/trunk/debian/watch	2007-06-19 10:54:18 UTC (rev 1727)
+++ packages/libopenid-ruby/trunk/debian/watch	2007-06-20 18:41:55 UTC (rev 1728)
@@ -1,2 +1,2 @@
 version=3
-http://www.openidenabled.com/resources/downloads/ruby-openid/ruby-openid-(.*)\.tar\.gz
+http://pkg-ruby-extras.alioth.debian.org/upstream-cache/libopenid-ruby/libopenid-ruby_(.*)\.orig\.tar\.gz

More information about the Pkg-ruby-extras-commits mailing list