--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
I've prepared a new revision of gigolo to fix rc bug #654468 (the tarball
contains waf… but still provides an autotools-based build system, so I repacked
it to get rid of waf).
Would such a change (see attached debdiff between 0.4.1-3 and 0.4.1+dfsg-1) be
acceptable for wheezy?
Thanks.
Lionel
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (102, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for gigolo-0.4.1 gigolo-0.4.1+dfsg
Makefile.am | 2
configure | 103 ----------------------
debian/changelog | 13 ++
debian/rules | 19 ++++
debian/watch | 1
waf |binary
wscript | 257 -------------------------------------------------------
7 files changed, 33 insertions(+), 362 deletions(-)
diff -Nru gigolo-0.4.1/configure gigolo-0.4.1+dfsg/configure
--- gigolo-0.4.1/configure 2010-07-31 15:48:28.000000000 +0200
+++ gigolo-0.4.1+dfsg/configure 1970-01-01 01:00:00.000000000 +0100
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# waf configure wrapper
-
-EXIT_FAILURE=1
-
-
-# Checks for Python interpreter. Honours $PYTHON if set. Stores path to
-# interpreter in $PYTHON.
-checkPython()
-{
- if [ -z "$PYTHON" ] ; then
- PYTHON="python"
- fi
- printf "Checking for Python\t\t\t : "
- ("$PYTHON" --version) < /dev/null > /dev/null 2>&1 || {
- printf "not found!\n"
- echo "Please make sure that the Python interpreter is available in your PATH"
- echo "or invoke configure using the PYTHON flag, e.g."
- echo "$ PYTHON=/usr/local/bin/python ./waf configure "$@
- echo "Alternatively, you can run ./autogen.sh to use the autotools chain"
- echo "to build and install the sources."
- exit $EXIT_FAILURE
- }
- printf "ok\n"
-}
-
-# Generates a Makefile.
-generateMakefile()
-{
- cat > Makefile << EOF
-#!/usr/bin/make -f
-# Waf Makefile wrapper
-
-all:
- @./waf build
-
-all-debug:
- @./waf -v build
-
-all-progress:
- @./waf -p build
-
-install:
- @if test -n "\$(DESTDIR)"; then \\
- ./waf install --destdir="\$(DESTDIR)"; \\
- else \\
- ./waf install; \\
- fi;
-
-uninstall:
- @if test -n "\$(DESTDIR)"; then \\
- ./waf uninstall --destdir="\$(DESTDIR)"; \\
- else \\
- ./waf uninstall; \\
- fi;
-
-clean:
- @./waf clean
-
-distclean:
- @./waf distclean
- @-rm -rf _build_
- @-rm -f Makefile
-
-distcheck:
- @./waf distcheck
-
-check:
- @./waf check
-
-dist:
- @./waf dist
-
-sign:
- @./waf --sign
-
-.PHONY: clean dist distclean check uninstall install all
-
-EOF
-
- cat > src/Makefile << EOF
-#!/usr/bin/make -f
-# Waf Makefile wrapper
-
-all:
- cd .. && ./waf build
-
-all-debug:
- cd .. && ./waf -v build
-
-clean:
- cd .. && ./waf clean
-
-EOF
-}
-
-checkPython $@
-generateMakefile
-
-./waf configure $@
-
-exit $?
diff -Nru gigolo-0.4.1/debian/changelog gigolo-0.4.1+dfsg/debian/changelog
--- gigolo-0.4.1/debian/changelog 2011-09-04 22:26:08.000000000 +0200
+++ gigolo-0.4.1+dfsg/debian/changelog 2012-10-20 17:17:11.000000000 +0200
@@ -1,3 +1,16 @@
+gigolo (0.4.1+dfsg-1) UNRELEASED; urgency=low
+
+ * 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@gmail.com> Sat, 20 Oct 2012 16:55:26 +0200
+
gigolo (0.4.1-3) unstable; urgency=low
* debian/rules:
diff -Nru gigolo-0.4.1/debian/rules gigolo-0.4.1+dfsg/debian/rules
--- gigolo-0.4.1/debian/rules 2011-09-04 22:26:05.000000000 +0200
+++ gigolo-0.4.1+dfsg/debian/rules 2012-10-20 17:16:49.000000000 +0200
@@ -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)
diff -Nru gigolo-0.4.1/debian/watch gigolo-0.4.1+dfsg/debian/watch
--- gigolo-0.4.1/debian/watch 2009-08-03 18:42:10.000000000 +0200
+++ gigolo-0.4.1+dfsg/debian/watch 2012-10-20 17:08:03.000000000 +0200
@@ -1,3 +1,4 @@
version=3
+opts=dversionmangle=s/\+dfsg$// \
http://archive.xfce.org/src/apps/gigolo/([\d\.]+)/ \
gigolo-([\d\.]+)\.tar\.(?:gz|bz2)
diff -Nru gigolo-0.4.1/Makefile.am gigolo-0.4.1+dfsg/Makefile.am
--- gigolo-0.4.1/Makefile.am 2010-07-31 15:48:28.000000000 +0200
+++ gigolo-0.4.1+dfsg/Makefile.am 2012-10-20 17:08:20.000000000 +0200
@@ -6,8 +6,6 @@
EXTRA_DIST = \
autogen.sh \
- wscript \
- waf \
README.I18N \
gigolo.desktop.in \
intltool-extract.in \
Binary files /tmp/L3X7Fio1vP/gigolo-0.4.1/waf and /tmp/xNJj35NmDS/gigolo-0.4.1+dfsg/waf differ
diff -Nru gigolo-0.4.1/wscript gigolo-0.4.1+dfsg/wscript
--- gigolo-0.4.1/wscript 2010-07-31 15:48:28.000000000 +0200
+++ gigolo-0.4.1+dfsg/wscript 1970-01-01 01:00:00.000000000 +0100
@@ -1,257 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# WAF build script
-#
-# Copyright 2008-2010 Enrico Tröger <enrico(at)xfce(dot)org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-from TaskGen import taskgen, feature
-import Build, Configure, Options, Utils, UnitTest
-import sys, os, shutil
-
-
-APPNAME = 'gigolo'
-VERSION = '0.4.1'
-
-srcdir = '.'
-blddir = '_build_'
-
-
-sources = [ 'src/compat.c', 'src/window.c', 'src/bookmark.c', 'src/settings.c',
- 'src/menubuttonaction.c', 'src/mountoperation.c', 'src/bookmarkdialog.c',
- 'src/bookmarkeditdialog.c', 'src/preferencesdialog.c', 'src/backendgvfs.c',
- 'src/common.c', 'src/mountdialog.c', 'src/browsenetworkpanel.c',
- 'src/singleinstance.c', 'src/bookmarkpanel.c' ]
-
-
-
-def configure(conf):
- conf.check_tool('compiler_cc intltool misc gnu_dirs')
-
- conf.check_cfg(package='gtk+-2.0', atleast_version='2.12.0', uselib_store='GTK',
- mandatory=True, args='--cflags --libs')
- conf.check_cfg(package='gio-2.0', atleast_version='2.16.0', uselib_store='GIO',
- mandatory=True, args='--cflags --libs')
- conf.check_cfg(package='x11', uselib_store='X11', mandatory=True, args='--libs')
-
- gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK')
- gio_version = conf.check_cfg(modversion='gio-2.0', uselib_store='GIO')
-
- conf.define('GETTEXT_PACKAGE', APPNAME, 1)
- conf.define('PACKAGE', APPNAME, 1)
- conf.define('VERSION', VERSION, 1)
-
- conf.write_config_header('config.h')
-
- if 'LINGUAS' in os.environ:
- conf.env['LINGUAS'] = os.environ['LINGUAS']
-
- # debug flags
- if Options.options.debug:
- conf.env.append_value('CCFLAGS', '-g -O0 -DDEBUG '.split())
-
- Utils.pprint('BLUE', 'Summary:')
- print_message(conf, 'Install Gigolo ' + VERSION + ' in', conf.env['PREFIX'])
- print_message(conf, 'Using GTK version', gtk_version or 'Unknown')
- print_message(conf, 'Using GIO version', gio_version or 'Unknown')
- print_message(conf, 'Compiling with debugging support', Options.options.debug and 'yes' or 'no')
-
-
-def set_options(opt):
- opt.tool_options('compiler_cc')
- opt.tool_options('intltool')
- opt.tool_options('gnu_dirs')
-
- # Features
- opt.add_option('--enable-debug', action='store_true', default=False,
- help='enable debug mode [default: No]', dest='debug')
- opt.add_option('--update-po', action='store_true', default=False,
- help='update the message catalogs for translation', dest='update_po')
-
-
-@taskgen
-@feature('intltool_po')
-def write_linguas_file(self):
- linguas = ''
- if 'LINGUAS' in Build.bld.env:
- files = Build.bld.env['LINGUAS']
- for po_filename in files.split(' '):
- if os.path.exists('po/%s.po' % po_filename):
- linguas += '%s ' % po_filename
- else:
- files = os.listdir('%s/po' % self.path.abspath())
- files.sort()
- for f in files:
- if f.endswith('.po'):
- linguas += '%s ' % f[:-3]
- f = open("po/LINGUAS", "w")
- f.write('# This file is autogenerated. Do not edit.\n%s\n' % linguas)
- f.close()
-
-
-def build(bld):
- def add_tests(bld):
- tests = os.listdir('tests')
- for test in tests:
- if test[-2:] != '.c':
- continue
- target = test[:-2]
- source = os.path.join("tests", test)
-
- bld.new_task_gen(
- features = 'cc cprogram',
- target = 'test-' + target,
- source = source,
- includes = '. src',
- uselib = 'GTK GIO',
- uselib_local = 'gigolo_lib',
- unit_test = 1,
- install_path = None
- )
-
-
- bld.new_task_gen(
- features = 'cc cstaticlib',
- name = 'gigolo_lib',
- target = 'gigolo_lib',
- source = sources,
- includes = '.',
- uselib = 'GTK GIO',
- install_path = None
- )
-
- bld.new_task_gen(
- features = 'cc cprogram',
- name = 'gigolo',
- target = 'gigolo',
- source = 'src/main.c',
- includes = '.',
- uselib = 'GTK GIO X11',
- uselib_local = 'gigolo_lib',
- )
-
- if Options.commands['check']:
- add_tests(bld)
-
- # Translations
- bld.new_task_gen(
- features = 'intltool_po',
- podir = 'po',
- appname = 'gigolo'
- )
-
- # gigolo.desktop
- bld.new_task_gen(
- features = 'intltool_in',
- source = 'gigolo.desktop.in',
- flags = [ '-d', '-q', '-u', '-c' ],
- install_path = '${DATADIR}/applications'
- )
-
- # gigolo.1
- bld.new_task_gen(
- features = 'subst',
- source = 'gigolo.1.in',
- target = 'gigolo.1',
- dict = { 'VERSION' : VERSION },
- install_path = '${MANDIR}/man1'
- )
-
- # Docs
- bld.install_files('${DOCDIR}', 'AUTHORS ChangeLog COPYING README NEWS TODO')
-
-
-def dist():
- import md5
- from Scripting import dist, excludes
- excludes.append('gigolo-%s.tar.bz2.sig' % VERSION)
- filename = dist(APPNAME, VERSION)
- f = file(filename,'rb')
- m = md5.md5()
- readBytes = 100000
- while (readBytes):
- readString = f.read(readBytes)
- m.update(readString)
- readBytes = len(readString)
- f.close()
- launch('gpg --detach-sign --digest-algo SHA512 %s' % filename, 'Signing %s' % filename)
- print 'MD5 sum:', filename, m.hexdigest()
- sys.exit(0)
-
-
-def shutdown():
- # the following code was taken from midori's WAF script, thanks
- # (disabled because we don't need it at all as long as we don't have an own icon :( )
- #~ if Options.commands['install'] or Options.commands['uninstall']:
- #~ dir = Build.bld.get_install_path('${DATADIR}/icons/hicolor')
- #~ icon_cache_updated = False
- #~ if not Options.options.destdir:
- #~ try:
- #~ if not Utils.exec_command('gtk-update-icon-cache -q -f -t %s' % dir):
- #~ Utils.pprint('YELLOW', "Updated Gtk icon cache.")
- #~ icon_cache_updated = True
- #~ except:
- #~ Utils.pprint('RED', "Failed to update icon cache.")
- #~ if not icon_cache_updated:
- #~ Utils.pprint('YELLOW', "Icon cache not updated. After install, run this:")
- #~ Utils.pprint('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir)
- if Options.options.update_po:
- os.chdir(os.path.join(srcdir, 'po'))
- try:
- try:
- size_old = os.stat('gigolo.pot').st_size
- except:
- size_old = 0
- Utils.exec_command(['intltool-update', '--pot', '-g', APPNAME])
- size_new = os.stat('gigolo.pot').st_size
- if size_new != size_old:
- Utils.pprint('CYAN', 'Updated POT file.')
- launch('intltool-update -r %s' % APPNAME, 'Updating translations', 'CYAN')
- else:
- Utils.pprint('CYAN', 'POT file is up to date.')
- except:
- Utils.pprint('RED', 'Failed to generate pot file.')
- os.chdir('..')
-
-
-def check(ch):
- test = UnitTest.unit_test()
- test.change_to_testfile_dir = False
- test.want_to_see_test_output = True
- test.want_to_see_test_error = True
- test.run()
- test.print_results()
-
-
-# Simple function to execute a command and print its exit status
-def launch(command, status, success_color='GREEN'):
- ret = 0
- Utils.pprint(success_color, status)
- try:
- ret = Utils.exec_command(command.split())
- except:
- ret = 1
-
- if ret != 0:
- Utils.pprint('RED', status + ' failed')
-
- return ret
-
-def print_message(conf, msg, result, color = 'GREEN'):
- conf.check_message_1(msg)
- conf.check_message_2(result, color)
--- End Message ---