new arts tarball with fix not yet in SVN; removed tqtinterface subpkg; revised README.GIT

v3.5.13-sru
Robert Xu 13 years ago
parent b6376fdf63
commit 15f0f9d002

@ -1,15 +1,25 @@
(if this doesn't belong at the root of tde-packaging, feel free to move it to ============================================================ DOCUMENTATION =======================================================
opensuse/ for reference.)
GIT tutorial on kernel.org:
http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
GIT "cheat sheet"
http://jonas.nitro.dk/git/quick-reference.html
GIT for those who are used to centralized SCMs:
http://media.pragprog.com/titles/tsgit/chap-005-extract.html
================================================================ HOWTO ===========================================================
To get a copy of the repo: To get a copy of the repo:
git clone <repository URL> git clone http://your-username@scm.trinitydesktop.org/scm/git/<repository name>
To exclude items: To exclude items:
Create a file '.gitignore' Create a file '.gitignore'
To add to the git repository (easiest and most efficient way): To add to the git repository (easiest and most efficient way):
git add . git add .
(this will add everything in the folder (excluding stuff from .gitignore).) (this will add everything in the folder (excluding stuff from .gitignore). It is intentionally a period because * will make git ignore already committed files.)
To commit to the git repository (this does not send to the remote server!): To commit to the git repository (this does not send to the remote server!):
git commit -a git commit -a
@ -39,3 +49,27 @@ To tag a commit WITH GPG verification (secure release anyone?):
git tag -s <version> -m <message> git tag -s <version> -m <message>
================================================================= NOTE ============================================================
GIT cannot store empty directories due to a intentional design limitation.
Therefore, this command should be run prior to any commits to ensure your empty directories stick around:
find . -type d -empty -exec touch {}/.gitignore \;
This will add a .gitignore to every empty directory.
================================================================ WORKFLOW ==========================================================
git clone http://your-username@scm.trinitydesktop.org/scm/git/<repository>
<make your changes, test, etc>
cd <repository checkout directory>
find . -type d -empty -exec touch {}/.gitignore \;
git add .
git commit -a
git pull
git push

Binary file not shown.

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Aug 20 22:47:41 UTC 2011 - rxu@lincomlinux.org
- remove the tqtinterface subpackage: it belongs in -devel
- add a shebang to convert_qt_tqt1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 11 02:59:00 UTC 2011 - rxu@lincomlinux.org Thu Aug 11 02:59:00 UTC 2011 - rxu@lincomlinux.org

@ -87,21 +87,6 @@ Authors:
    Serghei Amelian <serghei@thel.ro>     Serghei Amelian <serghei@thel.ro>
%package -n tqtinterface
Summary: Tools to help with TQt
Group: Graphical Desktop/TDE
%description -n tqtinterface
This package contains Trinity specific window options and commands.
It includes tools to help you modify and use TQtinterface.
Authors:
--------
Timothy Pearson <kb9vqf@pearsoncomputing.net>
    Robert Xu <rxu@lincomlinux.org>
    Tim Williams <tim@my-place.org.uk>
    Serghei Amelian <serghei@thel.ro>
%prep %prep
%setup -qn tqtinterface-%{version} %setup -qn tqtinterface-%{version}
@ -144,6 +129,14 @@ rm -rf %{buildroot}/%{_libdir}/*.la
# What is this? Leftovers?! # What is this? Leftovers?!
rm -rf %{buildroot}/%{_libdir}/debug rm -rf %{buildroot}/%{_libdir}/debug
# Shebang, please.
echo "#!/bin/bash" > %{buildroot}%{_bindir}/convert_qt_tqt1.new
cat %{buildroot}%{_bindir}/convert_qt_tqt1 >> %{buildroot}%{_bindir}/convert_qt_tqt1.new
rm -f %{buildroot}%{_bindir}/convert_qt_tqt1
mv -v %{buildroot}%{_bindir}/convert_qt_tqt1.new %{buildroot}%{_bindir}/convert_qt_tqt1
chmod +x %{buildroot}%{_bindir}/convert_qt_tqt1
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -164,9 +157,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/tqt.pc %{_libdir}/pkgconfig/tqt.pc
%{_libdir}/libtqt.so %{_libdir}/libtqt.so
%{_libdir}/libtqassistantclient.so %{_libdir}/libtqassistantclient.so
%files -n tqtinterface
%defattr(-,root,root,755)
%{_bindir}/convert_qt_tqt1 %{_bindir}/convert_qt_tqt1
%{_bindir}/convert_qt_tqt2 %{_bindir}/convert_qt_tqt2
%{_bindir}/convert_qt_tqt3 %{_bindir}/convert_qt_tqt3

Loading…
Cancel
Save