[Pkg-xfce-commits] r8152 - in /goodies/trunk/gigolo/debian: changelog rules watch

[Jackson Doak]

Author: noskcaj-guest
Date: Thu Jan  9 20:27:48 2014
New Revision: 8152

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8152
Log:
* New upstream release
    - Drop waf support, we no longer need to repack
    - Never make the Connect button insensitive. LP: #1131156

Modified:
    goodies/trunk/gigolo/debian/changelog
    goodies/trunk/gigolo/debian/rules
    goodies/trunk/gigolo/debian/watch

Modified: goodies/trunk/gigolo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/debian/changelog?rev=8152&op=diff
==============================================================================
--- goodies/trunk/gigolo/debian/changelog	(original)
+++ goodies/trunk/gigolo/debian/changelog	Thu Jan  9 20:27:48 2014
@@ -1,8 +1,14 @@
-gigolo (0.4.1+dfsg-2) UNRELEASED; urgency=low
+gigolo (0.4.2-1) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 21:57:25 +0200
+  [ Jackson Doak ]
+  * New upstream release
+    - Drop waf support, we no longer need to repack
+    - Never make the Connect button insensitive. LP: #1131156
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Fri, 10 Jan 2014 07:22:45 +1100
 
 gigolo (0.4.1+dfsg-1) unstable; urgency=low
 

Modified: goodies/trunk/gigolo/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/debian/rules?rev=8152&op=diff
==============================================================================
--- goodies/trunk/gigolo/debian/rules	(original)
+++ goodies/trunk/gigolo/debian/rules	Thu Jan  9 20:27:48 2014
@@ -8,11 +8,6 @@
 CFLAGS+=$(HARDENING_CFLAGS)
 
 export CFLAGS LDFLAGS
-
-# get-orig-source to drop waf
-upstream_version ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)(\+dfsg\d+)?.*$$/\1/p')
-dfsg_version = $(upstream_version)+dfsg
-pkg = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p')
 
 %:
 	dh $@
@@ -33,13 +28,4 @@
 	dh_install --fail-missing
 
 override_dh_strip:
-	dh_strip --dbg-package=gigolo-dbg
-
-get-orig-source:
-	uscan --noconf --force-download --rename --repack --download-current-version --destdir=.
-	tar -xzf $(pkg)_$(upstream_version).orig.tar.gz
-	mv $(pkg)-$(upstream_version) $(pkg)-$(dfsg_version)
-	cd $(pkg)-$(dfsg_version) ; rm -f waf wscript configure
-	sed -i -e '/waf/d' -e '/wscript/d' $(pkg)-$(dfsg_version)/Makefile.am
-	GZIP="-9fn" tar -czf $(pkg)_$(dfsg_version).orig.tar.gz $(pkg)-$(dfsg_version)
-	rm -rf $(pkg)-$(dfsg_version)
+	dh_strip --dbg-package=gigolo-dbg

Modified: goodies/trunk/gigolo/debian/watch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/debian/watch?rev=8152&op=diff
==============================================================================
--- goodies/trunk/gigolo/debian/watch	(original)
+++ goodies/trunk/gigolo/debian/watch	Thu Jan  9 20:27:48 2014
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg$// \
 http://archive.xfce.org/src/apps/gigolo/([\d\.]+)/ \
 	gigolo-([\d\.]+)\.tar\.(?:gz|bz2)