rev 17673 - in kde-extras/kile/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Fri Apr 16 09:59:36 UTC 2010
Author: fabo
Date: 2010-04-16 09:59:28 +0000 (Fri, 16 Apr 2010)
New Revision: 17673
Added:
kde-extras/kile/trunk/debian/patches/00_root_document_not_detected_kde_bug_233667.diff
kde-extras/kile/trunk/debian/patches/03_mime_install_dir.diff
Modified:
kde-extras/kile/trunk/debian/changelog
kde-extras/kile/trunk/debian/control
kde-extras/kile/trunk/debian/kile.install
kde-extras/kile/trunk/debian/patches/01_install_doc.diff
kde-extras/kile/trunk/debian/patches/kubuntu_02_disable_embedded_kbibtex.diff
kde-extras/kile/trunk/debian/patches/series
Log:
* New upstream release 2.1 beta 4 - svn 1112278. (Closes: #578021)
* Add 03_mime_install_dir.diff patch: fix mime install dir. (Closes: #572462)
* Add 00_root_document_not_detected_kde_bug_233667.diff patch:
Document not detected as Latex root document when opening project.
Modified: kde-extras/kile/trunk/debian/changelog
===================================================================
--- kde-extras/kile/trunk/debian/changelog 2010-04-15 22:44:10 UTC (rev 17672)
+++ kde-extras/kile/trunk/debian/changelog 2010-04-16 09:59:28 UTC (rev 17673)
@@ -1,3 +1,12 @@
+kile (1:2.1.0~svn1112278beta4-1) unstable; urgency=low
+
+ * New upstream release 2.1 beta 4 - svn 1112278. (Closes: #578021)
+ * Add 03_mime_install_dir.diff patch: fix mime install dir. (Closes: #572462)
+ * Add 00_root_document_not_detected_kde_bug_233667.diff patch:
+ Document not detected as Latex root document when opening project.
+
+ -- Fathi Boudra <fabo at debian.org> Fri, 16 Apr 2010 12:08:37 +0300
+
kile (1:2.1.0~svn1055250beta3-1) unstable; urgency=low
* New upstream release 2.1 beta 3 - svn r1055250. (Closes: #566240)
Modified: kde-extras/kile/trunk/debian/control
===================================================================
--- kde-extras/kile/trunk/debian/control 2010-04-15 22:44:10 UTC (rev 17672)
+++ kde-extras/kile/trunk/debian/control 2010-04-16 09:59:28 UTC (rev 17673)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7.4.13), cmake, pkg-kde-tools (>= 0.6.1),
+Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.4),
kdelibs5-dev (>= 4:4.3.4)
Standards-Version: 3.8.4
Homepage: http://kile.sourceforge.net
Modified: kde-extras/kile/trunk/debian/kile.install
===================================================================
--- kde-extras/kile/trunk/debian/kile.install 2010-04-15 22:44:10 UTC (rev 17672)
+++ kde-extras/kile/trunk/debian/kile.install 2010-04-16 09:59:28 UTC (rev 17673)
@@ -6,4 +6,4 @@
usr/share/kde4/apps/kconf_update
usr/share/kde4/apps/kile
usr/share/kde4/config.kcfg/kile.kcfg
-usr/share/mimelink/text/x-kilepr.desktop
+usr/share/mimelnk/text/x-kilepr.desktop
Added: kde-extras/kile/trunk/debian/patches/00_root_document_not_detected_kde_bug_233667.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/00_root_document_not_detected_kde_bug_233667.diff (rev 0)
+++ kde-extras/kile/trunk/debian/patches/00_root_document_not_detected_kde_bug_233667.diff 2010-04-16 09:59:28 UTC (rev 17673)
@@ -0,0 +1,297 @@
+--- a/src/kiledocmanager.cpp
++++ b/src/kiledocmanager.cpp
+@@ -1,6 +1,6 @@
+ /*****************************************************************************
+ * Copyright (C) 2004 by Jeroen Wijnhout (Jeroen.Wijnhout at kdemail.net) *
+-* (C) 2006-2010 by Michel Ludwig (michel.ludwig at kdemail.net) *
++* (C) 2006-2009 by Michel Ludwig (michel.ludwig at kdemail.net) *
+ * (C) 2007 by Holger Danielsson (holger.danielsson at versanet.de) *
+ ******************************************************************************/
+
+@@ -469,7 +469,7 @@ void Manager::recreateTextDocumentInfo(T
+
+ removeTextDocumentInfo(oldinfo);
+
+- emit(updateStructure(false, newinfo));
++ emit(updateStructure(true, newinfo));
+ }
+
+ bool Manager::removeTextDocumentInfo(TextInfo *docinfo, bool closingproject /* = false */)
+@@ -605,6 +605,7 @@ KTextEditor::View* Manager::loadText(Kil
+ KTextEditor::Document *doc = createDocument(url, docinfo, encoding, mode, highlight);
+
+ m_ki->structureWidget()->clean(docinfo);
++ m_ki->structureWidget()->update(docinfo, true);
+
+ if(!text.isEmpty()) {
+ doc->setText(text);
+@@ -831,6 +832,11 @@ void Manager::newDocumentStatus(KTextEdi
+ m_ki->texKonsole()->sync();
+
+ emit(documentModificationStatusChanged(doc, doc->isModified(), KTextEditor::ModificationInterface::OnDiskUnmodified));
++
++ //updatestructure if active document changed from modified to unmodified (typically after a save)
++ if (!doc->isModified()) {
++ emit(updateStructure(true, textInfoFor(doc)));
++ }
+ }
+
+ bool Manager::fileSaveAll(bool amAutoSaving, bool disUntitled)
+@@ -925,7 +931,7 @@ bool Manager::fileSaveAll(bool amAutoSav
+ This may look superfluos but actually it is not, in the case of multiple modified docs it ensures that the structure view keeps synchronized with the currentTextView
+ And if we only have one masterdoc or none nothing goes wrong.
+ */
+- emit(updateStructure(false, NULL));
++ emit(updateStructure(false,NULL));
+ m_currentlySavingAll = false;
+ return !oneSaveFailed;
+ }
+@@ -967,7 +973,7 @@ void Manager::fileOpen(const KUrl& url,
+ item->loadDocumentAndViewSettings();
+ }
+
+- emit(updateStructure(false, NULL));
++ emit(updateStructure(true, 0L));
+ emit(updateModeStatus());
+ // update undefined references in this file
+ emit(updateReferences(textInfoFor(realurl.toLocalFile())));
+@@ -989,7 +995,6 @@ bool Manager::fileSave(KTextEditor::View
+ }
+ else {
+ bool ret = view->document()->documentSave();
+- emit(updateStructure(false, textInfoFor(view->document())));
+ return ret;
+ }
+ }
+@@ -1270,7 +1275,7 @@ void Manager::projectNew()
+ mapItem(docinfo, item);
+
+ //docinfo->updateStruct(m_kwStructure->level());
+- emit(updateStructure(false, docinfo));
++ emit(updateStructure(true, docinfo));
+ }
+ }
+
+@@ -1502,7 +1507,7 @@ KileProject* Manager::projectOpen(const
+ kp->buildProjectTree();
+ addProject(kp);
+
+- emit(updateStructure(false, NULL));
++ emit(updateStructure(false, 0L));
+ emit(updateModeStatus());
+ // update undefined references in all project files
+ updateProjectReferences(kp);
+@@ -2155,7 +2160,7 @@ void Manager::projectAddFile(QString fil
+
+ //ok, we have a project and an existing file
+ KILE_DEBUG() << "\tadd file: " << filename;
+- m_ki->viewManager()->updateStructure(false);
++ m_ki->viewManager()->updateStructure(true);
+
+ KUrl url;
+ url.setPath(filename);
+--- a/src/documentinfo.cpp
++++ b/src/documentinfo.cpp
+@@ -2,7 +2,7 @@
+ begin : Sun Jul 20 2003
+ copyright : (C) 2003 by Jeroen Wijnhout (Jeroen.Wijnhout at kdemail.net)
+ (C) 2005-2007 by Holger Danielsson (holger.danielsson at versanet.de)
+- (C) 2006-2010 by Michel Ludwig (michel.ludwig at kdemail.net)
++ (C) 2006-2009 by Michel Ludwig (michel.ludwig at kdemail.net)
+ *********************************************************************************************/
+
+ /***************************************************************************
+@@ -169,11 +169,7 @@ KUrl Info::makeValidTeXURL(const KUrl& u
+ return newURL;
+ }
+
+-Info::Info() :
+- m_bIsRoot(false),
+- m_dirty(false),
+- m_config(KGlobal::config().data()),
+- documentTypePromotionAllowed(true)
++Info::Info() : m_bIsRoot(false), m_config(KGlobal::config().data()), documentTypePromotionAllowed(true)
+ {
+ updateStructLevelInfo();
+ }
+@@ -237,17 +233,6 @@ void Info::setDocumentTypePromotionAllow
+ documentTypePromotionAllowed = b;
+ }
+
+-bool Info::isDirty() const
+-{
+- return m_dirty;
+-}
+-
+-void Info::setDirty(bool b)
+-{
+-KILE_DEBUG() << b;
+- m_dirty = b;
+-}
+-
+ KUrl Info::url()
+ {
+ return KUrl();
+@@ -406,7 +391,6 @@ void Info::updateBibItems()
+
+ void Info::slotCompleted()
+ {
+- setDirty(true);
+ emit completed(this);
+ }
+
+@@ -476,7 +460,6 @@ void TextInfo::setDocument(KTextEditor::
+ connect(m_doc, SIGNAL(documentNameChanged(KTextEditor::Document*)), this, SLOT(slotFileNameChanged()));
+ connect(m_doc, SIGNAL(documentUrlChanged(KTextEditor::Document*)), this, SLOT(slotFileNameChanged()));
+ connect(m_doc, SIGNAL(completed()), this, SLOT(slotCompleted()));
+- connect(m_doc, SIGNAL(modifiedChanged(KTextEditor::Document*)), this, SLOT(makeDirtyIfModified()));
+ // this could be a KatePart bug, and as "work-around" we manually set the highlighting mode again
+ connect(m_doc, SIGNAL(completed()), this, SLOT(activateDefaultMode()));
+ setMode(m_defaultMode);
+@@ -497,13 +480,6 @@ void TextInfo::detach()
+ m_doc = NULL;
+ }
+
+-void TextInfo::makeDirtyIfModified()
+-{
+- if(m_doc && m_doc->isModified()) {
+- setDirty(true);
+- }
+-}
+-
+ const long* TextInfo::getStatistics(KTextEditor::View *view)
+ {
+ /* [0] = #c in words, [1] = #c in latex commands and environments,
+@@ -1360,7 +1336,6 @@ void LaTeXInfo::updateStruct()
+ emit(doneUpdating());
+ emit(isrootChanged(isLaTeXRoot()));
+ emit(parsingCompleted());
+- setDirty(false);
+ }
+
+ void LaTeXInfo::checkChangedDeps()
+@@ -1471,7 +1446,6 @@ void BibInfo::updateStruct()
+ }
+ emit(parsingCompleted());
+ emit(doneUpdating());
+- setDirty(false);
+ }
+
+ Type BibInfo::getType()
+--- a/src/widgets/structurewidget.cpp
++++ b/src/widgets/structurewidget.cpp
+@@ -2,7 +2,7 @@
+ begin : Sun Dec 28 2003
+ copyright : (C) 2003 by Jeroen Wijnhout (Jeroen.Wijnhout at kdemail.net
+ 2005-2007 by Holger Danielsson (holger.danielsson at versanet.de)
+- 2008-2010 by Michel Ludwig (michel.ludwig at kdemail.net)
++ 2008 by Michel Ludwig (michel.ludwig at kdemail.net)
+ *************************************************************************************************/
+
+ /***************************************************************************
+@@ -948,10 +948,10 @@ void StructureViewItem::setLabel(const Q
+
+ void StructureWidget::update(KileDocument::Info *docinfo)
+ {
+- update(docinfo, false);
++ update(docinfo, true);
+ }
+
+- void StructureWidget::update(KileDocument::Info *docinfo, bool forceParsing, bool activate /* =true */)
++ void StructureWidget::update(KileDocument::Info *docinfo, bool parse, bool activate /* =true */)
+ {
+ KILE_DEBUG() << "==KileWidget::StructureWidget::update(" << docinfo << ")=============";
+
+@@ -961,24 +961,18 @@ void StructureViewItem::setLabel(const Q
+ }
+
+ m_docinfo = docinfo;
+- bool needParsing = forceParsing || m_docinfo->isDirty() || !viewExistsFor(docinfo);
++
++ bool needParsing = parse || ( ! viewExistsFor(m_docinfo) );
+
+ //find structview-item for this docinfo
+ StructureView *view = viewFor(m_docinfo);
+- if(!view) {
+- m_default->activate();
+- return;
+- }
+
+ if(needParsing) { //need to reparse the doc
+ int xtop = view->horizontalScrollBar()->value();
+ int ytop = view->verticalScrollBar()->value();
+ //KILE_DEBUG() << "\tStructure::update parsing doc";
+- // avoid flickering when parsing
+- view->setUpdatesEnabled(false);
+ view->cleanUp();
+ m_docinfo->updateStruct();
+- view->setUpdatesEnabled(true);
+ view->showReferences(m_ki);
+ view->horizontalScrollBar()->setValue(xtop);
+ view->verticalScrollBar()->setValue(ytop);
+--- a/src/widgets/structurewidget.h
++++ b/src/widgets/structurewidget.h
+@@ -2,7 +2,7 @@
+ begin : Sun Dec 28 2003
+ copyright : (C) 2003 by Jeroen Wijnhout (Jeroen.Wijnhout at kdemail.net)
+ 2005-2007 by Holger Danielsson (holger.danielsson at versanet.de)
+- 2008-2010 by Michel Ludwig (michel.ludwig at kdemail.net)
++ 2008 by Michel Ludwig (michel.ludwig at kdemail.net)
+ **************************************************************************************************/
+
+ /***************************************************************************
+--- a/src/documentinfo.h
++++ b/src/documentinfo.h
+@@ -1,7 +1,7 @@
+ /*************************************************************************************
+ begin : Sun Jul 20 2003
+ copyright : (C) 2003 by Jeroen Wijnhout (Jeroen.Wijnhout at kdemail.net)
+- (C) 2006-2010 by Michel Ludwig (michel.ludwig at kdemail.net)
++ (C) 2006 by Michel Ludwig (michel.ludwig at kdemail.net)
+ *************************************************************************************/
+
+ /***************************************************************************
+@@ -159,12 +159,6 @@ public:
+ virtual bool isDocumentTypePromotionAllowed();
+ void setDocumentTypePromotionAllowed(bool b);
+
+- /**
+- * Returns true iff new parsing is required.
+- **/
+- bool isDirty() const;
+- void setDirty(bool b);
+-
+ public Q_SLOTS:
+ /**
+ * Never call this function directly, use KileWidget::Structure::update(KileDocument::Info *, bool) instead
+@@ -197,7 +191,6 @@ protected:
+ };
+
+ bool m_bIsRoot;
+- bool m_dirty;
+ QStringList m_labels;
+ QStringList m_bibItems;
+ QStringList m_deps, m_depsPrev;
+@@ -295,11 +288,8 @@ protected Q_SLOTS:
+ void slotViewDestroyed(QObject *object);
+ void activateDefaultMode();
+
+- void makeDirtyIfModified();
+-
+ protected:
+ KTextEditor::Document *m_doc;
+- bool m_dirty;
+ long *m_arStatistics;
+ QString m_defaultMode;
+ QHash<KTextEditor::View*, QList<QObject*> > m_eventFilterHash;
+--- a/src/kile.cpp
++++ b/src/kile.cpp
+@@ -1,7 +1,7 @@
+ /****************************************************************************************
+ begin : sam jui 13 09:50:06 CEST 2002
+ copyright : (C) 2003 by Jeroen Wijnhout (Jeroen.Wijnhout at kdemail.net)
+- (C) 2007-2010 by Michel Ludwig (michel.ludwig at kdemail.net)
++ (C) 2007-2009 by Michel Ludwig (michel.ludwig at kdemail.net)
+ (C) 2007 Holger Danielsson (holger.danielsson at versanet.de)
+ (C) 2009 Thomas Braun (thomas.braun at virtuell-zuhause.de)
+ ****************************************************************************************/
Modified: kde-extras/kile/trunk/debian/patches/01_install_doc.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/01_install_doc.diff 2010-04-15 22:44:10 UTC (rev 17672)
+++ kde-extras/kile/trunk/debian/patches/01_install_doc.diff 2010-04-16 09:59:28 UTC (rev 17673)
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -105,7 +105,8 @@ ENDIF( EXISTS ${kile_SOURCE_DIR}/doc OR
+@@ -104,7 +104,8 @@ ENDIF( EXISTS ${kile_SOURCE_DIR}/doc OR
IF( EXISTS ${kile_SOURCE_DIR}/doc )
IF( KDE4_MEINPROC_EXECUTABLE )
MESSAGE( STATUS "Building standard documentation")
Added: kde-extras/kile/trunk/debian/patches/03_mime_install_dir.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/03_mime_install_dir.diff (rev 0)
+++ kde-extras/kile/trunk/debian/patches/03_mime_install_dir.diff 2010-04-16 09:59:28 UTC (rev 17673)
@@ -0,0 +1,14 @@
+Description: fix typo and use MIME_INSTALL_DIR.
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@ ADD_SUBDIRECTORY( src )
+
+ ########### install files ###############
+
+-INSTALL( FILES x-kilepr.desktop DESTINATION share/mimelink/text )
++INSTALL( FILES x-kilepr.desktop DESTINATION ${MIME_INSTALL_DIR}/text )
+
+ INSTALL( FILES kile.upd kile1.6_upd.pl kile1.7_upd.pl kile1.9_upd.pl
+ kile1.9-1_upd.pl kile2.0-1_upd.pl kile2.0-2_upd.pl kile2.0-3_upd.pl
Modified: kde-extras/kile/trunk/debian/patches/kubuntu_02_disable_embedded_kbibtex.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/kubuntu_02_disable_embedded_kbibtex.diff 2010-04-15 22:44:10 UTC (rev 17672)
+++ kde-extras/kile/trunk/debian/patches/kubuntu_02_disable_embedded_kbibtex.diff 2010-04-16 09:59:28 UTC (rev 17673)
@@ -1,6 +1,6 @@
--- a/src/data/kilestdtools.rc
+++ b/src/data/kilestdtools.rc
-@@ -537,16 +537,6 @@ options='%source'
+@@ -531,16 +531,6 @@ options='%source'
from=bib
to=bib
Modified: kde-extras/kile/trunk/debian/patches/series
===================================================================
--- kde-extras/kile/trunk/debian/patches/series 2010-04-15 22:44:10 UTC (rev 17672)
+++ kde-extras/kile/trunk/debian/patches/series 2010-04-16 09:59:28 UTC (rev 17673)
@@ -1,4 +1,6 @@
+00_root_document_not_detected_kde_bug_233667.diff
01_install_doc.diff
02_tex_doc_location.diff
+03_mime_install_dir.diff
kubuntu_01_improved_viewpart_warning.diff
kubuntu_02_disable_embedded_kbibtex.diff
More information about the pkg-kde-commits
mailing list