--- conglomerate-0.9.1.orig/debian/changelog +++ conglomerate-0.9.1/debian/changelog @@ -1,10 +1,79 @@ -conglomerate (0.9.0-4) UNRELEASED; urgency=low +conglomerate (0.9.1-3.3) unstable; urgency=low - * expecting new upstream version ( ready to - run `debian/patches/release 4.3.2-1` ) + * 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, 07 May 2012 14:03:37 +0200 + +conglomerate (0.9.1-3.2) unstable; urgency=low + + * Non-maintainer upload. + * Add libglade2-dev build-dep. (Closes: #527712). + + Thanks to Tim Retout. + * Install changelogs properly. (Closes: #393564). + + Thanks to Tim Retout. + * Build with libgtksourceview2.0-dev. (Closes: #542059 #541962). + * Update watch file. + * Move Homepage to source stanza. + * Fix syntax and spelling error in debian/NEWS. + * Add ${misc:Depends} for debhelper package. + * Remove call to deprecated dh_scrollkeeper in rules. + * Remove linda override file. + * Copy in config.{sub,guess} on configure, rm them on clean. + + Add autotools-dev build-dep. + * Add Section: debug to -dbg package. + * Bump debhelper build-dep and compat to 5. + * Bump Standards Version to 3.8.2. + + Menu policy transition. + + -- Barry deFreese Mon, 17 Aug 2009 11:44:18 -0400 + +conglomerate (0.9.1-3.1) unstable; urgency=low + + * Non-maintainer upload during BSP + * release goal: Fix clean to build twice in a row. (Closes: #424158, + #442519). + + -- Barry deFreese Tue, 01 Apr 2008 23:21:17 -0400 + +conglomerate (0.9.1-3) unstable; urgency=low + + * When determining upstream version, allow + and ~; fixes uninstallability, + patch from Martin Orr. Closes: #387585, #388866 + Should obsolete announced NMU by Steinar Gunderson, thanks away! + Closes: #388754 + + * Made conglomerate.prerm empty. Closes #387626 + + -- Geert Stappers Sat, 23 Sep 2006 19:56:39 +0200 + +conglomerate (0.9.1-2) unstable; urgency=low + + * Hyphenated user-friendly in ./debian/control, Closes: #341067 + + * conglomerate-common: + - removed circular Depends on conglomerate, Closes: #339917 + + * Build-depend on libxml-parser-perl instead of gnome-common, + Closes: #335362 + + * Include copyright and changelog in the binary package, + Closes: #378400 + + * Rebuild against a newer dh_gconf. Closes: #369874 + + * Follow the last version of Debian Policy + (Standards-Version 3.7.2 instead of 3.6.1). + + -- Geert Stappers Tue, 18 Jul 2006 22:20:53 +0200 + +conglomerate (0.9.1-1) unstable; urgency=low + + * new upstream version - ships with corrections on German PO files, Closes: #314138 - -- Geert Stappers Tue, 15 Mar 2005 12:27:50 +0100 + -- Geert Stappers Thu, 21 Jul 2005 14:38:04 +0200 conglomerate (0.9.0-3) unstable; urgency=low --- conglomerate-0.9.1.orig/debian/conglomerate.prerm +++ conglomerate-0.9.1/debian/conglomerate.prerm @@ -1,12 +1,12 @@ #! /bin/sh - +# since the fix of #387626 is this an "empty file" + set -e PACKAGE=conglomerate if [ "$1" = "upgrade" -o "$1" = "remove" ]; then - # remove the symbolic link - rm -f /usr/share/doc/${PACKAGE} + : # empty statement fi #DEBHELPER# --- conglomerate-0.9.1.orig/debian/conglomerate.dirs +++ conglomerate-0.9.1/debian/conglomerate.dirs @@ -1,3 +1,2 @@ usr/bin -usr/share/linda/overrides usr/share/lintian/overrides --- conglomerate-0.9.1.orig/debian/compat +++ conglomerate-0.9.1/debian/compat @@ -1 +1 @@ -4 +5 --- conglomerate-0.9.1.orig/debian/conglomerate.lintian-override +++ conglomerate-0.9.1/debian/conglomerate.lintian-override @@ -1,2 +1 @@ -conglomerate: no-copyright-file conglomerate: binary-without-manpage conglomerate --- conglomerate-0.9.1.orig/debian/watch +++ conglomerate-0.9.1/debian/watch @@ -1,9 +1,3 @@ -# watch file, `man uscan` for more information -version=2 +version=3 -# the URLs below where found after following -# http://sourceforge.net/project/showfiles.php?group_id=82766 -http://heanet.dl.sourceforge.net/sourceforge/conglomerate/conglomerate-(.*)\.tar\.gz -#previous#http://belnet.dl.sourceforge.net/sourceforge/conglomerate/conglomerate-(.*)\.tar\.gz - -# end of file +http://sf.net/conglomerate/conglomerate-([\d.]+)\.tar\.gz --- conglomerate-0.9.1.orig/debian/conglomerate-common.menu +++ conglomerate-0.9.1/debian/conglomerate-common.menu @@ -1,6 +1,6 @@ ?package(conglomerate):\ needs="X11"\ - section="Apps/Editors"\ + section="Applications/Editors"\ title="Conglomerate XML editor"\ icon="/usr/share/pixmaps/conglomerate_icon.xpm"\ command="/usr/bin/conglomerate" --- conglomerate-0.9.1.orig/debian/rules +++ conglomerate-0.9.1/debian/rules @@ -4,7 +4,7 @@ PACKAGE = conglomerate -upstreamversion=$(shell dpkg-parsechangelog | grep Version | head -1 | sed -e 's/Version: //g' -e 's/-[A-Za-z0-9\.]*$$//g') +upstreamversion=$(shell dpkg-parsechangelog | grep Version | head -1 | sed -e 's/Version: //g' -e 's/-[A-Za-z0-9\.\+~]*$$//g') # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -29,6 +29,13 @@ config.status: configure dh_testdir # Commands to configure the package. +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr --mandir=\$${prefix}/share/man \ @@ -74,11 +81,17 @@ rm -f build-arch-stamp build-indep-stamp # Commands to clean up after the build process. - -$(MAKE) distclean ; cd src ; $(MAKE) distclean + [ ! -f src/Makefile ] || $(MAKE) -C src/ distclean + [ ! -f Makefile ] || $(MAKE) distclean rm -f doc/C/conglomerate-C.omf.out rm -f intltool-extract intltool-merge intltool-update rm -f po/.intltool-merge-cache rm -f conglomerate + rm -f src/conglomerate-dbg + rm -f Makefilee + rm -f doc/Makefilee + rm -f doc/reference/Makefile + rm -f config.sub config.guess dh_clean @@ -103,10 +116,10 @@ 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 - install -m 644 debian/conglomerate.linda-override $(CURDIR)/debian/conglomerate/usr/share/linda/overrides/conglomerate # and for the debug package conglomerate-dbg install -m 755 src/conglomerate-dbg $(CURDIR)/debian/conglomerate-dbg/usr/bin/conglomerate-dbg @@ -120,7 +133,6 @@ dh_installexamples -i dh_installmenu -i dh_installman -i doc/C/conglomerate.1 - dh_scrollkeeper -i dh_gconf -i dh_link -i dh_compress -i @@ -135,6 +147,8 @@ conglomerate: build-arch install-arch dh_testdir -p $@ dh_testroot -p $@ + dh_installchangelogs -i src/ChangeLog -p $@ + dh_installdocs -p $@ dh_strip -p $@ dh_compress -p $@ dh_fixperms -p $@ --- conglomerate-0.9.1.orig/debian/control +++ conglomerate-0.9.1/debian/control @@ -2,35 +2,33 @@ Section: editors Priority: optional Maintainer: Geert Stappers -Build-Depends: debhelper (>> 4.1.51), dpatch, gnome-common, libbonobo2-dev, libbonoboui2-dev, libenchant-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprintui2.2-dev, libgtksourceview-dev, libxslt1-dev, scrollkeeper -Standards-Version: 3.6.1 +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 Package: conglomerate Architecture: any -Depends: conglomerate-common (>= ${Upstream-Version}), ${shlibs:Depends} +Depends: conglomerate-common (>= ${Upstream-Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: xml-core Suggests: docbook-xml, docbook-xsl -Description: userfriendly XML editor - Conglomerate is a free, as in GPL, userfriendly XML-file editor, +Description: user-friendly XML editor + Conglomerate is a free, as in GPL, user-friendly XML-file editor, for DocBook and other document types. It aims to hide the complexity and jargon of XML behind a friendly GUI. - . - Homepage: http://www.conglomerate.org Package: conglomerate-common Architecture: all -Depends: conglomerate, ${misc:Depends} +Depends: ${misc:Depends} Conflicts: conglomerate (<< 0.7.14-4) -Description: common files for the userfriendly XML editor - Conglomerate is a free, as in GPL, userfriendly XML-file editor, +Description: common files for the user-friendly XML editor + Conglomerate is a free, as in GPL, user-friendly XML-file editor, for DocBook and other document types. In this package documentation, PO files, examples and other files that are architecture independent. - . - Homepage: http://www.conglomerate.org Package: conglomerate-dbg +Section: debug Architecture: any -Depends: conglomerate-common (>= ${Upstream-Version}), ${shlibs:Depends} -Description: userfriendly XML editor, with debug symbols +Depends: conglomerate-common (>= ${Upstream-Version}), ${shlibs:Depends}, ${misc:Depends} +Description: user-friendly XML editor, with debug symbols Unstripped version of the executable --- conglomerate-0.9.1.orig/debian/NEWS +++ conglomerate-0.9.1/debian/NEWS @@ -2,7 +2,7 @@ * Doing `apt-get source conglomerate` and `debian/rules conglomerate-dbg` can easy produce an executable that is not stripped. - You can use the conglomerate-dbg package for creating usefull stacktraces. + You can use the conglomerate-dbg package for creating useful stacktraces. -- Geert Stappers Sat, 30 Oct 2004 14:27:55 +0200 @@ -17,8 +17,8 @@ conglomerate (0.7.5-1) unstable; urgency=low - * There is gtk-doc, but it will not go into the debian package. - It would make the .deb too fat with that programmers information. - Fetch the source.tar.gz when you are interrested in the API stuff. + * There is gtk-doc, but it will not go into the debian package. + It would make the .deb too fat with that programmers information. + Fetch the source.tar.gz when you are interrested in the API stuff. -- Geert Stappers Fri, 28 Nov 2003 22:22:47 +0100 --- conglomerate-0.9.1.orig/debian/docs +++ conglomerate-0.9.1/debian/docs @@ -0,0 +1,2 @@ +debian/changelog +debian/copyright --- conglomerate-0.9.1.orig/debian/conglomerate.postinst +++ conglomerate-0.9.1/debian/conglomerate.postinst @@ -4,11 +4,6 @@ PACKAGE=conglomerate -if [ "$1" = "configure" ]; then - cd /usr/share/doc/ - ln -fs ${PACKAGE}-common ${PACKAGE} -fi - #DEBHELPER# exit 0 --- 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 --- 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 +## +## 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;