diff --git a/debian.changelog b/debian.changelog index 94daad2..81ee809 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,13 @@ +fritzing (0.6.2b-4) stable; urgency=low + + * Fix fritzing-fix-app-folder.patch to apply cleanly for all packages + + -- Thomas Zimmermann Fri, 29 Jul 2011 13:25:00 +0200 +fritzing (0.6.2b-3) stable; urgency=low + + * Add patch to fix the search path for shared data + + -- Thomas Zimmermann Thu, 28 Jul 2011 23:11:30 +0200 fritzing (0.6.2b-2) stable; urgency=low * Add parts, manpage and desktop link to package diff --git a/debian.install b/debian.install index c240ecb..7ec7448 100644 --- a/debian.install +++ b/debian.install @@ -2,6 +2,6 @@ fritzing /usr/bin bins /usr/share/fritzing sketches /usr/share/fritzing parts /usr/share/fritzing -resources/images/fritzing_icon.png /usr/share/pixmaps +resources/images/fritzing_icon.png /usr/share/icons fritzing.1 /usr/share/man/man1 fritzing.desktop /usr/share/applications diff --git a/debian.series b/debian.series new file mode 100644 index 0000000..98f4ff8 --- /dev/null +++ b/debian.series @@ -0,0 +1 @@ +fritzing-fix-app-folder.patch -p1 diff --git a/fritzing-fix-app-folder.patch b/fritzing-fix-app-folder.patch index 1c4b619..3b9a92a 100644 --- a/fritzing-fix-app-folder.patch +++ b/fritzing-fix-app-folder.patch @@ -1,22 +1,21 @@ -Index: src/utils/folderutils.cpp -=================================================================== ---- src/utils/folderutils.cpp.orig -+++ src/utils/folderutils.cpp -@@ -153,11 +153,14 @@ const QString FolderUtils::libraryPath() - } - - const QString FolderUtils::applicationDirPath() { -- if (m_appPath.isEmpty()) { -- return QCoreApplication::applicationDirPath(); -+ if (!m_appPath.isEmpty()) { -+ return m_appPath; - } - -- return m_appPath; -+ QDir dir("/usr/share/fritzing"); -+ if (dir.exists()) return dir.path(); -+ -+ return QCoreApplication::applicationDirPath(); - } - - bool FolderUtils::setApplicationPath2(const QString & path) +diff -Nurd fritzing.2011.07.11.source.orig//src/utils/folderutils.cpp fritzing.2011.07.11.source/src/utils/folderutils.cpp +--- fritzing.2011.07.11.source.orig//src/utils/folderutils.cpp 2011-07-11 17:50:17.000000000 +0200 ++++ fritzing.2011.07.11.source/src/utils/folderutils.cpp 2011-07-29 11:06:55.000000000 +0200 +@@ -154,11 +154,14 @@ + } + + const QString FolderUtils::applicationDirPath() { +- if (m_appPath.isEmpty()) { +- return QCoreApplication::applicationDirPath(); ++ if (!m_appPath.isEmpty()) { ++ return m_appPath; + } + +- return m_appPath; ++ QDir dir("/usr/share/fritzing"); ++ if (dir.exists()) return dir.path(); ++ ++ return QCoreApplication::applicationDirPath(); + } + + bool FolderUtils::setApplicationPath2(const QString & path) diff --git a/fritzing.changes b/fritzing.changes index 3888129..381009a 100644 --- a/fritzing.changes +++ b/fritzing.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 28 21:09:30 UTC 2011 - bugs@vdm-design.de + +- updated to 0.6.2b +- add packages for ubuntu and fedora + ------------------------------------------------------------------- Mon May 30 12:20:56 UTC 2011 - prusnak@opensuse.org diff --git a/fritzing.spec b/fritzing.spec index e40afae..226e9d8 100644 --- a/fritzing.spec +++ b/fritzing.spec @@ -16,7 +16,7 @@ Source1: fritzing.desktop Source2: fritzing.1 # Fedora-specific patch to relocate shared data for system-wide install; # will require a more thorough approach from the Fritzing team eventually. -#Patch0: fritzing-fix-app-folder.patch +Patch0: fritzing-fix-app-folder.patch BuildRequires: desktop-file-utils BuildRequires: libqt4-devel %if 0%{?fedora} @@ -34,9 +34,8 @@ prototypes, and to create a PCB layout for manufacturing. %prep %setup -q -n %{name}.%{snap}.source -sed -i "s|getUserDataStorePath("bins")|getUserDataStorePath("%{_datadir}/%{name}/bins")|" src/fapplication.cpp sed -i 's/\r//' README.txt -#%patch0 +%patch0 -p1 %build %if 0%{?mandriva_version}