Hello community,
here is the log from the commit of package unsermake
checked in at Sun May 6 17:18:41 CEST 2007.
--------
--- unsermake/unsermake.changes 2006-03-07 22:43:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/unsermake/unsermake.changes 2007-05-04 14:53:07.270495000 +0200
@@ -1,0 +2,6 @@
+Fri May 4 14:52:49 CEST 2007 - coolo@suse.de
+
+- update to 20070504:
+ - fix python's help modules (#258385)
+
+-------------------------------------------------------------------
Old:
----
unsermake-0.4_20060307.tar.bz2
New:
----
unsermake-0.4_20070504.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unsermake.spec ++++++
--- /var/tmp/diff_new_pack.Y26506/_old 2007-05-06 17:18:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Y26506/_new 2007-05-06 17:18:37.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package unsermake (Version 0.4_20060307)
+# spec file for package unsermake (Version 0.4_20070504)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,10 +13,10 @@
Name: unsermake
BuildRequires: docbook-xsl-stylesheets libxslt python-devel
-License: GPL
+License: GNU General Public License (GPL)
Group: Development/Tools/Building
Summary: Replacement for make and automake
-Version: 0.4_20060307
+Version: 0.4_20070504
Release: 1
# svn export svn+ssh://svn.kde.org/home/kde/trunk/kdenonbeta/unsermake unsermake-%version
Source0: %name-%version.tar.bz2
@@ -72,10 +72,13 @@
%_mandir/man1/unsermake.1*
%endif
-%changelog -n unsermake
+%changelog
+* Fri May 04 2007 - coolo@suse.de
+- update to 20070504:
+ - fix python's help modules (#258385)
* Tue Mar 07 2006 - dmueller@suse.de
- update to 20060307:
-- ignore generated .ui4 files in Qt4 build environments
+ - ignore generated .ui4 files in Qt4 build environments
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jan 11 2006 - dmueller@suse.de
++++++ unsermake-0.4_20060307.tar.bz2 -> unsermake-0.4_20070504.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/COPYING new/unsermake-0.4_20070504/COPYING
--- old/unsermake-0.4_20060307/COPYING 2004-10-17 18:55:35.000000000 +0200
+++ new/unsermake-0.4_20070504/COPYING 2006-03-11 15:35:32.000000000 +0100
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +305,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/changelog new/unsermake-0.4_20070504/debian/changelog
--- old/unsermake-0.4_20060307/debian/changelog 2005-11-17 17:52:17.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/changelog 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-unsermake (20051117-0ubuntu2) dapper; urgency=low
-
- * Change recommends from automake to automake1.9
- http://bugzilla.ubuntu.com/18356
-
- -- Jonathan Riddell Thu, 17 Nov 2005 16:44:07 +0000
-
-unsermake (20051117-0ubuntu1) dapper; urgency=low
-
- * New snapshot
-
- -- Jonathan Riddell Thu, 17 Nov 2005 15:58:22 +0000
-
-unsermake (20050219-2) unstable; urgency=low
-
- * Added python2.4 to Depends
-
- -- Robert J. Tanner Tue, 1 Nov 2005 15:51:34 -0600
-
-unsermake (20050219-1) unstable; urgency=low
-
- * Build for Debian sid.
- * Changed unsermake script to execute python2.4
- * Changed Build-Depends to Build-Depends-Indep
- * Added docbook-xml, python2.4, python to Build-Depends-Indep
- * Changed release -1 as recommended by jriddell@ubuntu.com
-
- -- Robert J. Tanner Tue, 1 Nov 2005 12:40:39 -0600
-
-unsermake (20050618-0ubuntu1) breezy; urgency=low
-
- * New upstream snapshot.
-
- -- Jonathan Riddell Sat, 18 Jun 2005 15:41:41 +0000
-
-unsermake (20050219-0ubuntu1) hoary; urgency=low
-
- * Update.
- * Now install modules into /usr/lib/pythonX.X/site-packages/unsermake
-
- -- Jonathan Riddell Sat, 19 Feb 2005 22:46:28 +0000
-
-unsermake (20050109-1) hoary; urgency=low
-
- * Update.
-
- -- Jonathan Riddell Sun, 9 Jan 2005 17:35:17 +0000
-
-unsermake (20041017-1) unstable; urgency=low
-
- * Update.
-
- -- Jonathan Riddell Sun, 17 Oct 2004 15:08:00 +0100
-
-unsermake (20040929-1) unstable; urgency=low
-
- * Update.
-
- -- Jonathan Riddell Wed, 29 Sep 2004 22:29:55 +0100
-
-unsermake (20040928-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Jonathan Riddell Tue, 28 Sep 2004 22:29:55 +0100
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/compat new/unsermake-0.4_20070504/debian/compat
--- old/unsermake-0.4_20060307/debian/compat 2004-10-17 19:45:51.000000000 +0200
+++ new/unsermake-0.4_20070504/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/control new/unsermake-0.4_20070504/debian/control
--- old/unsermake-0.4_20060307/debian/control 2005-11-17 17:52:17.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/control 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-Source: unsermake
-Section: devel
-Priority: optional
-Maintainer: Jonathan Riddell
-Build-Depends-Indep: debhelper (>= 4.1.65), docbook-xsl, xsltproc, docbook-xml
-Standards-Version: 3.6.2
-
-Package: unsermake
-Architecture: all
-Depends: ${python:Depends}
-Recommends: automake1.9
-Description: A tool for generating Makefiles, a replacement for automake
- Unsermake replaces automake and is used by KDE.
- .
- Improvements over automake include faster parallel compiles and cleaner
- output messages.
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/copyright new/unsermake-0.4_20070504/debian/copyright
--- old/unsermake-0.4_20060307/debian/copyright 2004-10-17 19:45:51.000000000 +0200
+++ new/unsermake-0.4_20070504/debian/copyright 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-This package was debianized by Jonathan Riddell on
-Tue, 28 Sep 2004 22:29:55 +0100.
-
-It was downloaded from http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdenonbeta/unsermake/
-
-Upstream Author: Stephan Kulow
-
-Copyright:
-
-It may be redistributed under the terms of the GNU GPL, Version 2 or
-later, found on Debian systems in the file /usr/share/common-licenses/GPL
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/dirs new/unsermake-0.4_20070504/debian/dirs
--- old/unsermake-0.4_20060307/debian/dirs 2005-02-20 00:38:54.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-usr/lib/python2.4/site-packages/unsermake
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/docs new/unsermake-0.4_20070504/debian/docs
--- old/unsermake-0.4_20060307/debian/docs 2004-10-17 19:45:51.000000000 +0200
+++ new/unsermake-0.4_20070504/debian/docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-README
-TODO
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/files new/unsermake-0.4_20070504/debian/files
--- old/unsermake-0.4_20060307/debian/files 2005-02-20 00:38:54.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/files 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-unsermake_20050219-0ubuntu1_all.deb devel optional
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/Makefile new/unsermake-0.4_20070504/debian/Makefile
--- old/unsermake-0.4_20060307/debian/Makefile 2005-11-17 17:26:59.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-DESTDIR =
-DEFAULT_PYTHON = python2.4
-
-all:
- echo "Nothing to compile" $(DESTDIR)/usr
-
-install:
- install unsermake $(DESTDIR)/usr/bin/unsermake
- install --mode 644 __init__.py $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/__init__.py
- install --mode 644 amfile.py $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/amfile.py
- install --mode 644 assembler.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/assembler.um
- install --mode 644 autodeps.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/autodeps.um
- install --mode 644 autodirs.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/autodirs.um
- install --mode 644 checkrcs.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/checkrcs.um
- install --mode 644 check.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/check.um
- install --mode 644 dcopidl.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/dcopidl.um
- install --mode 644 designer.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/designer.um
- install --mode 644 destdir.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/destdir.um
- install --mode 644 dist.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/dist.um
- install --mode 644 docs.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/docs.um
- install --mode 644 flex.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/flex.um
- install --mode 644 handlerbase.py $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/handlerbase.py
- install --mode 644 icons.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/icons.um
- install --mode 644 kcfg.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/kcfg.um
- install --mode 644 kdeinit.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/kdeinit.um
- install --mode 644 manpages.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/manpages.um
- install --mode 644 mocs.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/mocs.um
- install --mode 644 pch.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/pch.um
- install --mode 644 pofiles.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/pofiles.um
- install --mode 644 program.py $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/program.py
- install --mode 644 sourcehash.py $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/sourcehash.py
- install --mode 644 target.py $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/target.py
- install --mode 644 texinfo.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/texinfo.um
- install --mode 644 rcc.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/rcc.um
- install --mode 644 utilities.py $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/utilities.py
- install --mode 644 yacc.um $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/yacc.um
-
-clean:
- rm -f $(DESTDIR)/usr/bin/unsermake
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/__init__.py
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/amfile.py
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/assembler.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/autodeps.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/autodirs.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/checkrcs.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/check.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/dcopidl.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/designer.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/destdir.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/dist.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/docs.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/flex.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/handlerbase.py
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/icons.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/kcfg.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/kdeinit.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/manpages.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/mocs.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/pch.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/pofiles.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/program.py
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/sourcehash.py
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/target.py
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/texinfo.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/rcc.um
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/utilities.py
- rm -f $(DESTDIR)/usr/lib/$(DEFAULT_PYTHON)/site-packages/unsermake/yacc.um
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/patches/unsermake.diff new/unsermake-0.4_20070504/debian/patches/unsermake.diff
--- old/unsermake-0.4_20060307/debian/patches/unsermake.diff 2005-11-17 17:26:59.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/patches/unsermake.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
---- unsermake/unsermake
-+++ unsermake/unsermake
-@@ -1,16 +1,12 @@
--#! /bin/sh
-+#! /bin/bash
-
--self="$0"
--if test -L "$self"; then
-- try=`readlink $self 2>/dev/null` && self=$try
--fi
--mods=`dirname $self`
--directory=`dirname $mods`
--mod=`basename $mods`
-+mods=/usr/lib/python2.4/site-packages/unsermake
-+directory=/usr/lib/python2.4/site-packages/unsermake
-+mod=unsermake
- if test -n "$PYTHONPATH"; then
- export PYTHONPATH=$directory:$PYTHONPATH
- else
- export PYTHONPATH=$directory
- fi
--exec python -c "import $mod; $mod.main()" --modules $mods "$@"
-+exec python2.4 -c "import $mod; $mod.main()" --modules $mods "$@"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/postinst new/unsermake-0.4_20070504/debian/postinst
--- old/unsermake-0.4_20060307/debian/postinst 2005-02-20 00:38:54.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-#! /bin/sh
-# postinst script for unsermake
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * `abort-remove' `in-favour' <package>
-# <new-version>
-# * `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
- configure)
- PYTHON=python2.4
- if which $PYTHON >/dev/null 2>&1; then
- DIRLIST="/usr/lib/python2.4/site-packages/unsermake"
- for i in $DIRLIST ; do
- $PYTHON -O /usr/lib/$PYTHON/compileall.py -q $i
- $PYTHON /usr/lib/$PYTHON/compileall.py -q $i
- done
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/prerm new/unsermake-0.4_20070504/debian/prerm
--- old/unsermake-0.4_20060307/debian/prerm 2004-10-17 19:45:51.000000000 +0200
+++ new/unsermake-0.4_20070504/debian/prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-#! /bin/sh
-# prerm script for unsermake
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * `remove' `in-favour' <package> <new-version>
-# * `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- remove|upgrade|deconfigure)
-# install-info --quiet --remove /usr/info/unsermake.info.gz
- dpkg -L unsermake | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/README.Debian new/unsermake-0.4_20070504/debian/README.Debian
--- old/unsermake-0.4_20060307/debian/README.Debian 2004-10-17 19:45:51.000000000 +0200
+++ new/unsermake-0.4_20070504/debian/README.Debian 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-unsermake for Debian
---------------------
-
-This package is for KDE 3.4 or newer.
-
- -- Jonathan Riddell , Tue, 28 Sep 2004 22:29:55 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/rules new/unsermake-0.4_20070504/debian/rules
--- old/unsermake-0.4_20060307/debian/rules 2004-10-17 19:45:51.000000000 +0200
+++ new/unsermake-0.4_20070504/debian/rules 1970-01-01 01:00:00.000000000 +0100
@@ -1,123 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-MAKE=make -f debian/Makefile
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-unsermake.1: debian/unsermake.xml
- $(XP) $(DB2MAN) $<
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- if test ! -f patch-stamp; then \
- for patch in $(CURDIR)/debian/patches/*.diff ;\
- do \
- echo APPLYING PATCH\: $${patch##*/};\
- patch < $$patch ;\
- done ;\
- touch patch-stamp ;\
- fi
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp unsermake.1
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #/usr/bin/docbook-to-man debian/unsermake.sgml > unsermake.1
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- # Add here commands to clean up after the build process.
-
- # Remove Debian specific patches
- if test -f patch-stamp; then \
- for patch in $(CURDIR)/debian/patches/*.diff ;\
- do \
- echo REMOVING PATCH\: $${patch##*/};\
- patch -R < $$patch ;\
- done ;\
- rm -f patch-stamp ;\
- fi
-
- rm -f unsermake.1
-
- $(MAKE) clean DESTDIR=$(CURDIR)/debian/unsermake
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/unsermake.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/unsermake
-
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
- dh_python
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/unsermake.manpages new/unsermake-0.4_20070504/debian/unsermake.manpages
--- old/unsermake-0.4_20060307/debian/unsermake.manpages 2005-01-13 19:00:04.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/unsermake.manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-unsermake.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/debian/unsermake.xml new/unsermake-0.4_20070504/debian/unsermake.xml
--- old/unsermake-0.4_20060307/debian/unsermake.xml 2005-01-13 19:00:04.000000000 +0100
+++ new/unsermake-0.4_20070504/debian/unsermake.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,264 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'. A manual page
-<package>.<section> will be generated. You may view the
-manual page with: nroff -man <package>.<section> | less'. A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
- $(XP) $(DB2MAN) $<
-
-The xsltproc binary is found in the xsltproc package. The
-XSL files are in docbook-xsl. Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
- <!-- Fill in your name for FIRSTNAME and SURNAME. -->
- <!ENTITY dhfirstname "<firstname>Jonathan</firstname>">
- <!ENTITY dhsurname "<surname>Riddell</surname>">
- <!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>October 17, 2004</date>">
- <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
- allowed: see man(7), man(1). -->
- <!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>jr @jriddell.org</email>">
- <!ENTITY dhusername "Jonathan Riddell">
- <!ENTITY dhucpackage "<refentrytitle>UNSERMAKE</refentrytitle>">
- <!ENTITY dhpackage "unsermake">
-
- <!ENTITY debian "<productname>Debian</productname>">
- <!ENTITY gnu "<acronym>GNU</acronym>">
- <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- &dhemail;
- </address>
- <author>
- &dhfirstname;
- &dhsurname;
- </author>
- <copyright>
- <year>2004</year>
- <holder>&dhusername;</holder>
- </copyright>
- &dhdate;
- </refentryinfo>
- <refmeta>
- &dhucpackage;
-
- &dhsection;
- </refmeta>
- <refnamediv>
- <refname>&dhpackage;</refname>
-
- <refpurpose>A build for used by KDE to replace automake and make</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>&dhpackage;</command>
-
- <arg><option>[options]</option> <option>[make-target]</option></arg>
-
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
-
- <para>This manual page documents briefly the
- <command>&dhpackage;</command> command.</para>
-
- <para><command>&dhpackage;</command> is a program that replaces
- make and automake when compiling KDE packages. It has faster
- build times, especially on multiple processor machines, and
- cleaner output.</para>
-
- <para>Prepare for compilation with <command>unsermake -f
- Makefile.cvs</command> run <command>./configure</command> as
- normal and compile with <command>unsermake</command>.</para>
-
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
-
- <para>These programs follow the usual &gnu; command line syntax,
- with long options starting with two dashes (`-'). A summary of
- options is included below. For a complete description, see the
- <application>Info</application> files.</para>
-
- <variablelist>
- <varlistentry>
- <term><option>-h</option>
- <option>--help</option>
- </term>
- <listitem>
- <para>Show summary of options.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <option>--version</option>
- </term>
- <listitem>
- <para>Show version of program.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-v</option>
- <option>--verbose</option>
- </term>
- <listitem>
- <para>Show verbose output.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-C</option>
- <option>--directory=dir</option>
- </term>
- <listitem>
- <para>Change to directory dir before doing anything.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <option>--compile-jobs=N</option>
- </term>
- <listitem>
- <para>Limit compile jobs to N.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-i</option>
- <option>--ignore-errors</option>
- </term>
- <listitem>
- <para>Ignore errors from commands.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-j</option>
- <option>--jobs=N</option>
- </term>
- <listitem>
- <para>Allow N parallel jobs.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-k</option>
- <option>--keep-going</option>
- </term>
- <listitem>
- <para>Keep going when some targets can't be made.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <option>--missing-deps</option>
- </term>
- <listitem>
- <para>Find missing dependencies.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <option>--no-real-compare</option>
- </term>
- <listitem>
- <para>Use only mtime and not file contents to determine if a file has changed (default).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <option>--real-compare</option>
- </term>
- <listitem>
- <para>Use not only mtime but file content to determine if a file has changed.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <option>--random=N</option>
- </term>
- <listitem>
- <para>Make random targets.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-n</option>
- <option>--just-print</option>
- </term>
- <listitem>
- <para>Only print out the commands to call, do not run them.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-p</option>
- <option>--print-progress</option>
- </term>
- <listitem>
- <para>Shows an estimated percent number before each output.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-f file</option>
- </term>
- <listitem>
- <para>Use file as a makefile.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
- </refsect1>
- <refsect1>
- <title>SEE ALSO</title>
-
- <para>make (1), automake (1).</para>
-
- </refsect1>
- <refsect1>
- <title>AUTHOR</title>
-
- <para>This manual page was written by &dhusername; &dhemail; (but
- may be used by others). Permission is granted to copy,
- distribute and/or modify this document under the terms of the
- &gnu; General Public License, Version 2 any later version
- published by the Free Software Foundation.
- </para>
-
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL.
- </para>
-
- </refsect1>
-</refentry>
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/designer.um new/unsermake-0.4_20070504/designer.um
--- old/unsermake-0.4_20060307/designer.um 2006-01-02 17:10:09.000000000 +0100
+++ new/unsermake-0.4_20070504/designer.um 2006-04-12 13:57:57.000000000 +0200
@@ -64,7 +64,7 @@
utilities.print_error( "%s: You cannot use Qt 4 .ui-files with Qt/KDE 3! Please use a Qt 4-based build system.\n"
% (rulef.filename) )
uic_version = "$(UIC)"
- outputfile = rulef.build + base + ".h"
+ outputfile = rulef.build + "ui_" + base + ".h"
rules = ["@echo '%s %s%s'" % (utilities.creating_text, outputfile, utilities.normal)]
@@ -79,8 +79,8 @@
rules.append( "%s -tr ${UIC_TR} -i %s.h $$adir/%s%s > %s.temp ; ret=$$?; \\"
% (uic_version, base, base, ext, outputfile) )
else:
- rules.append( "%s -tr ${UIC_TR} $$adir/%s.ui > %s.temp ; ret=$$?; \\"
- % (uic_version, base, outputfile) )
+ rules.append( "%s -tr ${UIC_TR} $$adir/%s%s > %s.temp ; ret=$$?; \\"
+ % (uic_version, base, ext, outputfile) )
line = 'sed -e "s,${UIC_TR}( \"\" ),QString::null,g" %s.temp ' % (outputfile)
line = line + '| sed -e "s,image\([0-9][0-9]*\)_data,img\\1_%s,g" ' % canon_source
@@ -96,8 +96,8 @@
rules.append( "@%s -i %s.h %s%s > %s ; ret=$$?; \\"
% (uic_version, base, sourcedir + base, ext, outputfile) )
else:
- rules.append( "@%s %s.ui > %s ; ret=$$?; \\"
- % (uic_version, base, outputfile) )
+ rules.append( "@%s %s%s > %s ; ret=$$?; \\"
+ % (uic_version, base, ext, outputfile) )
if uifile_version == 3:
rules.append( "if test \"$$ret\" = 0; then echo '#include \"%s.moc\"' >> %s; else rm -f %s; exit $$ret; fi"
@@ -107,9 +107,22 @@
[sourcedir + base + ext, rulef.build + base + ".h"],
rules)
- rulef.insertTarget(rulef.build + base + ".h", [sourcedir + base + ext],
+ # If UIC3_PATH is undefined we're using KDE 3
+ if utilities.subst_vars.has_key("UIC3_PATH") and not program.mfile.get_opt("qtonly"):
+ # In KDE4, it is the .h file who has translatable strings
+ rulef.insertTarget(rulef.build + base + ".h", [sourcedir + base + ext],
+ ["@echo '%s %s.h%s'" % (utilities.creating_text, rulef.build + base, utilities.normal),
+ "@%s -tr ${UIC_TR} -o %s.temp $?" % (uic_version, base),
+ "@echo '#include ' > $@",
+ "@sed -e 's/${UIC_TR}(\"\")/QString()/g;s/${UIC_TR}(\"\", 0)/QString()/g' %s.temp >> $@" % (base),
+ "@rm -f %s.temp" % (base) ])
+ else:
+ # In KDE3, the .h has not any translatable string
+ # And for pure Qt3/Qt4, we do not need any modification
+ rulef.insertTarget(rulef.build + base + ".h", [sourcedir + base + ext],
["@echo '%s %s.h%s'" % (utilities.creating_text, rulef.build + base, utilities.normal),
"@%s -o $@ $?" % (uic_version)])
+
rulef.insertTarget(rulef.build + base + program.objext,
[rulef.build + base + ".h", rulef.build + base + ".moc"])
@@ -121,7 +134,7 @@
if uifile_version == 3:
program.cleanfiles.extend([base + ".h", base + ".cpp"])
else:
- program.cleanfiles.append(base + ".h")
+ program.cleanfiles.append( "ui_" + base + ".h")
if uifile_version == 3:
program.handle_source(base, ".cpp")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/__init__.py new/unsermake-0.4_20070504/__init__.py
--- old/unsermake-0.4_20060307/__init__.py 2005-10-06 10:53:29.000000000 +0200
+++ new/unsermake-0.4_20070504/__init__.py 2007-05-04 14:49:38.000000000 +0200
@@ -693,6 +693,17 @@
progress = 99
sys.stdout.write("%s%02d%%%s " % (utilities.progress_color,progress,utilities.normal))
sys.stdout.flush()
+ elif target.precise_print_progress and target.max_todo > 0:
+ progress = 100.0 - (100.0 * float(target.num_todo) / float(target.max_todo))
+ if progress >= 99.99:
+ # don't break the layout :)
+ progress = 99.99
+ if progress < 10.0:
+ # Add a space to pad (%02 won't work for floats)
+ sys.stdout.write("%s %.2f%%%s " % (utilities.progress_color,progress,utilities.normal))
+ else:
+ sys.stdout.write("%s%.2f%%%s " % (utilities.progress_color,progress,utilities.normal))
+ sys.stdout.flush()
if max_children > 1:
pid = call(obj, obj.makefile, fork=1)
@@ -851,7 +862,7 @@
print " -p, --print-progress Shows an estimated percent number before each output."
sys.exit(0)
-def main():
+def unsermake_main():
starttime = time.time()
global thisProg, verbose
@@ -903,6 +914,7 @@
eqre = re.compile('^([^=]*)=(.*)$')
optlist = []
+ given_files = []
while len(recurse_flags):
try:
@@ -937,6 +949,7 @@
random_targets = 0
create_mode = False
print_progress = False
+ precise_print_progress = False
mtime_only = True
color_mode = sys and sys.stderr.isatty() and sys.stdout.isatty() and "TERM" in os.environ and not os.environ["TERM"].upper() in ["DUMB"] and not "EMACS" in os.environ
file_to_read = "Makefile"
@@ -995,8 +1008,15 @@
utilities.environment_vars[var] = os.environ[var]
makeflags += "-e "
elif option == '-p' or option == '--print-progress':
- print_progress = True
- makeflags += "-p "
+ if print_progress or precise_print_progress:
+ # This is not the first -p option, so set the "precise" progress
+ precise_print_progress = True
+ print_progress = False
+ else:
+ precise_print_progress = False
+ print_progress = True
+ # Set makeflags only at the first -p
+ makeflags += "-p "
elif option == '-l':
print 'the option %s is ignored (for now)' % option
elif option == '-s':
@@ -1287,6 +1307,7 @@
top_makefile.print_out(1)
target.print_progress = print_progress
+ target.precise_print_progress = precise_print_progress
sourcehash_file = utilities.top_builddir+'/SourceHash'
if not mtime_only:
@@ -1316,33 +1337,34 @@
if sourcehash:
sourcehash.save(sourcehash_file)
-if os.environ.has_key('PROFILE'):
- import profile
- profile.run("main()", 'fooprof')
-
- import pstats
- p = pstats.Stats('fooprof')
- p.strip_dirs()
- p.sort_stats('cumulative').print_stats(10)
- p.sort_stats('time').print_stats(10)
-
-else:
-
- # If Psyco is installed, use it.
- # Psyco speeds dramatically up Python, see:
- # http://psyco.sourceforge.net/
- try:
- import psyco
- psyco.full()
- except ImportError:
- # Psyco is optional, silently accept its abscence
- pass
+def main():
+ if os.environ.has_key('PROFILE'):
+ import profile
+ profile.run("unsermake_main()", 'fooprof')
+
+ import pstats
+ p = pstats.Stats('fooprof')
+ p.strip_dirs()
+ p.sort_stats('cumulative').print_stats(10)
+ p.sort_stats('time').print_stats(10)
- try:
- main()
- except KeyboardInterrupt, ki:
- sys.exit(130)
+ else:
+
+ # If Psyco is installed, use it.
+ # Psyco speeds dramatically up Python, see:
+ # http://psyco.sourceforge.net/
+ try:
+ import psyco
+ psyco.full()
+ except ImportError:
+ # Psyco is optional, silently accept its abscence
+ pass
+
+ try:
+ unsermake_main()
+ except KeyboardInterrupt, ki:
+ sys.exit(130)
-sys.exit(utilities.sys_exit_code)
+ sys.exit(utilities.sys_exit_code)
# vim: ts=4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/program.py new/unsermake-0.4_20070504/program.py
--- old/unsermake-0.4_20060307/program.py 2005-08-14 16:02:50.000000000 +0200
+++ new/unsermake-0.4_20070504/program.py 2006-06-06 13:27:25.000000000 +0200
@@ -113,7 +113,7 @@
outname = rulef.build + base + '.lo'
lines.extend(["@echo '# Generated by libtool replacement' > " + outname,
"@echo \"pic_object='.libs/" + base + ".o'\" >> " + outname,
- "@echo \"non_pic_object=none\" >> " + outname])
+ "@echo \"non_pic_object='.libs/" + base + ".o'\" >> " + outname])
return lines
def handle_source(self, base, ext, forcegenerated=0, final=0):
@@ -348,7 +348,7 @@
else:
index += 1
continue
- elif dep[1:4] == 'Wl,':
+ elif dep[1:4] == 'Wl,' or dep == '-Xlinker':
index += 2
continue
elif dep == '-framework': # Darwin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unsermake-0.4_20060307/target.py new/unsermake-0.4_20070504/target.py
--- old/unsermake-0.4_20060307/target.py 2005-09-01 18:33:31.000000000 +0200
+++ new/unsermake-0.4_20070504/target.py 2006-03-11 17:03:24.000000000 +0100
@@ -4,6 +4,7 @@
just_print = False
num_todo = 0
print_progress = False
+precise_print_progress = False
class PhonyConflict(Exception):
pass
@@ -266,6 +267,8 @@
if echo_line:
if print_progress and not first_line:
print " " + current
+ elif precise_print_progress and not first_line:
+ print " " + current
else:
print current
first_line = False
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
