[fritzing] Updated to new upstream release (0.7.1b).

Ed Marshall logic at fedoraproject.org
Sun Mar 11 08:54:06 UTC 2012


commit b066884722fec6ec5bb98f7e93ee7f986469155d
Author: Ed Marshall <esm at logic.net>
Date:   Sun Mar 11 00:53:42 2012 -0800

    Updated to new upstream release (0.7.1b).

 .gitignore                        |    1 +
 fritzing-disable-autoupdate.patch |   62 ++++++++++++++++++------------------
 fritzing.spec                     |    6 ++-
 sources                           |    2 +-
 4 files changed, 37 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb4afe7..820b39f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /fritzing-0.6.4b.source.tar.bz2
 /fritzing-0.6.5b.source.tar.bz2
 /fritzing-0.7.0b.source.tar.bz2
+/fritzing-0.7.1b.source.tar.bz2
diff --git a/fritzing-disable-autoupdate.patch b/fritzing-disable-autoupdate.patch
index 79d92db..da6b7c2 100644
--- a/fritzing-disable-autoupdate.patch
+++ b/fritzing-disable-autoupdate.patch
@@ -1,7 +1,7 @@
-diff -urP fritzing-0.7.0b.source.orig/src/fapplication.cpp fritzing-0.7.0b.source/src/fapplication.cpp
---- fritzing-0.7.0b.source.orig/src/fapplication.cpp	2012-02-03 12:19:35.000000000 -0800
-+++ fritzing-0.7.0b.source/src/fapplication.cpp	2012-02-03 17:40:15.540068716 -0800
-@@ -750,10 +750,6 @@
+diff -urP fritzing-0.7.1b.source.orig/src/fapplication.cpp fritzing-0.7.1b.source/src/fapplication.cpp
+--- fritzing-0.7.1b.source.orig/src/fapplication.cpp	2012-03-10 07:09:14.000000000 -0800
++++ fritzing-0.7.1b.source/src/fapplication.cpp	2012-03-10 23:55:35.017018480 -0800
+@@ -762,10 +762,6 @@
  	if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, 0.825);
  	ProcessEventBlocker::processEvents();
  
@@ -12,7 +12,7 @@ diff -urP fritzing-0.7.0b.source.orig/src/fapplication.cpp fritzing-0.7.0b.sourc
  	if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, 0.875);
  
  	loadSomething(firstRun, prevVersion);
-@@ -951,57 +947,6 @@
+@@ -963,57 +959,6 @@
          ViewLayer::ViewLayerID viewLayerID;
  };
  
@@ -70,9 +70,9 @@ diff -urP fritzing-0.7.0b.source.orig/src/fapplication.cpp fritzing-0.7.0b.sourc
  void FApplication::createUserDataStoreFolderStructure() {
  	// make sure that the folder structure for parts and bins, exists
  	QString userDataStorePath = FolderUtils::getUserDataStorePath();
-diff -urP fritzing-0.7.0b.source.orig/src/fapplication.h fritzing-0.7.0b.source/src/fapplication.h
---- fritzing-0.7.0b.source.orig/src/fapplication.h	2012-02-03 12:19:35.000000000 -0800
-+++ fritzing-0.7.0b.source/src/fapplication.h	2012-02-03 17:40:15.540068716 -0800
+diff -urP fritzing-0.7.1b.source.orig/src/fapplication.h fritzing-0.7.1b.source/src/fapplication.h
+--- fritzing-0.7.1b.source.orig/src/fapplication.h	2012-03-10 07:09:14.000000000 -0800
++++ fritzing-0.7.1b.source/src/fapplication.h	2012-03-10 23:55:35.018018458 -0800
 @@ -64,9 +64,6 @@
  
  public slots:
@@ -83,10 +83,10 @@ diff -urP fritzing-0.7.0b.source.orig/src/fapplication.h fritzing-0.7.0b.source/
  	void createUserDataStoreFolderStructure();
  	void changeActivation(bool activate, QWidget * originator);
  	void updateActivation();
-diff -urP fritzing-0.7.0b.source.orig/src/mainwindow.cpp fritzing-0.7.0b.source/src/mainwindow.cpp
---- fritzing-0.7.0b.source.orig/src/mainwindow.cpp	2012-02-03 12:19:35.000000000 -0800
-+++ fritzing-0.7.0b.source/src/mainwindow.cpp	2012-02-03 17:40:53.161862774 -0800
-@@ -123,7 +123,6 @@
+diff -urP fritzing-0.7.1b.source.orig/src/mainwindow.cpp fritzing-0.7.1b.source/src/mainwindow.cpp
+--- fritzing-0.7.1b.source.orig/src/mainwindow.cpp	2012-03-10 07:09:14.000000000 -0800
++++ fritzing-0.7.1b.source/src/mainwindow.cpp	2012-03-10 23:58:33.173816017 -0800
+@@ -166,7 +166,6 @@
  	m_windowMenuSeparator = NULL;
  	m_wireColorMenu = NULL;
  	m_viewSwitcherDock = NULL;
@@ -94,7 +94,7 @@ diff -urP fritzing-0.7.0b.source.orig/src/mainwindow.cpp fritzing-0.7.0b.source/
  	m_fileProgressDialog = NULL;
  	m_currentGraphicsView = NULL;
  	m_comboboxChanged = false;
-@@ -1694,13 +1693,6 @@
+@@ -1757,13 +1756,6 @@
  	m_showInViewHelpAct->setChecked(show);
  }
  
