package: conglomerate severity: normal Hi,
Attached is a debdiff of the NMU I have uploaded to DELAYED/7. My apologies, it is fairly intrusive for an NMU but while I was fixing some of the bugs, I felt compelled to fix some other stuff.
Thanks, Barry deFreese Debian QA
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,20 +2,19 @@ Section: editors Priority: optional Maintainer: Geert Stappers <[email protected]> -Build-Depends: debhelper (>> 4.1.51), dpatch, libxml-parser-perl, libbonobo2-dev, libbonoboui2-dev, libenchant-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprintui2.2-dev, libgtksourceview-dev, libxslt1-dev, scrollkeeper -Standards-Version: 3.7.2 +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 +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: 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 @@ -27,10 +26,9 @@ 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} +Depends: conglomerate-common (>= ${Upstream-Version}), ${shlibs:Depends}, ${misc:Depends} Description: user-friendly XML editor, with debug symbols Unstripped version of the executable reverted: --- conglomerate-0.9.1/debian/conglomerate.linda-override +++ conglomerate-0.9.1.orig/debian/conglomerate.linda-override @@ -1 +1,5 @@ Tag: no-manual-for-binary + +Tag: no-copyright + +Tag: no-changelog reverted: --- conglomerate-0.9.1/debian/conglomerate.docs +++ conglomerate-0.9.1.orig/debian/conglomerate.docs @@ -1,2 +0,0 @@ -debian/changelog -debian/copyright 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 @@ -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 \ @@ -84,6 +91,7 @@ rm -f Makefilee rm -f doc/Makefilee rm -f doc/reference/Makefile + rm -f config.sub config.guess dh_clean @@ -111,7 +119,6 @@ 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 @@ -125,7 +132,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 @@ -140,6 +146,7 @@ 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 $@ 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,26 @@ +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 <[email protected]> Mon, 17 Aug 2009 11:44:18 -0400 + conglomerate (0.9.1-3.1) unstable; urgency=low * Non-maintainer upload during BSP only in patch2: unchanged: --- conglomerate-0.9.1.orig/debian/docs +++ conglomerate-0.9.1/debian/docs @@ -0,0 +1,2 @@ +debian/changelog +debian/copyright only in patch2: unchanged: --- 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" only in patch2: unchanged: --- conglomerate-0.9.1.orig/debian/compat +++ conglomerate-0.9.1/debian/compat @@ -1 +1 @@ -4 +5 only in patch2: unchanged: --- 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 only in patch2: unchanged: --- 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 only in patch2: unchanged: --- 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 <[email protected]> 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 <[email protected]> Fri, 28 Nov 2003 22:22:47 +0100
