[Pkg-xfce-commits] r7216 - goodies/trunk/gigolo/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-10-20 15:26:14 +0000 (Sat, 20 Oct 2012)
New Revision: 7216

Modified:
   goodies/trunk/gigolo/debian/changelog
   goodies/trunk/gigolo/debian/control
   goodies/trunk/gigolo/debian/rules
   goodies/trunk/gigolo/debian/watch
Log:
* Drop unused waf scripts, we use the alternate autotools-based build
  system already.                                             closes: #654468
* debian/rules:
  - clean up autogenerated files during clean.
  - add a get-orig-source rule to drop the waf related files from the
    tarball.
* debian/watch:
  - demangle destination file.

Modified: goodies/trunk/gigolo/debian/changelog
===================================================================
--- goodies/trunk/gigolo/debian/changelog	2012-10-16 20:12:19 UTC (rev 7215)
+++ goodies/trunk/gigolo/debian/changelog	2012-10-20 15:26:14 UTC (rev 7216)
@@ -1,9 +1,15 @@
-gigolo (0.4.1-4) UNRELEASED; urgency=low
+gigolo (0.4.1+dfsg-1) UNRELEASED; urgency=low
 
-  * debian/control: suggests gvfs-backends, for the network tab in the side
-    panel.
+  * Drop unused waf scripts, we use the alternate autotools-based build
+    system already.                                             closes: #654468
+  * debian/rules:
+    - clean up autogenerated files during clean.
+    - add a get-orig-source rule to drop the waf related files from the
+      tarball.
+  * debian/watch:
+    - demangle destination file.
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 19 Oct 2011 21:05:11 +0200
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 20 Oct 2012 16:55:26 +0200
 
 gigolo (0.4.1-3) unstable; urgency=low
 

Modified: goodies/trunk/gigolo/debian/control
===================================================================
--- goodies/trunk/gigolo/debian/control	2012-10-16 20:12:19 UTC (rev 7215)
+++ goodies/trunk/gigolo/debian/control	2012-10-20 15:26:14 UTC (rev 7216)
@@ -15,7 +15,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: gvfs-bin
-Suggests: gvfs-backends
 Description: frontend to manage connections to remote filesystems using GIO/GVfs
  Gigolo is a frontend to easily manage connections to remote filesystems
  using GIO/GVfs. It allows you to quickly connect/mount a remote filesystem

Modified: goodies/trunk/gigolo/debian/rules
===================================================================
--- goodies/trunk/gigolo/debian/rules	2012-10-16 20:12:19 UTC (rev 7215)
+++ goodies/trunk/gigolo/debian/rules	2012-10-20 15:26:14 UTC (rev 7216)
@@ -9,6 +9,11 @@
 
 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 $@
 
@@ -16,6 +21,11 @@
 	./autogen.sh
 	dh_auto_configure
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f $$(find -name 'Makefile.in*')
+	rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh missing mkinstalldirs
+
 override_dh_install:
 	rm debian/tmp/usr/share/doc/gigolo/ChangeLog
 	rm debian/tmp/usr/share/doc/gigolo/COPYING
@@ -24,3 +34,12 @@
 
 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)

Modified: goodies/trunk/gigolo/debian/watch
===================================================================
--- goodies/trunk/gigolo/debian/watch	2012-10-16 20:12:19 UTC (rev 7215)
+++ goodies/trunk/gigolo/debian/watch	2012-10-20 15:26:14 UTC (rev 7216)
@@ -1,3 +1,4 @@
 version=3
+opts=dversionmangle=s/\+dfsg$// \
 http://archive.xfce.org/src/apps/gigolo/([\d\.]+)/ \
 	gigolo-([\d\.]+)\.tar\.(?:gz|bz2)