tags 666584 + patch tags 666584 + pending thanks Dear maintainer,
I've prepared an NMU for conglomerate (versioned as 0.9.1-3.3) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -u conglomerate-0.9.1/debian/changelog conglomerate-0.9.1/debian/changelog --- conglomerate-0.9.1/debian/changelog +++ conglomerate-0.9.1/debian/changelog @@ -1,3 +1,11 @@ +conglomerate (0.9.1-3.3) unstable; urgency=low + + * Non-maintainer upload. + * fix_duplicate_clone.dpatch: Rename clone functions. (Closes: #666584). + * Remove rpath setting in conglomerate binary with chrpath. + + -- Mònica Ramírez Arceda <mon...@debian.org> Mon, 07 May 2012 14:03:37 +0200 + conglomerate (0.9.1-3.2) unstable; urgency=low * Non-maintainer upload. diff -u conglomerate-0.9.1/debian/rules conglomerate-0.9.1/debian/rules --- conglomerate-0.9.1/debian/rules +++ conglomerate-0.9.1/debian/rules @@ -116,6 +116,7 @@ dh_clean -k -s dh_installdirs -s + chrpath -d src/conglomerate install -m 755 src/conglomerate $(CURDIR)/debian/conglomerate/usr/bin/conglomerate install -m 644 debian/conglomerate.lintian-override $(CURDIR)/debian/conglomerate/usr/share/lintian/overrides/conglomerate diff -u conglomerate-0.9.1/debian/control conglomerate-0.9.1/debian/control --- conglomerate-0.9.1/debian/control +++ conglomerate-0.9.1/debian/control @@ -2,7 +2,7 @@ Section: editors Priority: optional Maintainer: Geert Stappers <stapp...@debian.org> -Build-Depends: debhelper (>> 5.0.0), dpatch, libxml-parser-perl, libbonobo2-dev, libbonoboui2-dev, libenchant-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprintui2.2-dev, libgtksourceview2.0-dev, libxslt1-dev, scrollkeeper, libglade2-dev, autotools-dev +Build-Depends: debhelper (>> 5.0.0), dpatch, libxml-parser-perl, libbonobo2-dev, libbonoboui2-dev, libenchant-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprintui2.2-dev, libgtksourceview2.0-dev, libxslt1-dev, scrollkeeper, libglade2-dev, autotools-dev, chrpath Standards-Version: 3.8.2 Homepage: http://www.conglomerate.org only in patch2: unchanged: --- conglomerate-0.9.1.orig/debian/patches/00list +++ conglomerate-0.9.1/debian/patches/00list @@ -6,3 +6,4 @@ #dont_install_generated_gtkdoc.dpatch # only cosmetic package_version.dpatch +fix_duplicate_clone.dpatch only in patch2: unchanged: --- conglomerate-0.9.1.orig/debian/patches/fix_duplicate_clone.dpatch +++ conglomerate-0.9.1/debian/patches/fix_duplicate_clone.dpatch @@ -0,0 +1,63 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_duplicate_cloned.dpatch by Mònica Ramírez Arceda <mon...@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Rename clone functions. (Closes: #666584). + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' conglomerate-0.9.1~/src/cong-editor-line-iter-simple.c conglomerate-0.9.1/src/cong-editor-line-iter-simple.c +--- conglomerate-0.9.1~/src/cong-editor-line-iter-simple.c 2012-05-07 11:59:34.000000000 +0200 ++++ conglomerate-0.9.1/src/cong-editor-line-iter-simple.c 2012-05-07 11:59:37.000000000 +0200 +@@ -26,13 +26,13 @@ + #include "cong-editor-line-iter-simple.h" + + static CongEditorLineIter* +-clone (CongEditorLineIter *line_iter); ++congclone (CongEditorLineIter *line_iter); + + static CongEditorAreaLine* + get_line (CongEditorLineIter *line_iter); + + CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSimple, cong_editor_line_iter_simple, CONG_EDITOR_LINE_ITER_SIMPLE, CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, +- CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone; ++ CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = congclone; + CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = get_line;) + + CONG_DEFINE_EMPTY_DISPOSE(cong_editor_line_iter_simple) +@@ -58,7 +58,7 @@ + } + + static CongEditorLineIter* +-clone (CongEditorLineIter *line_iter) ++congclone (CongEditorLineIter *line_iter) + { + CongEditorLineIterSimple* simple_iter = CONG_EDITOR_LINE_ITER_SIMPLE (line_iter); + CongEditorLineIterSimple* new_iter; +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' conglomerate-0.9.1~/src/cong-editor-line-iter-span-wrapper.c conglomerate-0.9.1/src/cong-editor-line-iter-span-wrapper.c +--- conglomerate-0.9.1~/src/cong-editor-line-iter-span-wrapper.c 2004-11-04 20:18:48.000000000 +0100 ++++ conglomerate-0.9.1/src/cong-editor-line-iter-span-wrapper.c 2012-05-07 12:00:46.642532680 +0200 +@@ -26,13 +26,13 @@ + #include "cong-editor-line-iter-span-wrapper.h" + + static CongEditorLineIter* +-clone (CongEditorLineIter *line_iter); ++congclone (CongEditorLineIter *line_iter); + + static CongEditorAreaLine* + get_line (CongEditorLineIter *line_iter); + + CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSpanWrapper, cong_editor_line_iter_span_wrapper, CONG_EDITOR_LINE_ITER_SPAN_WRAPPER, CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, +- CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone; ++ CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = congclone; + CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = get_line;) + + /* Implementation of CongLineEditorIterSpanWrapper: */ +@@ -80,7 +80,7 @@ + } + + static CongEditorLineIter* +-clone (CongEditorLineIter *line_iter) ++congclone (CongEditorLineIter *line_iter) + { + CongEditorLineIterSpanWrapper* span_wrapper_iter = CONG_EDITOR_LINE_ITER_SPAN_WRAPPER (line_iter); + CongEditorLineIterSpanWrapper* new_iter;
