diff -u klogic-1.63/debian/changelog klogic-1.63/debian/changelog --- klogic-1.63/debian/changelog +++ klogic-1.63/debian/changelog @@ -1,3 +1,34 @@ +klogic (1.63-5ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes (LP: #384331): + - debian/rules: added --without-arts parameter to configure script call to + rebuild without arts support + + -- Nick Ellery Sat, 06 Jun 2009 11:00:59 -0700 + +klogic (1.63-5) unstable; urgency=low + + * Move DH_COMPAT into debian/compat. + * Bump Standards-Version to 3.8.1.0. + * Remove obsolete kderemove tag from menu file. + * Catch errors from make distclean. + * Build-dep on debhelper >= 7. + * Call dh_prep instead of dh_clean -k. + + -- Chris Boyle Sun, 24 May 2009 18:33:50 +0100 + +klogic (1.63-4) unstable; urgency=low + + * Fix garbage in about window: put description where it won't be + freed. (closes: #499724) + * debian/watch: Fix homepage URL, bump to v3. + * debian/control: Add Homepage. + * Bump Standards-Version to 3.8.0.0. + * Clarify "Help/maintenance" menu item (it goes to stdout). + * Change menu section in line with new policy (Electronics). + + -- Chris Boyle Sun, 24 May 2009 14:25:01 +0100 + klogic (1.63-3ubuntu1) jaunty; urgency=low * debian/rules: added --without-arts parameter to configure script call to diff -u klogic-1.63/debian/menu klogic-1.63/debian/menu --- klogic-1.63/debian/menu +++ klogic-1.63/debian/menu @@ -2,7 +2,6 @@ needs="x11"\ - section="Apps/Science"\ + section="Applications/Science/Electronics"\ hints="KDE"\ title="KLogic"\ icon="/usr/share/icons/klogic/klogic.xpm"\ - kderemove="1"\ command="/usr/bin/klogic" diff -u klogic-1.63/debian/control klogic-1.63/debian/control --- klogic-1.63/debian/control +++ klogic-1.63/debian/control @@ -3,8 +3,9 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Chris Boyle -Build-Depends: debhelper (>> 3.0.0), kdelibs4-dev (>= 4:3.1.2-2), docbook-to-man, autotools-dev -Standards-Version: 3.7.2.2 +Build-Depends: debhelper (>= 7), kdelibs4-dev (>= 4:3.1.2-2), docbook-to-man, autotools-dev +Standards-Version: 3.8.1.0 +Homepage: http://www.a-rostin.de/ Package: klogic Architecture: any diff -u klogic-1.63/debian/rules klogic-1.63/debian/rules --- klogic-1.63/debian/rules +++ klogic-1.63/debian/rules @@ -5,9 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=5 - ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) COMPILER_FLAGS += CFLAGS="-O0 -g -Wall" else @@ -39,7 +36,7 @@ rm -f build-stamp configure-stamp # clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean rm -f klogic/.deps/* rm -rf autom4te.cache @@ -53,7 +50,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs dh_installexamples examples/*.circuit diff -u klogic-1.63/debian/watch klogic-1.63/debian/watch --- klogic-1.63/debian/watch +++ klogic-1.63/debian/watch @@ -1,2 +1,2 @@ -version=2 -http://www.a-rostin.de/klogic/ (?:.*/)?klogic-([\d\.r-]+)\.tar\.gz debian uupdate +version=3 +http://www.a-rostin.de/ (?:.*/)?klogic-([\d\.r-]+)\.tar\.gz debian uupdate only in patch2: unchanged: --- klogic-1.63.orig/debian/compat +++ klogic-1.63/debian/compat @@ -0,0 +1 @@ +7 only in patch2: unchanged: --- klogic-1.63.orig/klogic/mainw.cpp +++ klogic-1.63/klogic/mainw.cpp @@ -526,7 +526,7 @@ pm_help=helpMenu(); // empty args: it uses global KAboutData CHECK_PTR(pm_help); - pm_help->insertItem(i18n("maintenance"), ID_MAINTENANCE); + pm_help->insertItem(i18n("maintenance (to standard output)"), ID_MAINTENANCE); menubar->insertItem(i18n("&File"), pm_file ); menubar->insertSeparator(); only in patch2: unchanged: --- klogic-1.63.orig/klogic/klogic.cpp +++ klogic-1.63/klogic/klogic.cpp @@ -18,6 +18,7 @@ // global constants //const QString Global::EMPTYSTRING; const QString Global::Klogic::Name = "klogic"; +const QString Global::Klogic::Description = i18n("digital circuit simulator"); const QString Global::Klogic::emptyFileName = i18n("new.circuit"); int Global::Screen::VIRT_SCREEN_SIZE_X = 2600; @@ -209,7 +210,7 @@ uniqueID::reset(); KAboutData aboutData(Global::Klogic::Name, Global::Klogic::Name, - VERSION, i18n("digital circuit simulator"), KAboutData::License_GPL, + VERSION, Global::Klogic::Description, KAboutData::License_GPL, "(c) 2003 Andreas Rostin", 0, 0, "andreas@a-rostin.de"); aboutData.addAuthor("Andreas Rostin",0, "andreas@a-rostin.de"); only in patch2: unchanged: --- klogic-1.63.orig/klogic/klogic.h +++ klogic-1.63/klogic/klogic.h @@ -32,6 +32,7 @@ struct Klogic { static const QString Name; + static const QString Description; static const QString emptyFileName; };