[Pkg-mysql-commits] r1866 - mysql-workbench-oss/trunk/debian

[Norbert Tretkowski]

Author: nobse
Date: 2010-04-17 10:31:42 +0000 (Sat, 17 Apr 2010)
New Revision: 1866

Modified:
   mysql-workbench-oss/trunk/debian/changelog
   mysql-workbench-oss/trunk/debian/rules
Log:
Fix version

Modified: mysql-workbench-oss/trunk/debian/changelog
===================================================================
--- mysql-workbench-oss/trunk/debian/changelog	2010-04-17 10:27:46 UTC (rev 1865)
+++ mysql-workbench-oss/trunk/debian/changelog	2010-04-17 10:31:42 UTC (rev 1866)
@@ -1,4 +1,4 @@
-mysql-workbench-oss (5.2.19+dfsg.1-1~pre1) UNRELEASED; urgency=low
+mysql-workbench-oss (5.2.19-1~pre1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Drop MacOS and Windows frontends from source.

Modified: mysql-workbench-oss/trunk/debian/rules
===================================================================
--- mysql-workbench-oss/trunk/debian/rules	2010-04-17 10:27:46 UTC (rev 1865)
+++ mysql-workbench-oss/trunk/debian/rules	2010-04-17 10:31:42 UTC (rev 1866)
@@ -13,8 +13,7 @@
 
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//' | sed 's/\+dfsg.*//')
-DEB_DFSG_ADD ?= $(shell echo $(DEB_NOEPOCH_VERSION) | cut -d+ -f2- | cut -d- -f1)
+DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
 
 configure: configure-stamp
 configure-stamp:
@@ -107,10 +106,10 @@
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/scintilla/macosx/
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/frontend/mac/
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/frontend/windows/
-	@mv /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)+$(DEB_DFSG_ADD)
-	@cd /tmp ; tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION)+$(DEB_DFSG_ADD).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)+$(DEB_DFSG_ADD)
+	@mv /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+	@cd /tmp ; tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
 	@rm -f /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
-	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)+$(DEB_DFSG_ADD)
-	@mv /tmp/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION)+$(DEB_DFSG_ADD).orig.tar.gz .
+	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+	@mv /tmp/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz .
 
 .PHONY: build clean binary-indep binary-arch binary install configure