diff --git a/debian.changelog b/debian.changelog index 76f0eb9..849abdc 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,9 @@ +fritzing (0.6.4b-0) stable; urgency=low + + * new upstream release 0.6.4b + + -- Thomas Zimmermann Fri, 16 Dec 2011 23:00:00 +0100 + fritzing (0.6.3b-0) stable; urgency=low * new upstream release 0.6.3b diff --git a/debian.install b/debian.install index 9ebdf22..659ae61 100644 --- a/debian.install +++ b/debian.install @@ -1,9 +1,9 @@ -fritzing /usr/bin +Fritzing /usr/bin bins /usr/share/fritzing sketches /usr/share/fritzing parts /usr/share/fritzing resources/images/fritzing_icon.png /usr/share/icons -fritzing.1 /usr/share/man/man1 +Fritzing.1 /usr/share/man/man1 fritzing.desktop /usr/share/applications translations/*.qm /usr/share/fritzing/translations translations/syntax /usr/share/fritzing/translations diff --git a/debian.rules b/debian.rules index 7656045..e1deb24 100644 --- a/debian.rules +++ b/debian.rules @@ -2,9 +2,3 @@ export DH_VERBOSE=1 %: dh $@ - -override_dh_install: - mv Fritzing fritzing - mv /usr/src/packages/SOURCES/fritzing.1 . - mv /usr/src/packages/SOURCES/fritzing.desktop . - dh_install diff --git a/fritzing-0.6.4b.source.tar.bz2 b/fritzing-0.6.4b.source.tar.bz2 new file mode 100644 index 0000000..214ff7e --- /dev/null +++ b/fritzing-0.6.4b.source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b29ec4125becefe67801ec1c4ce1d8f2868c5f0c5cbb1cedfdff4e15c52ff5e2 +size 10770761 diff --git a/fritzing.0.6.3.source.tar.bz2 b/fritzing.0.6.3.source.tar.bz2 deleted file mode 100644 index 6ad78c1..0000000 --- a/fritzing.0.6.3.source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09437ac6a464338066e8ea1068e53ca1881c10255faed0d0d18b7e020d95e804 -size 8572608 diff --git a/fritzing.1 b/fritzing.1 deleted file mode 100644 index 2f22414..0000000 --- a/fritzing.1 +++ /dev/null @@ -1,17 +0,0 @@ -.TH FRITZING 1 "October 03, 2010" "Fritzing" - -.SH NAME -fritzing \- from prototype to product -.SH SYNOPSIS -.B fritzing -.SH DESCRIPTION -.PP -Fritzing is an open-source initiative to support designers, artists, researchers -and hobbyists to work creatively with interactive electronics. We are creating a -software and website in the spirit of Processing and Arduino, developing a tool -that allows users to document their prototypes, share them with others, teach -electronics in a classroom, and to create a pcb layout for professional -manufacturing. -.SH AUTHOR -This manual page was written by Enrique Hernández Bello , -for the Debian project (and may be used by others). diff --git a/fritzing.changes b/fritzing.changes index 17b98e3..9574103 100644 --- a/fritzing.changes +++ b/fritzing.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 16 22:1:36 UTC 2011 - bugs@vdm-design.de + +- update to new upstream version 0.6.4b +- remove files that were included upstream + ------------------------------------------------------------------- Fri Aug 19 18:05:00 UTC 2011 - bugs@vdm-design.de diff --git a/fritzing.desktop b/fritzing.desktop deleted file mode 100644 index f9c50b4..0000000 --- a/fritzing.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Fritzing -GenericName=Fritzing -Comment=Electronic Design Automation software -Exec=fritzing -Icon=fritzing -Terminal=false -Type=Application -Categories=Development;IDE;Electronics; -X-SuSE-translate=false diff --git a/fritzing.dsc b/fritzing.dsc index 4b399d8..3b161ca 100644 --- a/fritzing.dsc +++ b/fritzing.dsc @@ -1,10 +1,10 @@ Format: 1.0 Source: fritzing -Version: 0.6.3b +Version: 0.6.4b 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.3b.orig.tar.gz - 050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.3b.diff.gz + 050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.4b.orig.tar.gz + 050878262fa170f0dfbd92ef9b3da973 10789952 fritzing_0.6.4b.diff.gz diff --git a/fritzing.spec b/fritzing.spec index abaf322..41c2382 100644 --- a/fritzing.spec +++ b/fritzing.spec @@ -1,20 +1,14 @@ # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define vers 0.6.3 -%define snap 2011.08.18 - Name: fritzing -Version: 0.6.3b +Version: 0.6.4b 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}.%{vers}.source.tar.bz2 -Source1: fritzing.desktop -Source2: fritzing.1 +Group: Productivity/Scientific/Electronics +Source0: http://fritzing.org/download/%{version}/source-tarball/%{name}-%{version}.source.tar.bz2 Requires: libqt4-sql-sqlite libqt4-x11 BuildRequires: desktop-file-utils BuildRequires: libqt4-devel @@ -35,8 +29,9 @@ allows users to document their Arduino and other electronic-based prototypes, and to create a PCB layout for manufacturing. %prep -%setup -q -n %{name}.%{snap}.source -sed -i 's/\r//' README.txt +%setup -q -n %{name}-%{version}.source +sed -i 's/\r$//' README.txt +sed -i 's/\r$//' LICENSE.CC-BY-SA %build %if 0%{?mandriva_version} || 0%{?centos_version} @@ -51,24 +46,12 @@ qmake make %{?_smp_mflags} %install -%if 0%{?mandriva_version} || 0%{?sles_version} -%{__make} install -%else -%make_install -%endif -install -D -m 0755 Fritzing %{buildroot}%{_bindir}/fritzing -install -d %{buildroot}%{_datadir}/%{name} -cp -pr sketches %{buildroot}%{_datadir}/%{name} -cp -pr parts %{buildroot}%{_datadir}/%{name} -cp -pr bins %{buildroot}%{_datadir}/%{name} -cp -pr translations %{buildroot}%{_datadir}/%{name} -rm %{buildroot}%{_datadir}/%{name}/translations/*.ts -find %{buildroot}%{_datadir}/%{name}/translations -name "*.qm" -size -128c -delete -find %{buildroot}%{_datadir}/%{name} -type f -exec chmod 644 {} \; -find %{buildroot}%{_datadir}/%{name} -type d -exec chmod 755 {} \; -install -D -m 0644 resources/images/fritzing_icon.png %{buildroot}%{_datadir}/pixmaps/fritzing.png -install -D -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/fritzing.1 -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} +make INSTALL_ROOT=%{buildroot} install +install -d %{buildroot}%{_datadir}/pixmaps/ +mv %{buildroot}%{_datadir}/icons/fritzing.png %{buildroot}%{_datadir}/pixmaps/ +desktop-file-install --dir=%{buildroot}%{_datadir}/applications fritzing.desktop +find %{buildroot}%{_datadir}/%{name}/parts -name *.svg -exec chmod -x {} \; +find %{buildroot}%{_datadir}/%{name}/parts -name *.fzp -exec chmod -x {} \; %clean rm -rf %{buildroot} @@ -76,10 +59,10 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README.txt LICENSE.GPL2 LICENSE.GPL3 LICENSE.CC-BY-SA -%{_bindir}/%{name} +%{_bindir}/Fritzing %{_datadir}/%{name}/ -%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_mandir}/man1/%{name}.* +%{_datadir}/applications/fritzing.desktop +%{_mandir}/man1/Fritzing.* -%changelog +%changelog \ No newline at end of file