diff -pruN 0.3.6-2-14/debian/changelog 0.3.6-2-14ubuntu2/debian/changelog --- 0.3.6-2-14/debian/changelog 2008-10-07 16:39:18.000000000 +0100 +++ 0.3.6-2-14ubuntu2/debian/changelog 2008-10-07 15:36:51.000000000 +0100 @@ -1,3 +1,26 @@ +ksimus (0.3.6-2-14ubuntu2) intrepid; urgency=low + + * Rebuild for libltdl3 -> libltdl7 transistion. + * Copy admin/config.{guess,sub} after libtoolize. + + -- Steve Kowalik Mon, 06 Oct 2008 17:35:47 +1100 + +ksimus (0.3.6-2-14ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #225499), remaining changes: + - Set Maintainer field to Ubuntu MOTU Developers. + * Revert x-ksimus.xml to x-ksimus.desktop, remove + debian/patches/fix_makefile_am.diff, which was needed to install .xml, + instead of .desktop + * Modify debian/patches/fix_desktop_files.diff: + - Set InitialPreferance, instead of X-InitialPreference in ksimus.desktop + - Remove the part of patch for x-ksimus.{desktop,xml} + * Modify debian/dirs: Add usr/share/applications/kde, remove + usr/share/applications + * Modify debian/rules: Install ksimus.desktop to /usr/share/applications/kde + + -- Sasa Bodiroza Mon, 19 May 2008 23:23:20 +0200 + ksimus (0.3.6-2-14) unstable; urgency=low * QA upload. @@ -15,6 +38,24 @@ ksimus (0.3.6-2-14) unstable; urgency=lo -- Barry deFreese Fri, 08 Feb 2008 00:20:04 -0500 +ksimus (0.3.6-2-13ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Modified .desktop as indicated by Phil Bull + - Fix up ksimus.desktop file. + + Move to /usr/share/applications. + - Enabled dh_installmenu and dh_desktop + (Closes LP: #161837) + * In debian/control: + - Set Maintainer field to Ubuntu MOTU Developers. + * In debian/rules: + - Replaced dh_iconcache with dh_icons. + * Replaced ksimus/x-ksimus.desktop with ksimus/x-ksimus.xml according + to freedesktop.org's shared-mime-info-spec specification. + * Edited build system files to use x-ksimus.xml instead of x-ksimus.desktop + + -- Sasa Bodiroza Mon, 22 Oct 2007 11:27:23 +0100 + ksimus (0.3.6-2-13) unstable; urgency=low * QA upload. @@ -24,6 +65,22 @@ ksimus (0.3.6-2-13) unstable; urgency=lo -- Raphael Geissert Sun, 21 Oct 2007 18:05:45 -0500 +ksimus (0.3.6-2-12ubuntu2) feisty; urgency=low + + * Modified .desktop as indicated by Phil Bull + * Enabled dh_installmenu and dh_desktop + + -- Emmet Hikory Tue, 9 Jan 2007 00:17:26 +0900 + +ksimus (0.3.6-2-12ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Fix up ksimus.desktop file. + + Move to /usr/share/applications. + - Added dh_iconcache. + + -- William Alexander Grant Thu, 7 Dec 2006 21:10:01 +1100 + ksimus (0.3.6-2-12) unstable; urgency=low * Orphaning this package, setting maintainer field to @@ -31,6 +88,12 @@ ksimus (0.3.6-2-12) unstable; urgency=lo -- Aurelien Jarno Sun, 15 Oct 2006 16:15:52 +0200 +ksimus (0.3.6-2-11ubuntu1) edgy; urgency=low + + * Re-merge with Debian + + -- Barry deFreese Wed, 26 Jul 2006 22:18:57 -0400 + ksimus (0.3.6-2-11) unstable; urgency=low * Fixed a silly test of the autoconf version in the KDE scripts. @@ -38,6 +101,19 @@ ksimus (0.3.6-2-11) unstable; urgency=lo -- Aurelien Jarno Thu, 20 Jul 2006 23:22:14 +0200 +ksimus (0.3.6-2-10ubuntu2) dapper; urgency=low + + * Fix up ksimus.desktop file + * Move to /usr/share/applications + + -- Barry deFreese Fri, 26 May 2006 11:48:04 -0400 + +ksimus (0.3.6-2-10ubuntu1) dapper; urgency=low + + * Added dh_iconcache + + -- Sarah Hobbs Wed, 10 May 2006 21:33:42 +1000 + ksimus (0.3.6-2-10) unstable; urgency=low * Added Spanish translation. Thanks to Juan Manuel Garcia Molina @@ -301,3 +377,4 @@ ksimus (0.3.2-1) unstable; urgency=low Local variables: mode: debian-changelog End: + diff -pruN 0.3.6-2-14/debian/control 0.3.6-2-14ubuntu2/debian/control --- 0.3.6-2-14/debian/control 2008-10-07 16:39:18.000000000 +0100 +++ 0.3.6-2-14ubuntu2/debian/control 2008-10-07 15:36:51.000000000 +0100 @@ -1,7 +1,8 @@ Source: ksimus Section: electronics Priority: optional -Maintainer: Debian QA Group +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian QA Group Build-Depends: debhelper (>> 5.0.0), autotools-dev, autoconf, libtool, automake1.7, libqt3-mt-dev (>= 3:3.3.4-7), kdelibs4-dev (>= 4:3.4.2-1), libltdl3-dev, imagemagick, quilt (>= 0.4) Standards-Version: 3.7.3 Homepage: http://ksimus.berlios.de diff -pruN 0.3.6-2-14/debian/dirs 0.3.6-2-14ubuntu2/debian/dirs --- 0.3.6-2-14/debian/dirs 2008-10-07 16:39:18.000000000 +0100 +++ 0.3.6-2-14ubuntu2/debian/dirs 2008-10-07 15:36:51.000000000 +0100 @@ -1,3 +1,3 @@ usr/share/doc/ksimus/examples usr/share/pixmaps -usr/share/applications +usr/share/applications/kde diff -pruN 0.3.6-2-14/debian/patches/fix_desktop_files.diff 0.3.6-2-14ubuntu2/debian/patches/fix_desktop_files.diff --- 0.3.6-2-14/debian/patches/fix_desktop_files.diff 2008-10-07 16:39:18.000000000 +0100 +++ 0.3.6-2-14ubuntu2/debian/patches/fix_desktop_files.diff 2008-10-07 15:36:51.000000000 +0100 @@ -55,29 +55,5 @@ diff -urN ksimus-0.3.6-2-13/ksimus/ksimu +Terminal=false +Name=KSimus Circuit Simulator +MimeType=application/x-ksimus; -+X-InitialPreference=100 ++InitialPreference=100 +Categories=Electronics;Education;KDE;Science; -diff -urN ksimus-0.3.6-2-13/ksimus/x-ksimus.desktop ksimus-0.3.6-2/ksimus/x-ksimus.desktop ---- ksimus-0.3.6-2-13/ksimus/x-ksimus.desktop 2002-08-05 23:44:00.000000000 +0200 -+++ ksimus-0.3.6-2/ksimus/x-ksimus.desktop 1970-01-01 01:00:00.000000000 +0100 -@@ -1,9 +0,0 @@ --[Desktop Entry] --Comment=KSimus Document --Hidden=false --Icon=ksimus.png --MimeType=application/x-ksimus --Patterns=*.sim --Type=MimeType -- -- -diff -urN ksimus-0.3.6-2-13/ksimus/x-ksimus.xml ksimus-0.3.6-2/ksimus/x-ksimus.xml ---- ksimus-0.3.6-2-13/ksimus/x-ksimus.xml 1970-01-01 01:00:00.000000000 +0100 -+++ ksimus-0.3.6-2/ksimus/x-ksimus.xml 2007-11-20 22:52:07.000000000 +0100 -@@ -0,0 +1,7 @@ -+ -+ -+ -+ KSimus Document -+ -+ -+ diff -pruN 0.3.6-2-14/debian/patches/fix_makefile_am.diff 0.3.6-2-14ubuntu2/debian/patches/fix_makefile_am.diff --- 0.3.6-2-14/debian/patches/fix_makefile_am.diff 2008-10-07 16:39:18.000000000 +0100 +++ 0.3.6-2-14ubuntu2/debian/patches/fix_makefile_am.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -diff -urN ksimus-0.3.6-2-13/ksimus/Makefile.am ksimus-0.3.6-2/ksimus/Makefile.am ---- ksimus-0.3.6-2-13/ksimus/Makefile.am 2002-08-05 23:44:00.000000000 +0200 -+++ ksimus-0.3.6-2/ksimus/Makefile.am 2007-11-20 23:51:32.000000000 +0100 -@@ -8,7 +8,7 @@ - - SUBDIRS = tools module boolean lib items - --EXTRA_DIST = main.cpp ksimus.cpp ksimus.h ksimusdoc.cpp ksimusdoc.h ksimusview.cpp ksimusview.h ksimusui.rc ksimus.desktop ksimus.xpm mini-ksimus.xpm basewindow.cpp basewindow.h compcontainer.h component.cpp component.h componentitem.cpp componentitem.h componentmap.cpp componentmap.h compview.cpp compview.h displaywidget.cpp displaywidget.h globals.cpp globals.h ksimfile.cpp ksimfile.h ksimundo.cpp ksimundo.h types.h wire.cpp wire.h resource.h ksimwidget.cpp ksimwidget.h ksimeditor.cpp ksimeditor.h compviewwidget.cpp compviewwidget.h ksimdebug.h componentpropertybasewidget.cpp componentpropertybasewidget.h componentpropertygeneralwidget.cpp componentpropertygeneralwidget.h componentpropertydialog.cpp componentpropertydialog.h componentpropertyinfowidget.cpp componentpropertyinfowidget.h library.cpp library.h compcontainer.cpp componentaddon.cpp componentaddon.h ksimaction.cpp ksimaction.h ksimdata.cpp ksimdata.h compviewhbox.cpp compviewhbox.h compviewvbox.cpp compviewvbox.h componentstyle.cpp componentstyle.h componentpropertystylewidget.cpp componentpropertystylewidget.h wire.cur wire_mask.cur lo16-app-ksimus.png lo32-app-ksimus.png hi16-app-ksimus.png hi32-app-ksimus.png x-ksimus.desktop ksimus-execute.desktop -+EXTRA_DIST = main.cpp ksimus.cpp ksimus.h ksimusdoc.cpp ksimusdoc.h ksimusview.cpp ksimusview.h ksimusui.rc ksimus.desktop ksimus.xpm mini-ksimus.xpm basewindow.cpp basewindow.h compcontainer.h component.cpp component.h componentitem.cpp componentitem.h componentmap.cpp componentmap.h compview.cpp compview.h displaywidget.cpp displaywidget.h globals.cpp globals.h ksimfile.cpp ksimfile.h ksimundo.cpp ksimundo.h types.h wire.cpp wire.h resource.h ksimwidget.cpp ksimwidget.h ksimeditor.cpp ksimeditor.h compviewwidget.cpp compviewwidget.h ksimdebug.h componentpropertybasewidget.cpp componentpropertybasewidget.h componentpropertygeneralwidget.cpp componentpropertygeneralwidget.h componentpropertydialog.cpp componentpropertydialog.h componentpropertyinfowidget.cpp componentpropertyinfowidget.h library.cpp library.h compcontainer.cpp componentaddon.cpp componentaddon.h ksimaction.cpp ksimaction.h ksimdata.cpp ksimdata.h compviewhbox.cpp compviewhbox.h compviewvbox.cpp compviewvbox.h componentstyle.cpp componentstyle.h componentpropertystylewidget.cpp componentpropertystylewidget.h wire.cur wire_mask.cur lo16-app-ksimus.png lo32-app-ksimus.png hi16-app-ksimus.png hi32-app-ksimus.png x-ksimus.xml ksimus-execute.desktop - - install-data-local: - $(mkinstalldirs) $(pkgincludedir)/ -@@ -86,7 +86,7 @@ - $(mkinstalldirs) $(kde_icondir)/hicolor/32x32/apps/ - $(INSTALL_DATA) $(srcdir)/hi32-app-ksimus.png $(kde_icondir)/hicolor/32x32/apps/ksimus.png - $(mkinstalldirs) $(kde_mimedir)/application/ -- $(INSTALL_DATA) $(srcdir)/x-ksimus.desktop $(kde_mimedir)/application/x-ksimus.desktop -+ $(INSTALL_DATA) $(srcdir)/x-ksimus.xml $(kde_mimedir)/application/x-ksimus.xml - $(mkinstalldirs) $(kde_appsdir)/Applications/ - $(INSTALL_DATA) $(srcdir)/ksimus-execute.desktop $(kde_appsdir)/Applications/ksimus-execute.desktop - -@@ -128,7 +128,7 @@ - -rm -f $(kde_icondir)/locolor/32x32/apps/ksimus.png - -rm -f $(kde_icondir)/hicolor/16x16/apps/ksimus.png - -rm -f $(kde_icondir)/hicolor/32x32/apps/ksimus.png -- -rm -f $(kde_mimedir)/application/x-ksimus.desktop -+ -rm -f $(kde_mimedir)/application/x-ksimus.xml - -rm -f $(kde_appsdir)/Applications/ksimus-execute.desktop - - ####### kdevelop will overwrite this part!!! (end)############ -diff -urN ksimus-0.3.6-2-13/ksimus.kdevprj ksimus-0.3.6-2/ksimus.kdevprj ---- ksimus-0.3.6-2-13/ksimus.kdevprj 2003-05-20 00:03:56.000000000 +0200 -+++ ksimus-0.3.6-2/ksimus.kdevprj 2007-11-20 23:51:19.000000000 +0100 -@@ -120,7 +120,7 @@ - type=DATA - - [ksimus/Makefile.am] --files=ksimus/main.cpp,ksimus/ksimus.cpp,ksimus/ksimus.h,ksimus/ksimusdoc.cpp,ksimus/ksimusdoc.h,ksimus/ksimusview.cpp,ksimus/ksimusview.h,ksimus/ksimusui.rc,ksimus/ksimus.desktop,ksimus/ksimus.xpm,ksimus/mini-ksimus.xpm,ksimus/basewindow.cpp,ksimus/basewindow.h,ksimus/compcontainer.h,ksimus/component.cpp,ksimus/component.h,ksimus/componentitem.cpp,ksimus/componentitem.h,ksimus/componentmap.cpp,ksimus/componentmap.h,ksimus/compview.cpp,ksimus/compview.h,ksimus/displaywidget.cpp,ksimus/displaywidget.h,ksimus/globals.cpp,ksimus/globals.h,ksimus/ksimfile.cpp,ksimus/ksimfile.h,ksimus/ksimundo.cpp,ksimus/ksimundo.h,ksimus/types.h,ksimus/wire.cpp,ksimus/wire.h,ksimus/resource.h,ksimus/ksimwidget.cpp,ksimus/ksimwidget.h,ksimus/ksimeditor.cpp,ksimus/ksimeditor.h,ksimus/compviewwidget.cpp,ksimus/compviewwidget.h,ksimus/ksimdebug.h,ksimus/componentpropertybasewidget.cpp,ksimus/componentpropertybasewidget.h,ksimus/componentpropertygeneralwidget.cpp,ksimus/componentpropertygeneralwidget.h,ksimus/componentpropertydialog.cpp,ksimus/componentpropertydialog.h,ksimus/componentpropertyinfowidget.cpp,ksimus/componentpropertyinfowidget.h,ksimus/library.cpp,ksimus/library.h,ksimus/compcontainer.cpp,ksimus/componentaddon.cpp,ksimus/componentaddon.h,ksimus/ksimaction.cpp,ksimus/ksimaction.h,ksimus/ksimdata.cpp,ksimus/ksimdata.h,ksimus/compviewhbox.cpp,ksimus/compviewhbox.h,ksimus/compviewvbox.cpp,ksimus/compviewvbox.h,ksimus/componentstyle.cpp,ksimus/componentstyle.h,ksimus/componentpropertystylewidget.cpp,ksimus/componentpropertystylewidget.h,ksimus/wire.cur,ksimus/wire_mask.cur,ksimus/lo16-app-ksimus.png,ksimus/lo32-app-ksimus.png,ksimus/hi16-app-ksimus.png,ksimus/hi32-app-ksimus.png,ksimus/x-ksimus.desktop,ksimus/ksimus-execute.desktop -+files=ksimus/main.cpp,ksimus/ksimus.cpp,ksimus/ksimus.h,ksimus/ksimusdoc.cpp,ksimus/ksimusdoc.h,ksimus/ksimusview.cpp,ksimus/ksimusview.h,ksimus/ksimusui.rc,ksimus/ksimus.desktop,ksimus/ksimus.xpm,ksimus/mini-ksimus.xpm,ksimus/basewindow.cpp,ksimus/basewindow.h,ksimus/compcontainer.h,ksimus/component.cpp,ksimus/component.h,ksimus/componentitem.cpp,ksimus/componentitem.h,ksimus/componentmap.cpp,ksimus/componentmap.h,ksimus/compview.cpp,ksimus/compview.h,ksimus/displaywidget.cpp,ksimus/displaywidget.h,ksimus/globals.cpp,ksimus/globals.h,ksimus/ksimfile.cpp,ksimus/ksimfile.h,ksimus/ksimundo.cpp,ksimus/ksimundo.h,ksimus/types.h,ksimus/wire.cpp,ksimus/wire.h,ksimus/resource.h,ksimus/ksimwidget.cpp,ksimus/ksimwidget.h,ksimus/ksimeditor.cpp,ksimus/ksimeditor.h,ksimus/compviewwidget.cpp,ksimus/compviewwidget.h,ksimus/ksimdebug.h,ksimus/componentpropertybasewidget.cpp,ksimus/componentpropertybasewidget.h,ksimus/componentpropertygeneralwidget.cpp,ksimus/componentpropertygeneralwidget.h,ksimus/componentpropertydialog.cpp,ksimus/componentpropertydialog.h,ksimus/componentpropertyinfowidget.cpp,ksimus/componentpropertyinfowidget.h,ksimus/library.cpp,ksimus/library.h,ksimus/compcontainer.cpp,ksimus/componentaddon.cpp,ksimus/componentaddon.h,ksimus/ksimaction.cpp,ksimus/ksimaction.h,ksimus/ksimdata.cpp,ksimus/ksimdata.h,ksimus/compviewhbox.cpp,ksimus/compviewhbox.h,ksimus/compviewvbox.cpp,ksimus/compviewvbox.h,ksimus/componentstyle.cpp,ksimus/componentstyle.h,ksimus/componentpropertystylewidget.cpp,ksimus/componentpropertystylewidget.h,ksimus/wire.cur,ksimus/wire_mask.cur,ksimus/lo16-app-ksimus.png,ksimus/lo32-app-ksimus.png,ksimus/hi16-app-ksimus.png,ksimus/hi32-app-ksimus.png,ksimus/x-ksimus.xml,ksimus/ksimus-execute.desktop - sub_dirs=tools,module,boolean,lib,items - type=prog_main - -@@ -1906,10 +1906,10 @@ - install_location= - type=DATA - --[ksimus/x-ksimus.desktop] -+[ksimus/x-ksimus.xml] - dist=true - install=true --install_location=$$(kde_mimedir)/application/x-ksimus.desktop -+install_location=$$(kde_mimedir)/application/x-ksimus.xml - type=DATA - - [po/Makefile.am] diff -pruN 0.3.6-2-14/debian/patches/series 0.3.6-2-14ubuntu2/debian/patches/series --- 0.3.6-2-14/debian/patches/series 2008-10-07 16:39:18.000000000 +0100 +++ 0.3.6-2-14ubuntu2/debian/patches/series 2008-10-07 15:36:51.000000000 +0100 @@ -1,5 +1,3 @@ missing_cstdlib_include.diff ksimus_qt3_headers.diff fix_desktop_files.diff -fix_makefile_am.diff - diff -pruN 0.3.6-2-14/debian/rules 0.3.6-2-14ubuntu2/debian/rules --- 0.3.6-2-14/debian/rules 2008-10-07 16:39:18.000000000 +0100 +++ 0.3.6-2-14ubuntu2/debian/rules 2008-10-07 15:36:51.000000000 +0100 @@ -29,13 +29,12 @@ debian/debiandirs: admin/debianrules build-stamp: patch dh_testdir + /usr/bin/libtoolize -f + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in -test -r /usr/share/misc/config.sub && \ cp -f /usr/share/misc/config.sub admin/config.sub -test -r /usr/share/misc/config.guess && \ cp -f /usr/share/misc/config.guess admin/config.guess - - /usr/bin/libtoolize -f - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in $(MAKE) -f admin/Makefile.common QTDIR=/usr/share/qt3 ./configure \ @@ -87,7 +86,7 @@ install: build # Move desktop file mv $(CURDIR)/debian/ksimus/usr/share/applnk/Applications/ksimus.desktop \ - $(CURDIR)/debian/ksimus/usr/share/applications + $(CURDIR)/debian/ksimus/usr/share/applications/kde # Build architecture-independent files here. binary-indep: build install