diff -Nru adept-2.1.3ubuntu25.1/debian/changelog adept-2.1.3ubuntu25.2/debian/changelog --- adept-2.1.3ubuntu25.1/debian/changelog 2008-10-09 11:37:57.000000000 +0100 +++ adept-2.1.3ubuntu25.2/debian/changelog 2009-10-01 00:10:26.000000000 +0100 @@ -1,3 +1,9 @@ +adept (2.1.3ubuntu25.2) hardy-proposed; urgency=low + + * Update kubuntu_33_skip_intrepid.diff for karmic, closes LP: #439706 + + -- Jonathan Riddell Wed, 30 Sep 2009 23:55:42 +0100 + adept (2.1.3ubuntu25.1) hardy-proposed; urgency=low * Add kubuntu_33_skip_intrepid.diff, don't offer automatic upgrade to intrepid diff -Nru /tmp/rUh6gD8dCj/adept-2.1.3ubuntu25.1/debian/patches/kubuntu_33_skip_intrepid.diff /tmp/F1g77FkMhg/adept-2.1.3ubuntu25.2/debian/patches/kubuntu_33_skip_intrepid.diff --- adept-2.1.3ubuntu25.1/debian/patches/kubuntu_33_skip_intrepid.diff 2008-10-08 17:58:24.000000000 +0100 +++ adept-2.1.3ubuntu25.2/debian/patches/kubuntu_33_skip_intrepid.diff 2009-10-01 00:01:31.000000000 +0100 @@ -1,5 +1,24 @@ ---- adept-2.1.3ubuntu25/adept/manager/app.cpp 2008-10-08 17:21:21.000000000 +0100 -+++ adept-2.1.3ubuntu25/adept/manager/app.cpp 2008-10-08 16:35:02.000000000 +0100 +--- adept-2.1.3ubuntu25.1/adept/manager/main.cpp 2009-09-30 23:59:33.000000000 +0100 ++++ adept-2.1.3ubuntu25.1/adept/manager/main.cpp 2009-09-30 23:47:46.000000000 +0100 +@@ -11,6 +11,7 @@ + { "dist-upgrade", I18N_NOOP("add toolbar button to launch the version upgrade tool to the latest release"), 0}, + { "dist-upgrade-proposed", I18N_NOOP("add toolbar button to launch the version upgrade tool to proposed next release"), 0}, + { "dist-upgrade-devel", I18N_NOOP("add toolbar button to launch the version upgrade tool to development version"), 0}, ++ { "dist-upgrade-devel-lts", I18N_NOOP("add toolbar button to launch the version upgrade tool to LTS development version"), 0}, + KCmdLineLastOption + }; + +@@ -62,6 +63,8 @@ + ta->addVersionUpgrade(QString("http://changelogs.ubuntu.com/meta-release-proposed")); + } else if (args && args->isSet("dist-upgrade-devel")) { + ta->addVersionUpgrade(QString("http://changelogs.ubuntu.com/meta-release-development"), true); ++ } else if (args && args->isSet("dist-upgrade-devel-lts")) { ++ ta->addVersionUpgrade(QString("http://changelogs.ubuntu.com/meta-release-development"), true, true); + } + #endif + +--- adept-2.1.3ubuntu25.1/adept/manager/app.cpp 2009-09-30 23:59:39.000000000 +0100 ++++ adept-2.1.3ubuntu25.1/adept/manager/app.cpp 2009-09-30 23:48:00.000000000 +0100 @@ -293,7 +293,7 @@ notifyPostChange( 0 ); #ifdef KUBUNTU @@ -9,28 +28,31 @@ KToolBar* tool = toolBar(); tool->insertButton(QString("2uparrow"), 12345, SIGNAL(released()), this, SLOT(releaseUpgrade()), true, i18n("Version Upgrade")); m_upgradeButtonAdded = true; -@@ -312,7 +312,7 @@ +@@ -310,9 +310,9 @@ + #endif + #ifdef KUBUNTU - void TestApp::addVersionUpgrade(QString url, bool develVersion) { +-void TestApp::addVersionUpgrade(QString url, bool develVersion) { ++void TestApp::addVersionUpgrade(QString url, bool develVersion, bool skipIntrepid) { wizard = new UpgradeWizard(this, 0, 1); - bool show = wizard->checkForDistUpgrade(url, develVersion); -+ bool show = wizard->checkForDistUpgrade(false, url, develVersion); ++ bool show = wizard->checkForDistUpgrade(skipIntrepid, url, develVersion); if (show || develVersion) { KToolBar* tool = toolBar(); tool->insertButton(QString("2uparrow"), 12345, SIGNAL(released()), this, SLOT(releaseUpgrade()), true, i18n("Version Upgrade")); ---- adept-2.1.3ubuntu25/adept/kubuntu_upgrader/upgradewizard.h 2007-09-18 20:07:08.000000000 +0100 -+++ adept-2.1.3ubuntu25/adept/kubuntu_upgrader/upgradewizard.h 2008-10-08 16:34:43.000000000 +0100 -@@ -56,7 +56,7 @@ - ~UpgradeWizard(); - - /*$PUBLIC_FUNCTIONS$*/ -- bool checkForDistUpgrade(QString url=QString(""), bool developmentVersion = false); -+ bool checkForDistUpgrade(bool skipIntrepid=true, QString url=QString(""), bool developmentVersion = false); - QPtrList *parseMetafile( QTextIStream *text_stream, - QString my_distro_name ); - ---- adept-2.1.3ubuntu25/adept/kubuntu_upgrader/upgradewizard.cpp 2008-10-08 17:21:21.000000000 +0100 -+++ adept-2.1.3ubuntu25/adept/kubuntu_upgrader/upgradewizard.cpp 2008-10-08 17:17:34.000000000 +0100 +--- adept-2.1.3ubuntu25.1/adept/manager/app.h 2009-09-30 23:59:33.000000000 +0100 ++++ adept-2.1.3ubuntu25.1/adept/manager/app.h 2009-09-30 23:48:15.000000000 +0100 +@@ -39,7 +39,7 @@ + ExtTerminalInterface *terminal(); + TestApp(); + #ifdef KUBUNTU +- void addVersionUpgrade(QString url, bool develVersion=false); ++ void addVersionUpgrade(QString url, bool develVersion=false, bool skipIntrepid=false); + #endif + protected slots: + void delayed(); // initialisation +--- adept-2.1.3ubuntu25.1/adept/kubuntu_upgrader/upgradewizard.cpp 2009-09-30 23:59:39.000000000 +0100 ++++ adept-2.1.3ubuntu25.1/adept/kubuntu_upgrader/upgradewizard.cpp 2009-09-30 23:48:59.000000000 +0100 @@ -142,7 +142,7 @@ } } @@ -48,7 +70,7 @@ - upgrade_available = true; - //std::cout << "entry date: " << (*entry->name_field).latin1() << std::endl; - break; -+ if (!skipIntrepid || QString::compare(*entry->dist_field, QString("intrepid")) != 0) { ++ if ( !skipIntrepid || (QString::compare(*entry->dist_field, QString("intrepid")) != 0 && QString::compare(*entry->dist_field, QString("jaunty")) != 0) ) { + upgrade_dist = entry; + upgrade_available = true; + //std::cout << "entry date: " << (*entry->name_field).latin1() << std::endl; @@ -57,3 +79,14 @@ } } // if there isn't one newer, find the current one +--- adept-2.1.3ubuntu25.1/adept/kubuntu_upgrader/upgradewizard.h 2009-09-30 23:59:39.000000000 +0100 ++++ adept-2.1.3ubuntu25.1/adept/kubuntu_upgrader/upgradewizard.h 2009-09-30 23:47:03.000000000 +0100 +@@ -56,7 +56,7 @@ + ~UpgradeWizard(); + + /*$PUBLIC_FUNCTIONS$*/ +- bool checkForDistUpgrade(QString url=QString(""), bool developmentVersion = false); ++ bool checkForDistUpgrade(bool skipIntrepid=true, QString url=QString(""), bool developmentVersion = false); + QPtrList *parseMetafile( QTextIStream *text_stream, + QString my_distro_name ); +