[Python-apps-commits] r1369 - in packages/osc/trunk/debian (changelog rules watch)

[nijel at users.alioth.debian.org]

    Date: Wednesday, May 28, 2008 @ 19:49:30
  Author: nijel
Revision: 1369

New upstream version.

Modified:
  packages/osc/trunk/debian/changelog
  packages/osc/trunk/debian/rules
  packages/osc/trunk/debian/watch

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2008-05-27 22:08:31 UTC (rev 1368)
+++ packages/osc/trunk/debian/changelog	2008-05-28 19:49:30 UTC (rev 1369)
@@ -1,8 +1,8 @@
-osc (0.100.2-2) UNRELEASED; urgency=low
+osc (0.101-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream version.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 20 May 2008 17:31:57 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 28 May 2008 21:46:27 +0200
 
 osc (0.100.2-1) unstable; urgency=low
 

Modified: packages/osc/trunk/debian/rules
===================================================================
--- packages/osc/trunk/debian/rules	2008-05-27 22:08:31 UTC (rev 1368)
+++ packages/osc/trunk/debian/rules	2008-05-28 19:49:30 UTC (rev 1369)
@@ -7,9 +7,7 @@
 
 # Version used for get-orig-source
 VERSION = $(shell dpkg-parsechangelog | grep Version | sed "s/Version: //")
-UPSTREAM_VERSION = $(shell echo $(VERSION) | sed 's/\.\([^.]*\)-.*/-\1/')
-TAR_VERSION = $(shell echo $(VERSION) | sed 's/\.\([^.]*\)-.*//')
-DEB_VERSION = $(shell echo $(VERSION) | sed 's/-.*//')
+UPSTREAM_VERSION = $(shell echo $(VERSION) | sed 's/\([^-].*\)-.*/\1/')
 
 include /usr/share/dpatch/dpatch.make
 
@@ -67,7 +65,7 @@
 	uscan --destdir rpm --verbose --force-download --no-symlink --upstream-version $(UPSTREAM_VERSION)
 	rpm2cpio rpm/*.rpm > rpm/content.cpio
 	set -e ; cd rpm ; cpio -iv < content.cpio
-	mv rpm/osc-$(TAR_VERSION).tar.gz $(ORIGTARDIR)/osc_$(DEB_VERSION).orig.tar.gz
+	mv rpm/osc-$(UPSTREAM_VERSION).tar.gz $(ORIGTARDIR)/osc_$(UPSTREAM_VERSION).orig.tar.gz
 	rm -rf rpm
 
 .PHONY: build clean binary-indep binary-arch binary install get-orig-source

Modified: packages/osc/trunk/debian/watch
===================================================================
--- packages/osc/trunk/debian/watch	2008-05-27 22:08:31 UTC (rev 1368)
+++ packages/osc/trunk/debian/watch	2008-05-28 19:49:30 UTC (rev 1369)
@@ -1,6 +1,4 @@
 version=3
 
 # No upstream tarball publicly available, so I scan for .src.rpm
-
-opts="uversionmangle=s/-/./" \
-http://download.opensuse.org/repositories/openSUSE:/Tools/openSUSE_Factory/src/osc-(.*-[0-9]*)\.[0-9]*.src.rpm
+http://download.opensuse.org/repositories/openSUSE:/Tools/openSUSE_Factory/src/osc-([0-9.]*)-.*.src.rpm