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

[terceiro-guest at alioth.debian.org]

Author: terceiro-guest
Date: 2007-10-08 02:17:41 +0000 (Mon, 08 Oct 2007)
New Revision: 1987

Modified:
   packages/libopenid-ruby/trunk/debian/README.Debian-source
   packages/libopenid-ruby/trunk/debian/changelog
   packages/libopenid-ruby/trunk/debian/rules
   packages/libopenid-ruby/trunk/debian/watch
Log:
upstream changed location of tarballs



Modified: packages/libopenid-ruby/trunk/debian/README.Debian-source
===================================================================
--- packages/libopenid-ruby/trunk/debian/README.Debian-source	2007-10-07 13:13:53 UTC (rev 1986)
+++ packages/libopenid-ruby/trunk/debian/README.Debian-source	2007-10-08 02:17:41 UTC (rev 1987)
@@ -3,8 +3,10 @@
 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.
+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-10-07 13:13:53 UTC (rev 1986)
+++ packages/libopenid-ruby/trunk/debian/changelog	2007-10-08 02:17:41 UTC (rev 1987)
@@ -7,11 +7,11 @@
   * debian/rules:
     * implementing automated repackaging of pristine source
     * installing documentation on Ruby-version-independent package
-  * debian/README.Debian-source: documented the process
-  * debian/watch: now using orig tarball from the team's upstream-cache web
-    folder.
+  * debian/README.Debian-source: documented the process of generating the
+    source tarball for Debian.
+  * debian/watch: point to upstream's new tarball location
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Mon,  2 Jul 2007 19:06:58 -0300
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Sun, 07 Oct 2007 23:24:28 -0300
 
 libopenid-ruby (1.1.4-1) unstable; urgency=low
 

Modified: packages/libopenid-ruby/trunk/debian/rules
===================================================================
--- packages/libopenid-ruby/trunk/debian/rules	2007-10-07 13:13:53 UTC (rev 1986)
+++ packages/libopenid-ruby/trunk/debian/rules	2007-10-08 02:17:41 UTC (rev 1987)
@@ -11,8 +11,9 @@
 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_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)
@@ -32,13 +33,13 @@
 	if [ ! -e $(PRISTINE_TARBALL_PATH) ]; then wget -O $(PRISTINE_TARBALL_PATH) $(PRISTINE_TARBALL_URL); fi
 	( \
 		cd $(REPACKAGE_DIR) && \
-		tar xzf $(PRISTINE_TARBALL_NAME) && \
+		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 tzf $(PRISTINE_TARBALL_PATH) | sed -e 's/\.orig//' | sort > $(PRISTINE_LISTING)
+	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 )

Modified: packages/libopenid-ruby/trunk/debian/watch
===================================================================
--- packages/libopenid-ruby/trunk/debian/watch	2007-10-07 13:13:53 UTC (rev 1986)
+++ packages/libopenid-ruby/trunk/debian/watch	2007-10-08 02:17:41 UTC (rev 1987)
@@ -1,2 +1,2 @@
 version=3
-http://pkg-ruby-extras.alioth.debian.org/upstream-cache/libopenid-ruby/libopenid-ruby_(.*)\.orig\.tar\.gz
+http://openidenabled.com/files/ruby-openid/packages/ruby-openid-(.*)\.tar\.bz2