summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Xu <[email protected]>2011-08-20 19:01:43 -0400
committerRobert Xu <[email protected]>2011-08-20 19:01:43 -0400
commit15f0f9d002ddecf5cc794a7a5bdd78a971b31ee6 (patch)
tree4206f1a1e76cab4491b6edfd9a1f04c3dad9ed36
parentb6376fdf63c961e5157cdb12b181ec39153372b7 (diff)
downloadtde-packaging-15f0f9d002ddecf5cc794a7a5bdd78a971b31ee6.tar.gz
tde-packaging-15f0f9d002ddecf5cc794a7a5bdd78a971b31ee6.zip
new arts tarball with fix not yet in SVN; removed tqtinterface subpkg; revised README.GIT
-rw-r--r--README.GIT42
-rw-r--r--opensuse/arts/arts-1.5.10.tar.bz2bin768744 -> 787583 bytes
-rw-r--r--opensuse/libtqt4/libtqt4.changes6
-rw-r--r--opensuse/libtqt4/libtqt4.spec26
4 files changed, 52 insertions, 22 deletions
diff --git a/README.GIT b/README.GIT
index 654f2f990..65c5312e3 100644
--- a/README.GIT
+++ b/README.GIT
@@ -1,15 +1,25 @@
-(if this doesn't belong at the root of tde-packaging, feel free to move it to
-opensuse/ for reference.)
+============================================================ DOCUMENTATION =======================================================
+
+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:
- git clone <repository URL>
+ git clone http://[email protected]/scm/git/<repository name>
To exclude items:
Create a file '.gitignore'
To add to the git repository (easiest and most efficient way):
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!):
git commit -a
@@ -39,3 +49,27 @@ To tag a commit WITH GPG verification (secure release anyone?):
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://[email protected]/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
+
diff --git a/opensuse/arts/arts-1.5.10.tar.bz2 b/opensuse/arts/arts-1.5.10.tar.bz2
index 3c05e242b..a772aa04a 100644
--- a/opensuse/arts/arts-1.5.10.tar.bz2
+++ b/opensuse/arts/arts-1.5.10.tar.bz2
Binary files differ
diff --git a/opensuse/libtqt4/libtqt4.changes b/opensuse/libtqt4/libtqt4.changes
index ac4f69c99..f27210b31 100644
--- a/opensuse/libtqt4/libtqt4.changes
+++ b/opensuse/libtqt4/libtqt4.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sat Aug 20 22:47:41 UTC 2011 - [email protected]
+
+- remove the tqtinterface subpackage: it belongs in -devel
+- add a shebang to convert_qt_tqt1
+
+-------------------------------------------------------------------
Thu Aug 11 02:59:00 UTC 2011 - [email protected]
- initial creation libtqt4
diff --git a/opensuse/libtqt4/libtqt4.spec b/opensuse/libtqt4/libtqt4.spec
index d567e5e2e..9108235bc 100644
--- a/opensuse/libtqt4/libtqt4.spec
+++ b/opensuse/libtqt4/libtqt4.spec
@@ -87,21 +87,6 @@ Authors:
    Serghei Amelian <[email protected]>
-%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 <[email protected]>
-    Robert Xu <[email protected]>
-    Tim Williams <[email protected]>
-    Serghei Amelian <[email protected]>
-
-
%prep
%setup -qn tqtinterface-%{version}
@@ -144,6 +129,14 @@ rm -rf %{buildroot}/%{_libdir}/*.la
# What is this? Leftovers?!
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
rm -rf $RPM_BUILD_ROOT
@@ -164,9 +157,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/tqt.pc
%{_libdir}/libtqt.so
%{_libdir}/libtqassistantclient.so
-
-%files -n tqtinterface
-%defattr(-,root,root,755)
%{_bindir}/convert_qt_tqt1
%{_bindir}/convert_qt_tqt2
%{_bindir}/convert_qt_tqt3