diff options
| author |   Martin von Gagern <Martin.vGagern@gmx.net> | 2010-10-08 17:56:39 +0200 |
|---|---|---|
| committer | Martin von Gagern <Martin.vGagern@gmx.net> | 2010-10-08 17:56:39 +0200 |
| commit | 3f6a67893b755a5b7ca3b27fb3764478e9ecab44 (patch) | |
| tree | 348481d30cb223e73deabbac177205fdf302265c /Documentation | |
| parent | [app-text/poppler] Update from main portage tree (diff) | |
| download | kde-sunset-3f6a67893b755a5b7ca3b27fb3764478e9ecab44.tar.gz kde-sunset-3f6a67893b755a5b7ca3b27fb3764478e9ecab44.tar.bz2 kde-sunset-3f6a67893b755a5b7ca3b27fb3764478e9ecab44.zip | |
Improved import scripts.
Generate_unmask wasn't called before, as diff exited with nonzero status ans
we have set -e in the scripts. Handing the correct changes to git was some
trouble as well. This should make importing poppler and avahi even easier.
Diffstat (limited to 'Documentation')
| -rwxr-xr-x | Documentation/maintainers/import_avahi | 11 | ||||
| -rwxr-xr-x | Documentation/maintainers/import_poppler | 11 | ||||
| -rw-r--r-- | Documentation/package.unmask/kde-3.5 | 3 |
3 files changed, 21 insertions, 4 deletions
diff --git a/Documentation/maintainers/import_avahi b/Documentation/maintainers/import_avahi index 6058ac4b..bb289c98 100755 --- a/Documentation/maintainers/import_avahi +++ b/Documentation/maintainers/import_avahi @@ -7,6 +7,7 @@ set -e cd "$(dirname "$0")"/../.. # Clone avahi dir from main portage tree +pre=( net-dns/avahi/*.ebuild ) rm -r net-dns/avahi cp -r "${PORTDIR:-/usr/portage}/net-dns/avahi" net-dns/ @@ -24,5 +25,13 @@ done # Redigest and show difference ebuild $(ls -1 net-dns/avahi/*.ebuild | tail -n1) digest -diff -ur "${PORTDIR:-/usr/portage}/net-dns/avahi" net-dns/avahi +diff -ur "${PORTDIR:-/usr/portage}/net-dns/avahi" net-dns/avahi || true Documentation/maintainers/generate_unmask + +git add net-dns/avahi/{*.ebuild,ChangeLog,Manifest} \ + Documentation/package.unmask/kde-3.5 +for old in "${pre[@]}"; do + test -e "${old}" || git rm "${old}" +done +git status +echo 'Run: git commit -m "[net-dns/avahi] Update from main portage tree"' diff --git a/Documentation/maintainers/import_poppler b/Documentation/maintainers/import_poppler index 87d045b1..100aefbf 100755 --- a/Documentation/maintainers/import_poppler +++ b/Documentation/maintainers/import_poppler @@ -4,6 +4,7 @@ set -e cd "$(dirname "$0")"/../.. # Clone poppler dir from main portage tree +pre=( app-text/poppler/*.ebuild ) rm -r app-text/poppler cp -r "${PORTDIR:-/usr/portage}/app-text/poppler" app-text/ @@ -22,5 +23,13 @@ done # Redigest and show difference ebuild $(ls -1 app-text/poppler/*.ebuild | tail -n1) digest -diff -ur "${PORTDIR:-/usr/portage}/app-text/poppler" app-text/poppler +diff -ur "${PORTDIR:-/usr/portage}/app-text/poppler" app-text/poppler || true Documentation/maintainers/generate_unmask + +git add app-text/poppler/{*.ebuild,ChangeLog,Manifest} \ + Documentation/package.unmask/kde-3.5 +for old in "${pre[@]}"; do + test -e "${old}" || git rm "${old}" +done +git status +echo 'Run: git commit -m "[app-text/poppler] Update from main portage tree"' diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5 index 90361ec6..9848739e 100644 --- a/Documentation/package.unmask/kde-3.5 +++ b/Documentation/package.unmask/kde-3.5 @@ -63,9 +63,8 @@ =app-text/kbarcode-2.0.7 =app-text/kchmviewer-3.1_p2-r1 =app-text/kding-0.4.3 -=app-text/poppler-0.12.4-r3 =app-text/poppler-0.14.1 -=app-text/poppler-0.14.3 +=app-text/poppler-0.14.4 =dev-db/hk_classes-0.8.3 =dev-db/hk_classes-0.8.3-r1 =dev-db/knoda-0.8.3 |