@@ -105,13 +105,13 @@ diff -urP fritzing-0.7.0b.source.orig/src/mainwindow.cpp fritzing-0.7.0b.source/
 -	}
 -}
 -
- void MainWindow::swapSelectedMap(const QString & family, const QString & prop, QMap<QString, QString> & currPropsMap, ItemBase * itemBase) 
+ 
+ void MainWindow::swapSelectedDelay(const QString & family, const QString & prop, QMap<QString, QString> & currPropsMap, ItemBase * itemBase) 
  {
- 	if (itemBase == NULL) return;
-diff -urP fritzing-0.7.0b.source.orig/src/mainwindow.h fritzing-0.7.0b.source/src/mainwindow.h
---- fritzing-0.7.0b.source.orig/src/mainwindow.h	2012-02-03 12:19:30.000000000 -0800
-+++ fritzing-0.7.0b.source/src/mainwindow.h	2012-02-03 17:42:26.071882893 -0800
-@@ -73,7 +73,6 @@
+diff -urP fritzing-0.7.1b.source.orig/src/mainwindow.h fritzing-0.7.1b.source/src/mainwindow.h
+--- fritzing-0.7.1b.source.orig/src/mainwindow.h	2012-03-10 07:09:09.000000000 -0800
++++ fritzing-0.7.1b.source/src/mainwindow.h	2012-03-10 23:55:35.020018428 -0800
+@@ -93,7 +93,6 @@
  	QSizeGrip *sizeGrip();
  	QStatusBar *realStatusBar();
  	void showAllFirstTimeHelp(bool show);
@@ -119,7 +119,7 @@ diff -urP fritzing-0.7.0b.source.orig/src/mainwindow.h fritzing-0.7.0b.source/sr
  
  	class PartsEditorMainWindow* getPartsEditor(ModelPart *modelPart, long id, ItemBase * fromItem, class PartsBinPaletteWidget* requester);
  	ModelPart *loadPartFromFile(const QString& newPartPath, bool connectorsChanged=false);
-@@ -639,7 +638,6 @@
+@@ -669,7 +668,6 @@
      QAction *m_partsRefAct;
      QAction *m_showInViewHelpAct;;
      QAction *m_visitFritzingDotOrgAct;
@@ -127,10 +127,10 @@ diff -urP fritzing-0.7.0b.source.orig/src/mainwindow.h fritzing-0.7.0b.source/sr
      QAction *m_aboutQtAct;
      QAction *m_reportBugAct;
  	QAction *m_enableDebugAct;
-diff -urP fritzing-0.7.0b.source.orig/src/mainwindow_menu.cpp fritzing-0.7.0b.source/src/mainwindow_menu.cpp
---- fritzing-0.7.0b.source.orig/src/mainwindow_menu.cpp	2012-02-03 12:19:35.000000000 -0800
-+++ fritzing-0.7.0b.source/src/mainwindow_menu.cpp	2012-02-03 17:40:15.543068719 -0800
-@@ -937,10 +937,6 @@
+diff -urP fritzing-0.7.1b.source.orig/src/mainwindow_menu.cpp fritzing-0.7.1b.source/src/mainwindow_menu.cpp
+--- fritzing-0.7.1b.source.orig/src/mainwindow_menu.cpp	2012-03-10 07:09:14.000000000 -0800
++++ fritzing-0.7.1b.source/src/mainwindow_menu.cpp	2012-03-10 23:55:35.022018373 -0800
+@@ -938,10 +938,6 @@
  	m_visitFritzingDotOrgAct->setStatusTip(tr("www.fritzing.org"));
  	connect(m_visitFritzingDotOrgAct, SIGNAL(triggered(bool)), this, SLOT(visitFritzingDotOrg()));*/
  
@@ -141,7 +141,7 @@ diff -urP fritzing-0.7.0b.source.orig/src/mainwindow_menu.cpp fritzing-0.7.0b.so
  	m_aboutAct = new QAction(tr("&About"), this);
  	m_aboutAct->setStatusTip(tr("Show the application's about box"));
  	connect(m_aboutAct, SIGNAL(triggered()), this, SLOT(about()));
-@@ -1177,7 +1173,6 @@
+@@ -1180,7 +1176,6 @@
      m_helpMenu->addAction(m_examplesAct);
      m_helpMenu->addAction(m_partsRefAct);
  	m_helpMenu->addSeparator();
@@ -149,18 +149,18 @@ diff -urP fritzing-0.7.0b.source.orig/src/mainwindow_menu.cpp fritzing-0.7.0b.so
  	m_helpMenu->addAction(m_importFilesFromPrevInstallAct);
  	m_helpMenu->addSeparator();
  	m_helpMenu->addAction(m_reportBugAct);
-diff -urP fritzing-0.7.0b.source.orig/translations/fritzing_de.ts fritzing-0.7.0b.source/translations/fritzing_de.ts
---- fritzing-0.7.0b.source.orig/translations/fritzing_de.ts	2012-02-03 12:19:36.000000000 -0800
-+++ fritzing-0.7.0b.source/translations/fritzing_de.ts	2012-02-03 17:42:46.750219710 -0800
-@@ -3214,11 +3214,6 @@
+diff -urP fritzing-0.7.1b.source.orig/translations/fritzing_de.ts fritzing-0.7.1b.source/translations/fritzing_de.ts
+--- fritzing-0.7.1b.source.orig/translations/fritzing_de.ts	2012-03-10 23:55:24.377324371 -0800
++++ fritzing-0.7.1b.source/translations/fritzing_de.ts	2012-03-10 23:59:04.140396287 -0800
+@@ -3280,11 +3280,6 @@
          <translation>Notiz hinzufügen</translation>
      </message>
      <message>
--        <location filename="../src/mainwindow_menu.cpp" line="911"/>
+-        <location filename="../src/mainwindow_menu.cpp" line="940"/>
 -        <source>Check for updates...</source>
 -        <translation>Nach Updates suchen...</translation>
 -    </message>
 -    <message>
-         <location filename="../src/mainwindow_menu.cpp" line="912"/>
+         <location filename="../src/mainwindow_menu.cpp" line="941"/>
          <source>Check whether a newer version of Fritzing is available for download</source>
          <translation>Überprüfen, ob eine neuere Fritzing-Version zum Download bereit steht</translation>
diff --git a/fritzing.spec b/fritzing.spec
index ffa2882..5a1397d 100644
--- a/fritzing.spec
+++ b/fritzing.spec
@@ -1,6 +1,5 @@
-
 Name:           fritzing
-Version:        0.7.0b
+Version:        0.7.1b
 Release:        1%{?dist}
 Summary:        Electronic Design Automation software; from prototype to product
 
@@ -73,6 +72,9 @@ rm -rf %{buildroot}
 %{_mandir}/man?/*
 
 %changelog
+* Sat Mar 10 2012 Ed Marshall <esm at logic.net> - 0.7.1b-1
+- Updated to 0.7.1b release.
+
 * Fri Feb  3 2012 Ed Marshall <esm at logic.net> - 0.7.0b-1
 - Add Droid font requirement.
 - Updated to 0.7.0b release.
diff --git a/sources b/sources
index 2081838..01fb53b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f4433db7d17b59aa46f3abcf8aaee45  fritzing-0.7.0b.source.tar.bz2
+4f62d9f95439028bcc0bb7efad5d6780  fritzing-0.7.1b.source.tar.bz2


More information about the scm-commits mailing list