diff options
10 files changed, 11 insertions, 95 deletions
diff --git a/README.GIT b/README.GIT index 7399e65c5..a9bbb5d29 100644 --- a/README.GIT +++ b/README.GIT @@ -1,7 +1,7 @@ ============================================================ DOCUMENTATION ======================================================= -GIT tutorial on kernel.org: -http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html +GIT tutorial on github: +http://schacon.github.com/git/gittutorial.html GIT "cheat sheet" http://jonas.nitro.dk/git/quick-reference.html diff --git a/debian/lenny/libraries/libkdcraw/debian/control b/debian/lenny/libraries/libkdcraw/debian/control index aa86aa433..8d6386338 100644 --- a/debian/lenny/libraries/libkdcraw/debian/control +++ b/debian/lenny/libraries/libkdcraw/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org> Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, - liblcms1-dev, libjpeg62-dev, pkg-config, + liblcms1-dev, libjpeg-dev, pkg-config, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.install b/debian/lenny/tdebase/debian/khelpcenter-trinity.install index eff975b5d..f2fe725b2 100644 --- a/debian/lenny/tdebase/debian/khelpcenter-trinity.install +++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.install @@ -205,7 +205,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict7.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict8.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict9.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/welcome.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/whatiskde.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/whatistde.docbook debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/khelpcenter.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khelpcenter.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/khelpcenter.png diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install index 540e8059a..773979ca7 100644 --- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install +++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install @@ -1013,35 +1013,7 @@ debian/tmp/opt/trinity/share/services/searchproviders/whatis.desktop debian/tmp/opt/trinity/share/services/searchproviders/wikipedia.desktop debian/tmp/opt/trinity/share/services/searchproviders/wiktionary.desktop debian/tmp/opt/trinity/share/services/searchproviders/wordref.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/firefox10oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/firefox15oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/googlebot.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie401onwinnt4.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie45onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie501onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie50onppc.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie55onwin98.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie55onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie60oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie60onwinnt51.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/lynxoncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent12.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent16.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozonwin2000.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozonwinxp.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn301oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn475oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn475onwin95.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn476onppc.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ns71oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ns71onwinnt51.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/op403onwinnt4.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/op75oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/safari20.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/safari12.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/w3moncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/wgetoncurrent.desktop +debian/tmp/opt/trinity/share/services/useragentstrings/*.desktop debian/tmp/opt/trinity/share/servicetypes/searchprovider.desktop debian/tmp/opt/trinity/share/servicetypes/uasprovider.desktop debian/tmp/opt/trinity/share/sounds/KDE_Beep_Ahem.wav diff --git a/debian/squeeze/libraries/libkdcraw/debian/control b/debian/squeeze/libraries/libkdcraw/debian/control index aa86aa433..8d6386338 100644 --- a/debian/squeeze/libraries/libkdcraw/debian/control +++ b/debian/squeeze/libraries/libkdcraw/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org> Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, - liblcms1-dev, libjpeg62-dev, pkg-config, + liblcms1-dev, libjpeg-dev, pkg-config, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/debian/squeeze/tdebase/debian/khelpcenter-trinity.install b/debian/squeeze/tdebase/debian/khelpcenter-trinity.install index eff975b5d..f2fe725b2 100644 --- a/debian/squeeze/tdebase/debian/khelpcenter-trinity.install +++ b/debian/squeeze/tdebase/debian/khelpcenter-trinity.install @@ -205,7 +205,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict7.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict8.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict9.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/welcome.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/whatiskde.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/whatistde.docbook debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/khelpcenter.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khelpcenter.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/khelpcenter.png diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install index 540e8059a..773979ca7 100644 --- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install +++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install @@ -1013,35 +1013,7 @@ debian/tmp/opt/trinity/share/services/searchproviders/whatis.desktop debian/tmp/opt/trinity/share/services/searchproviders/wikipedia.desktop debian/tmp/opt/trinity/share/services/searchproviders/wiktionary.desktop debian/tmp/opt/trinity/share/services/searchproviders/wordref.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/firefox10oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/firefox15oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/googlebot.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie401onwinnt4.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie45onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie501onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie50onppc.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie55onwin98.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie55onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie60oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie60onwinnt51.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/lynxoncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent12.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent16.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozonwin2000.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozonwinxp.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn301oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn475oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn475onwin95.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn476onppc.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ns71oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ns71onwinnt51.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/op403onwinnt4.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/op75oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/safari20.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/safari12.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/w3moncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/wgetoncurrent.desktop +debian/tmp/opt/trinity/share/services/useragentstrings/*.desktop debian/tmp/opt/trinity/share/servicetypes/searchprovider.desktop debian/tmp/opt/trinity/share/servicetypes/uasprovider.desktop debian/tmp/opt/trinity/share/sounds/KDE_Beep_Ahem.wav diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control b/ubuntu/maverick/libraries/libkdcraw/debian/control index aa86aa433..8d6386338 100644 --- a/ubuntu/maverick/libraries/libkdcraw/debian/control +++ b/ubuntu/maverick/libraries/libkdcraw/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org> Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, - liblcms1-dev, libjpeg62-dev, pkg-config, + liblcms1-dev, libjpeg-dev, pkg-config, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install index eff975b5d..f2fe725b2 100644 --- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install +++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install @@ -205,7 +205,7 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict7.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict8.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict9.png debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/welcome.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/whatiskde.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/whatistde.docbook debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/khelpcenter.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khelpcenter.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/khelpcenter.png diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index 540e8059a..773979ca7 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -1013,35 +1013,7 @@ debian/tmp/opt/trinity/share/services/searchproviders/whatis.desktop debian/tmp/opt/trinity/share/services/searchproviders/wikipedia.desktop debian/tmp/opt/trinity/share/services/searchproviders/wiktionary.desktop debian/tmp/opt/trinity/share/services/searchproviders/wordref.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/firefox10oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/firefox15oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/googlebot.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie401onwinnt4.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie45onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie501onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie50onppc.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie55onwin98.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie55onwinnt5.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie60oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ie60onwinnt51.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/lynxoncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent12.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent16.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozoncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozonwin2000.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/mozonwinxp.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn301oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn475oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn475onwin95.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/nn476onppc.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ns71oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/ns71onwinnt51.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/op403onwinnt4.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/op75oncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/safari20.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/safari12.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/w3moncurrent.desktop -debian/tmp/opt/trinity/share/services/useragentstrings/wgetoncurrent.desktop +debian/tmp/opt/trinity/share/services/useragentstrings/*.desktop debian/tmp/opt/trinity/share/servicetypes/searchprovider.desktop debian/tmp/opt/trinity/share/servicetypes/uasprovider.desktop debian/tmp/opt/trinity/share/sounds/KDE_Beep_Ahem.wav |