From d2c33cd5b15b36b3bec14704c575911a24c5ac3275b8796441dfd65bee605216 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 19 Aug 2011 18:31:53 +0000 Subject: [PATCH] Accepting request 79363 from home:Heinervdm:branches:Education Update to upstream version 0.6.3b The patches are no langer needed as similar patches went upstream OBS-URL: https://build.opensuse.org/request/show/79363 OBS-URL: https://build.opensuse.org/package/show/Education/fritzing?expand=0&rev=6 --- debian.changelog | 5 +++++ debian.series | 2 -- fritzing-fix-app-folder.patch | 21 --------------------- fritzing.0.6.3.source.tar.bz2 | 3 +++ fritzing.2011.07.11.source.tar.bz2 | 3 --- fritzing.changes | 4 ++++ fritzing.dsc | 6 +++--- fritzing.spec | 13 ++++--------- remove-unused-qt47-includes.patch | 12 ------------ 9 files changed, 19 insertions(+), 50 deletions(-) delete mode 100644 debian.series delete mode 100644 fritzing-fix-app-folder.patch create mode 100644 fritzing.0.6.3.source.tar.bz2 delete mode 100644 fritzing.2011.07.11.source.tar.bz2 delete mode 100644 remove-unused-qt47-includes.patch diff --git a/debian.changelog b/debian.changelog index 77ee22f..76f0eb9 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,8 @@ +fritzing (0.6.3b-0) stable; urgency=low + + * new upstream release 0.6.3b + + -- Thomas Zimmermann Fri, 19 Aug 2011 16:07:00 +0200 fritzing (0.6.2b-6) stable; urgency=low * Add translations diff --git a/debian.series b/debian.series deleted file mode 100644 index 2fe55b8..0000000 --- a/debian.series +++ /dev/null @@ -1,2 +0,0 @@ -fritzing-fix-app-folder.patch -p1 -remove-unused-qt47-includes.patch -p1 diff --git a/fritzing-fix-app-folder.patch b/fritzing-fix-app-folder.patch deleted file mode 100644 index 3b9a92a..0000000 --- a/fritzing-fix-app-folder.patch +++ /dev/null @@ -1,21 +0,0 @@ -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.0.6.3.source.tar.bz2 b/fritzing.0.6.3.source.tar.bz2 new file mode 100644 index 0000000..6ad78c1 --- /dev/null +++ b/fritzing.0.6.3.source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09437ac6a464338066e8ea1068e53ca1881c10255faed0d0d18b7e020d95e804 +size 8572608 diff --git a/fritzing.2011.07.11.source.tar.bz2 b/fritzing.2011.07.11.source.tar.bz2 deleted file mode 100644 index fc3b240..0000000 --- a/fritzing.2011.07.11.source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b02e81f510292eb07444f0e7cbae1a01018aedb2a4820381a0f30c7780226c17 -size 8326886 diff --git a/fritzing.changes b/fritzing.changes index eb645ae..17b98e3 100644 --- a/fritzing.changes +++ b/fritzing.changes @@ -1,4 +1,8 @@ ------------------------------------------------------------------- +Fri Aug 19 18:05:00 UTC 2011 - bugs@vdm-design.de + +- update to new upstream version 0.6.3b +------------------------------------------------------------------- Mon Aug 01 19:04:00 UTC 2011 - bugs@vdm-design.de - add translations diff --git a/fritzing.dsc b/fritzing.dsc index 7270b22..4b399d8 100644 --- a/fritzing.dsc +++ b/fritzing.dsc @@ -1,10 +1,10 @@ Format: 1.0 Source: fritzing -Version: 0.6.2b +Version: 0.6.3b Binary: fritzing Maintainer: Brendan Howell Architecture: any Build-Depends: debhelper (>= 7.0.12), libqtcore4, libqtgui4, libstdc++6, libc6, qt4-qmake, libqt4-dev, zlib1g-dev, libqt4-sql-sqlite Files: - 050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.2b.orig.tar.gz - 050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.2b.diff.gz + 050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.3b.orig.tar.gz + 050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.3b.diff.gz diff --git a/fritzing.spec b/fritzing.spec index 4936607..abaf322 100644 --- a/fritzing.spec +++ b/fritzing.spec @@ -2,22 +2,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define snap 2011.07.11 +%define vers 0.6.3 +%define snap 2011.08.18 Name: fritzing -Version: 0.6.2b +Version: 0.6.3b Release: 0 License: GPLv3+ Summary: Intuitive EDA platform featuring from prototype to product Url: http://fritzing.org/ Group: Applications/Engineering -Source0: http://fritzing.org/download/%{version}/source-tarball/%{name}.%{snap}.source.tar.bz2 +Source0: http://fritzing.org/download/%{version}/source-tarball/%{name}.%{vers}.source.tar.bz2 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 -Patch1: remove-unused-qt47-includes.patch Requires: libqt4-sql-sqlite libqt4-x11 BuildRequires: desktop-file-utils BuildRequires: libqt4-devel @@ -40,8 +37,6 @@ prototypes, and to create a PCB layout for manufacturing. %prep %setup -q -n %{name}.%{snap}.source sed -i 's/\r//' README.txt -%patch0 -p1 -%patch1 -p1 %build %if 0%{?mandriva_version} || 0%{?centos_version} diff --git a/remove-unused-qt47-includes.patch b/remove-unused-qt47-includes.patch deleted file mode 100644 index b502057..0000000 --- a/remove-unused-qt47-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurd fritzing.2011.07.11.source.orig//src/autoroute/cmrouter/cmrouter.cpp fritzing.2011.07.11.source/src/autoroute/cmrouter/cmrouter.cpp ---- fritzing.2011.07.11.source.orig//src/autoroute/cmrouter/cmrouter.cpp 2011-07-11 17:50:17.000000000 +0200 -+++ fritzing.2011.07.11.source/src/autoroute/cmrouter/cmrouter.cpp 2011-08-01 07:41:49.170492537 +0200 -@@ -107,7 +107,7 @@ - #include - #include - #include --#include -+//#include - #include - #include -