------------------------------------------------------------
revno: 2227
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2010-12-06 11:48:04 +0100
message:
remove scripts/install-upstream-changelogs again, NEWS is sufficient
removed:
scripts/install-upstream-changelogs
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-06 10:27:43 +0000
+++ b/changelog 2010-12-06 10:48:04 +0000
@@ -22,11 +22,9 @@
- remove libwpd 0.9 conditional, now 0.9 is needed as 0.8 support is gone
- add explicit --prefix=/usr
* debian/control.postgresql.in: bump depends to 3.3
- * debian/rules, debian/scripts/install-upstream-changelogs: properly install
- the various upstream changelogs
* debian/control.in: remove Breaks on -sdbc-postgresql again
- -- Rene Engelhard <r...@debian.org> Wed, 01 Dec 2010 19:33:55 +0100
+ -- Rene Engelhard <r...@debian.org> Mon, 06 Dec 2010 11:29:46 +0100
libreoffice (1:3.3.0~beta3-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-12-06 10:27:59 +0000
+++ b/rules 2010-12-06 10:48:04 +0000
@@ -1956,7 +1956,6 @@
for FILE in debian/scripts/move-if-change \
debian/scripts/cleandupes \
debian/scripts/get_libebook_dep.sh \
- debian/scripts/install-upstream-changelogs \
$(OOO_BUILD_TREE)/configure \
$(OOO_BUILD_TREE)/bin/[a-z]* \
$(OOO_BUILD_TREE)/bin/piece/[a-z]*; \
@@ -3614,11 +3613,6 @@
done; \
done
dh_installchangelogs -s -k
-ifeq "$(SOURCE_TARBALLS)" "y"
- for i in pkg in $(ARCH_DEP_PACKAGES) ; do \
- debian/scripts/install-upstream-changelogs $$pkg
$(OOO_BUILD_TARBALL_VERSION)
- done
-endif
dh_installmime -s
dh_installmenu -s
ifeq "$(BUILD_JARS_NATIVE)" "y"
@@ -3841,11 +3835,6 @@
fi; \
done
dh_installchangelogs -i -k
-ifeq "$(SOURCE_TARBALLS)" "y"
- for i in pkg in $(ARCH_INDEP_PACKAGES) ; do \
- debian/scripts/install-upstream-changelogs $$pkg
$(OOO_BUILD_TARBALL_VERSION)
- done
-endif
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
=== removed file 'scripts/install-upstream-changelogs'
--- a/scripts/install-upstream-changelogs 2010-11-28 17:30:21 +0000
+++ b/scripts/install-upstream-changelogs 1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-pkg=$1
-v=$2
-
-for m in artwork base bootstrap calc components extensions extras \
- filters help impress l10n libs-core libs-extern libs-extern-sys \
- libs-gui postprocess sdk testing ure writer; do \
- if echo $pkg | grep -q $m; then
- if [ "$m" = "l10n" -o "$m" = "help" ]; then
- continue;
- fi
- install_cls="$m"
- fi
- if echo $pkg | grep -q l10n; then
- install_cls="$install_cls l10n"
- fi
- if echo $pkg | grep -q help; then
- install_cls="$install_cls help"
- fi
- if echo $pkg | grep -q style; then
- install_cls="$install_cls artwork"
- fi
- if [ "$pkg" = "libreoffice-common" -o "$pkg" = "libreoffice-core" ];
then
- install_cls="$install_cls components"
- fi
- if [ "$pkg" = "libreoffice-common" ]; then
- install_cls="$install_cls extras"
- fi
- if [ "$pkg" = "libreoffice-common" -o "$pkg" = "libreoffice-core" ] || \
- echo "$pkg" | grep -q filter; then
- install_cls="$install_cls filters"
- fi
- if [ "$pkg" = "libreoffice-core" ]; then
- install_cls="$install_cls libs-core libs-extern libs-extern-sys
libs-gui"
- fi
- if [ "$pkg" = "libreoffice-dev" -o "$pkg" = "libreoffice-dev-doc" ];
then
- install_cls="$install_cls sdk"
- fi
- if [ "$pkg" = "python-uno" ] || [ "$pkg" = "uno-libs3" ]; then
- install_cls="$install_cls ure"
- fi
- if [ "$pkg" = "libreoffice-officebean" ]; then
- install_cls="$install_cls components"
- fi
- if [ "$pkg" = "mozilla-libreoffice" ]; then
- install_cls="$install_cls components"
- fi
- if [ "$pkg" = "libreoffice-ogltrans" ]; then
- install_cls="$install_cls impress"
- fi
- if [ "$pkg" = "libreoffice-wiki-publisher" -o \
- "$pkg" = "libreoffice-report-builder" -o \
- "$pkg" = "libreoffice-report-builder-bin" -o \
- "$pkg" = "libreoffice-presentation-minimizer" -o \
- "$pkg" = "libreoffice-presenter-console" -o \
- "$pkg" = "libreoffice-pdfimport" -o \
- "$pkg" = "libreoffice-mysql-connector" ]; then
- install_cls="$install_cls extensions"
- fi
- if [ "$pkg" = "ttf-opensymbol" ]; then
- install_cls="$install_cls extras"
- fi
- if [ "$pkg" = "libreoffice-gtk" -o "$pkg" = "libreoffice-kde" ]; then
- install_cls="$install_cls libs-gui"
- fi
- if [ "$pkg" = "libreoffice-gnome" -o "$pkg" = "libreoffice-kab" -o \
- "$pkg" = "libreoffice-evolution" ]; then
- install_cls="$install_cls libs-core"
- fi
-
- for c in $install_cls; do
- # we need to extract them from the tarball as we can't use them
- # from the tree. Due to the path the same it only gets the last
- # one unpacked there.
- tar xfvj sources/libreoffice-$m-$v.tar.bz2 \
- libreoffice-$m-$v/ChangeLog
- mkdir -p debian/$pkg/usr/share/doc/$pkg
- install -m644 libreoffice-$m-$v/ChangeLog \
- debian/$pkg/usr/share/doc/$pkg/changelog.$m
- rm -rf libreoffice-$m-$v
- done
-done
