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

Wed Dec 19 02:51:32 UTC 2007

Author: terceiro-guest
Date: 2007-12-19 02:51:31 +0000 (Wed, 19 Dec 2007)
New Revision: 2295

Removed:
   packages/libopenid-ruby/trunk/debian/README.Debian-source
Modified:
   packages/libopenid-ruby/trunk/debian/changelog
   packages/libopenid-ruby/trunk/debian/rules
Log:
giving up on repacking upstream tarball; removing hmac files on install target



Deleted: packages/libopenid-ruby/trunk/debian/README.Debian-source
===================================================================

--- packages/libopenid-ruby/trunk/debian/README.Debian-source	2007-12-18 13:22:20 UTC (rev 2294)
+++ packages/libopenid-ruby/trunk/debian/README.Debian-source	2007-12-19 02:51:31 UTC (rev 2295)
@@ -1,12 +0,0 @@
-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 and
-compressing with gzip. 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. Please check the diff at the end to make sure that only hmac
-files were removed.
-
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Wed, 20 Jun 2007 15:26:42 -0300

Modified: packages/libopenid-ruby/trunk/debian/changelog
===================================================================
--- packages/libopenid-ruby/trunk/debian/changelog	2007-12-18 13:22:20 UTC (rev 2294)
+++ packages/libopenid-ruby/trunk/debian/changelog	2007-12-19 02:51:31 UTC (rev 2295)
@@ -4,21 +4,19 @@
   * 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
+    * remove hmac files already provided by libhmac-ruby package on
+      install target
     * installing documentation on Ruby-version-independent package
-  * debian/README.Debian-source: documented the process of generating the
-    source tarball for Debian.
-  * debian/watch: point to upstream's new tarball location
-  * debian/control: added "Dm-Upload-Allowed: yes" to allow Debian Maintainers
-    to upload this package.
+  * debian/watch: pointing to upstream's new tarball location
+  * debian/control: added "XS-Dm-Upload-Allowed: yes" to allow Debian
+    Maintainers to upload this package.
 
   [ Paul van Tilburg ]
   * Added Vcs-* fields.
   * Bumped the standards version to 3.7.3; no changes required.
 
- -- Paul van Tilburg <paulvt at debian.org>  Sat, 08 Dec 2007 16:51:04 +0100
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Tue, 18 Dec 2007 23:53:34 -0300
 
 libopenid-ruby (1.1.4-1) unstable; urgency=low
 

Modified: packages/libopenid-ruby/trunk/debian/rules
===================================================================
--- packages/libopenid-ruby/trunk/debian/rules	2007-12-18 13:22:20 UTC (rev 2294)
+++ packages/libopenid-ruby/trunk/debian/rules	2007-12-19 02:51:31 UTC (rev 2295)
@@ -6,56 +6,14 @@
 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 = $(shell grep '^http:' debian/watch | sed -e "s/ruby-openid-.*\\\.tar\\\.bz2/ruby-openid-$(DEB_UPSTREAM_VERSION)\\.tar\\.bz2/")
-
-PRISTINE_TARBALL_NAME = ruby-openid-$(DEB_UPSTREAM_VERSION).tar.bz2
-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 xjf $(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 tjf $(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 "***********************************************************"
-
 clean::
 	rm -rf html
 
+install/libopenid-ruby1.8::
+	# remove hmac libraries already provided by libhmac-ruby package
+	rm debian/libopenid-ruby1.8/usr/lib/ruby/1.8/hmac*.rb
+
 install/libopenid-ruby::
+	# build docs
 	cp -r doc html
 	dh_install -plibopenid-ruby html usr/share/doc/libopenid-ruby


