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

Yves-Alexis Perez corsac at alioth.debian.org
Mon Aug 2 06:21:07 UTC 2010


Author: corsac
Date: 2010-08-02 06:21:02 +0000 (Mon, 02 Aug 2010)
New Revision: 4210

Removed:
   goodies/trunk/gigolo/debian/waf-runner-append
Modified:
   goodies/trunk/gigolo/debian/changelog
   goodies/trunk/gigolo/debian/control
   goodies/trunk/gigolo/debian/rules
Log:
* debian/rules:
  - drop waf completely, use autogen.sh to get a standard autotools.
    interface.
* debian/control:
  - drop python build-dep

Modified: goodies/trunk/gigolo/debian/changelog
===================================================================
--- goodies/trunk/gigolo/debian/changelog	2010-08-01 21:48:30 UTC (rev 4209)
+++ goodies/trunk/gigolo/debian/changelog	2010-08-02 06:21:02 UTC (rev 4210)
@@ -1,3 +1,13 @@
+gigolo (0.4.1-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - drop waf completely, use autogen.sh to get a standard autotools.
+      interface.
+  * debian/control:
+    - drop python build-dep
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 02 Aug 2010 08:05:22 +0200
+
 gigolo (0.4.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: goodies/trunk/gigolo/debian/control
===================================================================
--- goodies/trunk/gigolo/debian/control	2010-08-01 21:48:30 UTC (rev 4209)
+++ goodies/trunk/gigolo/debian/control	2010-08-02 06:21:02 UTC (rev 4210)
@@ -3,7 +3,7 @@
 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,
+Build-Depends: debhelper (>= 7.0.50), intltool, pkg-config,
   libgtk2.0-dev (>= 2.12.0)
 Standards-Version: 3.9.1
 Homepage: http://www.uvena.de/gigolo/

Modified: goodies/trunk/gigolo/debian/rules
===================================================================
--- goodies/trunk/gigolo/debian/rules	2010-08-01 21:48:30 UTC (rev 4209)
+++ goodies/trunk/gigolo/debian/rules	2010-08-02 06:21:02 UTC (rev 4210)
@@ -4,48 +4,17 @@
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
-WAFDIR=debian/waf
-WAF=WAFDIR=$(WAFDIR) ./waf
+%:
+	dh $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(WAF) distclean
-	rm -rf $(WAFDIR)
-	dh_clean
+override_dh_auto_configure:
+	./autogen.sh
+	dh_auto_configure
 
-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
+	rm -f debian/tmp/usr/share/doc/COPYING
+	rm -f debian/tmp/usr/share/doc/Changelog.gz
 
-binary-arch: install
-	dh binary-arch --before dh_strip
+override_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

Deleted: goodies/trunk/gigolo/debian/waf-runner-append
===================================================================
--- goodies/trunk/gigolo/debian/waf-runner-append	2010-08-01 21:48:30 UTC (rev 4209)
+++ goodies/trunk/gigolo/debian/waf-runner-append	2010-08-02 06:21:02 UTC (rev 4210)
@@ -1,100 +0,0 @@
-# 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