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.2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #418663 + + debian/patches/remove-gnome-entry-from-desktop.dpatch: + - Make .desktop files freedesktop compliant + + -- Bhavani Shankar Tue, 25 Aug 2009 20:21:55 +0530 + conglomerate (0.9.1-3.2) unstable; urgency=low * Non-maintainer upload. @@ -21,6 +29,16 @@ -- Barry deFreese Mon, 17 Aug 2009 11:44:18 -0400 +conglomerate (0.9.1-3.1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/remove-gnome-entry-from-desktop.dpatch: + - Make .desktop files freedesktop compliant + + debian/control: + - Update Maintainer field as per spec (LP: #230350). + + -- Luca Falavigna Mon, 09 Jun 2008 20:58:10 +0200 + conglomerate (0.9.1-3.1) unstable; urgency=low * Non-maintainer upload during BSP @@ -29,6 +47,14 @@ -- Barry deFreese Tue, 01 Apr 2008 23:21:17 -0400 +conglomerate (0.9.1-3ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + + apply patch to remove GNOME from Categories in + data/conglomerate.desktop.in + + -- Michael Bienia Sat, 25 Nov 2006 00:30:23 +0100 + conglomerate (0.9.1-3) unstable; urgency=low * When determining upstream version, allow + and ~; fixes uninstallability, @@ -40,6 +66,24 @@ -- Geert Stappers Sat, 23 Sep 2006 19:56:39 +0200 +conglomerate (0.9.1-2ubuntu3) edgy; urgency=low + + * No-change upload to build against gnutls13 instead of 11 on sparc/hppa. + + -- Martin Pitt Wed, 11 Oct 2006 10:59:53 +0200 + +conglomerate (0.9.1-2ubuntu2) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Wed, 30 Aug 2006 21:41:00 +0200 + +conglomerate (0.9.1-2ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Sarah Hobbs Fri, 21 Jul 2006 16:21:16 +1000 + conglomerate (0.9.1-2) unstable; urgency=low * Hyphenated user-friendly in ./debian/control, Closes: #341067 @@ -60,6 +104,27 @@ -- Geert Stappers Tue, 18 Jul 2006 22:20:53 +0200 +conglomerate (0.9.1-1ubuntu1) dapper; urgency=low + + * Resynchronise with Debian (Closes: #4397). + - Thanks, Jordan Mantha. + + -- Daniel T Chen Tue, 08 Nov 2005 05:07:06 +0000 + +conglomerate (0.9.1-1) unstable; urgency=low + + * new upstream version + - ships with corrections on German PO files, Closes: #314138 + + -- Geert Stappers Thu, 21 Jul 2005 14:38:04 +0200 + +conglomerate (0.9.0-3ubuntu1) breezy; urgency=low + + * Applied patch to remove GNOME Only Entry in data/conglomerate.desktop.in + (Fixed Malone #347) + + -- Stephan Hermann Sun, 17 Apr 2005 23:15:00 +0200 + conglomerate (0.9.1-1) unstable; urgency=low * new upstream version @@ -374,0 +440 @@ + 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 @@ -1,7 +1,8 @@ Source: conglomerate Section: editors Priority: optional -Maintainer: Geert Stappers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Geert Stappers 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 only in patch2: unchanged: --- conglomerate-0.9.1.orig/debian/patches/remove-gnome-entry-from-desktop.dpatch +++ conglomerate-0.9.1/debian/patches/remove-gnome-entry-from-desktop.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## remove-gnome-entry-from-desktop.dpatch by Stephan Hermann +## DP: Make .desktop file freedesktop compliant. + +@DPATCH@ +diff -urNad conglomerate-0.9.1~/data/conglomerate.desktop conglomerate-0.9.1/data/conglomerate.desktop +--- conglomerate-0.9.1~/data/conglomerate.desktop 2005-06-21 06:20:40.000000000 +0200 ++++ conglomerate-0.9.1/data/conglomerate.desktop 2008-06-09 20:56:57.000000000 +0200 +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=Conglomerate XML Editor + Name[az]=Conglomerate XML Editoru + Name[ca]=Editor XML Conglomerate +@@ -54,8 +53,8 @@ + Comment[zh_CN]=编辑 XML 文件 + TryExec=conglomerate + Exec=conglomerate %U +-Icon=conglomerate-icon-16.png ++Icon=conglomerate-icon-16 + Terminal=false + Type=Application +-Categories=GNOME;Application;Office;TextEditor; ++Categories=Office;TextEditor; + MimeType=text/xml;text/x-dtd;text/x-xds; +diff -urNad conglomerate-0.9.1~/data/conglomerate.desktop.in conglomerate-0.9.1/data/conglomerate.desktop.in +--- conglomerate-0.9.1~/data/conglomerate.desktop.in 2004-11-04 00:58:12.000000000 +0100 ++++ conglomerate-0.9.1/data/conglomerate.desktop.in 2008-06-09 20:57:36.000000000 +0200 +@@ -1,11 +1,10 @@ + [Desktop Entry] +-Encoding=UTF-8 + _Name=Conglomerate XML Editor + _Comment=Edit XML files + TryExec=conglomerate + Exec=conglomerate %U +-Icon=conglomerate-icon-16.png ++Icon=conglomerate-icon-16 + Terminal=false + Type=Application +-Categories=GNOME;Application;Office;TextEditor; ++Categories=Office;TextEditor; + MimeType=text/xml;text/x-dtd;text/x-xds; 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 +remove-gnome-entry-from-desktop