[Pkg-xfce-commits] r4209 - in goodies/tags/gigolo: . 0.4.1-1 0.4.1-1/debian

Yves-Alexis Perez corsac at alioth.debian.org
Sun Aug 1 09:48:31 UTC 2010


Author: corsac
Date: 2010-08-01 21:48:30 +0000 (Sun, 01 Aug 2010)
New Revision: 4209

Added:
   goodies/tags/gigolo/0.4.1-1/
   goodies/tags/gigolo/0.4.1-1/debian/changelog
   goodies/tags/gigolo/0.4.1-1/debian/control
   goodies/tags/gigolo/0.4.1-1/debian/rules
   goodies/tags/gigolo/0.4.1-1/debian/waf-runner-append
Removed:
   goodies/tags/gigolo/0.4.1-1/debian/changelog
   goodies/tags/gigolo/0.4.1-1/debian/control
   goodies/tags/gigolo/0.4.1-1/debian/rules
Log:
[svn-buildpackage] Tagging gigolo 0.4.1-1


Property changes on: goodies/tags/gigolo/0.4.1-1
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: goodies/tags/gigolo/0.4.1-1/debian/changelog
===================================================================
--- goodies/trunk/gigolo/debian/changelog	2010-07-29 20:50:59 UTC (rev 4202)
+++ goodies/tags/gigolo/0.4.1-1/debian/changelog	2010-08-01 21:48:30 UTC (rev 4209)
@@ -1,57 +0,0 @@
-gigolo (0.4.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/01_fix-ftbfs-gold dropped, included upstream.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 31 Dec 2009 12:13:03 +0100
-
-gigolo (0.3.2-2) unstable; urgency=low
-
-  [ Yves-Alexis Perez ]
-  * debian/control:
-    - remove cdbs from build-deps, thanks Lionel Le Folgoc.
-    - update standards versions to 3.8.3.
-  * debian/watch:
-    - update url for the Xfce archive reorganisation.
-  * convert package to 3.0 (quilt) format.
-  * debian/patches:
-    - 01_fix-ftbfs-gold added, fix FTBFS with binutils-gold.    closes: #554549
-
-  [ Evgeni Golov ]
-  * Fix Vcs-* fields, they were missing 'trunk' in the path.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 06 Nov 2009 08:19:43 +0100
-
-gigolo (0.3.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/control:
-    - update homepage address.
-    - correct GVfs case in descriptions.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 19 Apr 2009 20:52:10 +0200
-
-gigolo (0.3.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/control:
-    - move gigolo to xfce section and -dbg package to debug.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Apr 2009 14:09:05 +0200
-
-gigolo (0.3.0-1) unstable; urgency=low
-
-  * New upstream release, upload to unstable.
-  * debian/control:
-    - update standards version to 3.8.1.
-    - update debhelper build-dep to 7.0.50.
-  * debian/rules:
-    - use overrides to call dh_install with --fail-missing.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 04 Apr 2009 02:17:42 +0200
-
-gigolo (0.2.1-1) experimental; urgency=low
-
-  * Initial Release.                                            closes: #510558
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 28 Feb 2009 21:21:50 +0100

Copied: goodies/tags/gigolo/0.4.1-1/debian/changelog (from rev 4208, goodies/trunk/gigolo/debian/changelog)
===================================================================
--- goodies/tags/gigolo/0.4.1-1/debian/changelog	                        (rev 0)
+++ goodies/tags/gigolo/0.4.1-1/debian/changelog	2010-08-01 21:48:30 UTC (rev 4209)
@@ -0,0 +1,69 @@
+gigolo (0.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - update standards version to 3.9.1.
+  * debian/rules, debian/waf-runner-append:
+    - fix FTBFS on hppa by patching waf at build time. *yurk*
+  * debian/rules:
+    - call dpkg-buildflags for CFLAGS and LDFLAGS, add --as-needed to LDFLAGS.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 01 Aug 2010 23:28:07 +0200
+
+gigolo (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/01_fix-ftbfs-gold dropped, included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 31 Dec 2009 12:13:03 +0100
+
+gigolo (0.3.2-2) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - remove cdbs from build-deps, thanks Lionel Le Folgoc.
+    - update standards versions to 3.8.3.
+  * debian/watch:
+    - update url for the Xfce archive reorganisation.
+  * convert package to 3.0 (quilt) format.
+  * debian/patches:
+    - 01_fix-ftbfs-gold added, fix FTBFS with binutils-gold.    closes: #554549
+
+  [ Evgeni Golov ]
+  * Fix Vcs-* fields, they were missing 'trunk' in the path.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 06 Nov 2009 08:19:43 +0100
+
+gigolo (0.3.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - update homepage address.
+    - correct GVfs case in descriptions.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 19 Apr 2009 20:52:10 +0200
+
+gigolo (0.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - move gigolo to xfce section and -dbg package to debug.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Apr 2009 14:09:05 +0200
+
+gigolo (0.3.0-1) unstable; urgency=low
+
+  * New upstream release, upload to unstable.
+  * debian/control:
+    - update standards version to 3.8.1.
+    - update debhelper build-dep to 7.0.50.
+  * debian/rules:
+    - use overrides to call dh_install with --fail-missing.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 04 Apr 2009 02:17:42 +0200
+
+gigolo (0.2.1-1) experimental; urgency=low
+
+  * Initial Release.                                            closes: #510558
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 28 Feb 2009 21:21:50 +0100

Deleted: goodies/tags/gigolo/0.4.1-1/debian/control
===================================================================
--- goodies/trunk/gigolo/debian/control	2010-07-29 20:50:59 UTC (rev 4202)
+++ goodies/tags/gigolo/0.4.1-1/debian/control	2010-08-01 21:48:30 UTC (rev 4209)
@@ -1,34 +0,0 @@
-Source: gigolo
-Section: xfce
-Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Stefan Ott <stefan at ott.net>
-Build-Depends: debhelper (>= 7.0.50), python, intltool, pkg-config,
-  libgtk2.0-dev (>= 2.12.0)
-Standards-Version: 3.8.3
-Homepage: http://www.uvena.de/gigolo/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/gigolo/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/
-
-Package: gigolo
-Section: xfce
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: gvfs-bin
-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
- and manage bookmarks of such.
-
-Package: gigolo-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: gigolo (= ${binary:Version}), ${misc:Depends}
-Description: frontend to manage connections to remote filesystems using GIO/GVfs (debug)
- Gigolo is a frontend to easily manage connections to remote filesystems
- using GIO/GVfs. It allows you to quickly connect/mount a remote filesystem
- and manage bookmarks of such.
- .
- This package contains the debugging symbols.
-

Copied: goodies/tags/gigolo/0.4.1-1/debian/control (from rev 4206, goodies/trunk/gigolo/debian/control)
===================================================================
--- goodies/tags/gigolo/0.4.1-1/debian/control	                        (rev 0)
+++ goodies/tags/gigolo/0.4.1-1/debian/control	2010-08-01 21:48:30 UTC (rev 4209)
@@ -0,0 +1,34 @@
+Source: gigolo
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Stefan Ott <stefan at ott.net>
+Build-Depends: debhelper (>= 7.0.50), python, intltool, pkg-config,
+  libgtk2.0-dev (>= 2.12.0)
+Standards-Version: 3.9.1
+Homepage: http://www.uvena.de/gigolo/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/gigolo/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/
+
+Package: gigolo
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gvfs-bin
+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
+ and manage bookmarks of such.
+
+Package: gigolo-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: gigolo (= ${binary:Version}), ${misc:Depends}
+Description: frontend to manage connections to remote filesystems using GIO/GVfs (debug)
+ Gigolo is a frontend to easily manage connections to remote filesystems
+ using GIO/GVfs. It allows you to quickly connect/mount a remote filesystem
+ and manage bookmarks of such.
+ .
+ This package contains the debugging symbols.
+

Deleted: goodies/tags/gigolo/0.4.1-1/debian/rules
===================================================================
--- goodies/trunk/gigolo/debian/rules	2010-07-29 20:50:59 UTC (rev 4202)
+++ goodies/tags/gigolo/0.4.1-1/debian/rules	2010-08-01 21:48:30 UTC (rev 4209)
@@ -1,41 +0,0 @@
-#!/usr/bin/make -f
-
-WAF = ./waf --nocache
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(WAF) distclean
-	dh_clean
-
-build: build-stamp
-build-stamp:
-	dh build --before configure
-	$(WAF) configure --prefix=/usr
-	$(WAF) build
-	dh build --after build
-	touch build-stamp
-
-install: build install-stamp
-install-stamp:
-	dh install --before dh_auto_install
-	$(WAF) install --destdir=$(CURDIR)/debian/tmp
-	# remove spurious doc files
-	rm -f $(CURDIR)/debian/tmp/usr/share/doc/gigolo/ChangeLog 
-	rm -f $(CURDIR)/debian/tmp/usr/share/doc/gigolo/COPYING
-	dh install --after dh_auto_install
-	touch install-stamp
-
-override_dh_install:
-	dh_install --fail-missing
-
-binary-arch: install
-	dh binary-arch --before dh_strip
-	dh_strip --dbg-package=gigolo-dbg
-	dh binary-arch --after dh_strip
-
-binary-indep: install
-	dh binary-indep
-
-binary: binary-arch binary-indep

Copied: goodies/tags/gigolo/0.4.1-1/debian/rules (from rev 4207, goodies/trunk/gigolo/debian/rules)
===================================================================
--- goodies/tags/gigolo/0.4.1-1/debian/rules	                        (rev 0)
+++ goodies/tags/gigolo/0.4.1-1/debian/rules	2010-08-01 21:48:30 UTC (rev 4209)
@@ -0,0 +1,51 @@
+#!/usr/bin/make -f
+
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+
+WAFDIR=debian/waf
+WAF=WAFDIR=$(WAFDIR) ./waf
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	$(WAF) distclean
+	rm -rf $(WAFDIR)
+	dh_clean
+
+build: build-stamp
+build-stamp:
+	dh build --before configure
+	$(WAF) --help > /dev/null
+	mkdir debian/waf
+	cp -a .waf-*/wafadmin debian/waf
+	cat debian/waf-runner-append >> $(WAFDIR)/wafadmin/Runner.py
+	$(WAF) configure --prefix=/usr
+	$(WAF) build
+	dh build --after build
+	touch build-stamp
+
+install: build install-stamp
+install-stamp:
+	dh install --before dh_auto_install
+	$(WAF) install --destdir=$(CURDIR)/debian/tmp
+	# remove spurious doc files
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/gigolo/ChangeLog 
+	rm -f $(CURDIR)/debian/tmp/usr/share/doc/gigolo/COPYING
+	dh install --after dh_auto_install
+	touch install-stamp
+
+override_dh_install:
+	dh_install --fail-missing
+
+binary-arch: install
+	dh binary-arch --before dh_strip
+	dh_strip --dbg-package=gigolo-dbg
+	dh binary-arch --after dh_strip
+
+binary-indep: install
+	dh binary-indep
+
+binary: binary-arch binary-indep

Copied: goodies/tags/gigolo/0.4.1-1/debian/waf-runner-append (from rev 4207, goodies/trunk/gigolo/debian/waf-runner-append)
===================================================================
--- goodies/tags/gigolo/0.4.1-1/debian/waf-runner-append	                        (rev 0)
+++ goodies/tags/gigolo/0.4.1-1/debian/waf-runner-append	2010-08-01 21:48:30 UTC (rev 4209)
@@ -0,0 +1,100 @@
+# curl "http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=43;filename=xmms2-hppa.diff;att=1;bug=558983" | grep ^+ | grep -v ^+++ | sed 's/^+//' > debian/runner-append
+
+class Serial(object):
+
+	def __init__(self, bld, j=1):
+		self.manager = bld.task_manager
+		self.outstanding = []
+
+		# progress bar
+		self.total = self.manager.total()
+		self.processed = 0
+		self.error = 0
+
+		self.switchflag = 1 # postpone
+		
+		self.consumers = None
+
+	# warning, this one is recursive ..
+	def get_next(self):
+		if self.outstanding:
+			t = self.outstanding.pop(0)
+			self.processed += 1
+			return t
+
+		# handle case where only one wscript exist
+		# that only install files
+		if not self.manager.groups:
+			return None
+
+		(_, self.outstanding) = self.manager.get_next_set()
+		if not self.outstanding: return None
+
+		return self.get_next()
+
+	def postpone(self, tsk):
+		self.processed -= 1
+		self.switchflag *= -1
+		# this actually shuffle the list
+		if self.switchflag>0: self.outstanding.insert(0, tsk)
+		else:                 self.outstanding.append(tsk)
+
+	def start(self):
+		debug('runner: Serial start called')
+		while 1:
+			# get next Task
+			tsk = self.get_next()
+			if tsk is None: break
+
+			if Logs.verbose: debug('runner: retrieving %r' % tsk)
+
+			st = tsk.runnable_status()
+			if st == ASK_LATER:
+				debug('runner: postponing %r' % tsk)
+				self.postpone(tsk)
+				continue
+
+			#continue
+			if st == SKIP_ME:
+				tsk.hasrun = SKIPPED
+				self.manager.add_finished(tsk)
+				continue
+
+			tsk.position = (self.processed, self.total)
+
+			# display the command that we are about to run
+			tsk.generator.bld.printout(tsk.display())
+
+			# run the command
+			if tsk.__class__.stat: ret = tsk.__class__.stat(tsk)
+			else: ret = tsk.run()
+			self.manager.add_finished(tsk)
+
+			# non-zero means something went wrong
+			if ret:
+				self.error = 1
+				tsk.hasrun = CRASHED
+				tsk.err_code = ret
+				if Options.options.keep: continue
+				else: return -1
+
+			try:
+				tsk.post_run()
+			except OSError:
+				self.error = 1
+				tsk.hasrun = MISSING
+				if Options.options.keep: continue
+				else: return -1
+			else:
+				tsk.hasrun = SUCCESS
+
+		if self.error:
+			return -1
+
+import subprocess
+print "== Using patched Runner.py for HPPA =="
+p = subprocess.Popen(['dpkg', '--print-architecture'], stdout=subprocess.PIPE)
+arch = p.stdout.read().strip()
+p.wait()
+if arch == 'hppa':
+	Parallel = Serial




More information about the Pkg-xfce-commits mailing list