./packages/openofficeorg/3.1.1/unstable r1848: migrate bug script installation to dh_bugfiles
------------------------------------------------------------
revno: 1848
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2010-02-03 00:10:41 +0100
message:
migrate bug script installation to dh_bugfiles
renamed:
broffice.org.control.bug => broffice.org.bug-control
openoffice.org-base.control.bug => openoffice.org-base.bug-control
openoffice.org-calc.control.bug => openoffice.org-calc.bug-control
openoffice.org-core.control.bug => openoffice.org-core.bug-control
openoffice.org-core.script.bug.in => openoffice.org-core.bug-script.in
openoffice.org-draw.control.bug => openoffice.org-draw.bug-control
openoffice.org-emailmerge.control.bug => openoffice.org-emailmerge.bug-control
openoffice.org-emailmerge.script.bug.in => openoffice.org-emailmerge.bug-script.in
openoffice.org-evolution.control.bug => openoffice.org-evolution.bug-control
openoffice.org-evolution.script.bug.in => openoffice.org-evolution.bug-script.in
openoffice.org-filter-binfilter.control.bug => openoffice.org-filter-binfilter.bug-control
openoffice.org-filter-binfilter.script.bug.in => openoffice.org-filter-binfilter.bug-script.in
openoffice.org-gcj.control.bug => openoffice.org-gcj.bug-control
openoffice.org-impress.control.bug => openoffice.org-impress.bug-control
openoffice.org-math.control.bug => openoffice.org-math.bug-control
openoffice.org-mysql-connector.script.bug.in => openoffice.org-mysql-connector.bug-script.in
openoffice.org-officebean.control.bug => openoffice.org-officebean.bug-control
openoffice.org-ogltrans.control.bug => openoffice.org-ogltrans.bug-control
openoffice.org-pdfimport.script.bug.in => openoffice.org-pdfimport.bug-script.in
openoffice.org-presentation-minimizer.script.bug.in => openoffice.org-presentation-minimizer.bug-script.in
openoffice.org-presenter-console.script.bug.in => openoffice.org-presenter-console.bug-script.in
openoffice.org-report-builder.control.bug => openoffice.org-report-builder.bug-control
openoffice.org-report-builder.script.bug.in => openoffice.org-report-builder.bug-script.in
openoffice.org-sdbc-postgresql.script.bug.in => openoffice.org-sdbc-postgresql.bug-script.in
openoffice.org-wiki-publisher.script.bug.in => openoffice.org-wiki-publisher.bug-script.in
openoffice.org-writer.control.bug => openoffice.org-writer.bug-control
openoffice.org.control.bug => openoffice.org.bug-control
presubj => bug-presubj
modified:
changelog
control
rules
=== renamed file 'broffice.org.control.bug' => 'broffice.org.bug-control'
=== renamed file 'presubj' => 'bug-presubj'
=== modified file 'changelog'
--- a/changelog 2010-02-02 10:26:50 +0000
+++ b/changelog 2010-02-02 23:10:41 +0000
@@ -11,6 +11,8 @@
- build without VERBOSE=true (normal) mode on all buildds now in a try
to mitigate buildd log size
- check whether .install/.dirs exist before trying to lowercase them
+ - move from manual installing of the bug files to dh_bugfiles, bump
+ debhelper builddep
* debian/shell-lib-{extensions,components}.sh: add echos instead of debconf
message on DEBIAN_FRONTEND = noninteractive so that people in that case also
know what goes on
@@ -24,8 +26,10 @@
rdbs" problem.
* debian/po: add updated de,po it.po, cs.po, es.po, zh_CN.po,
sv.po (closes: #568017), pt.po (closes: #568026), eu.po (closes: #568077)
+ * debian/*.control.bug, debian/*.script.bug.in, debian/presubj: move ...
+ * debian/*.bug-control, debian/*.bug-script.in, debian/bug-presubj: ... here
- -- Rene Engelhard <rene@debian.org> Mon, 01 Feb 2010 00:09:50 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Feb 2010 23:43:54 +0100
openoffice.org (1:3.1.1-14) unstable; urgency=medium
=== modified file 'control'
--- a/control 2010-01-28 16:10:31 +0000
+++ b/control 2010-02-02 23:10:41 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc s390 amd64 ppc64 s390x sparc] , gcj-jdk [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libflute-java-openof
fice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , xulrunner-dev [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libnss3-dev [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , dmak
e (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 amd64 ia64], mono-utils (>= 2.4.2.3) [i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , libr
df0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
7.2.3~) , openjdk-6-jdk [i386 powerpc s390 amd64 ppc64 s390x sparc] , gcj-jdk [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libflute-java-openof
fice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , xulrunner-dev [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libnss3-dev [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , dmak
e (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 amd64 ia64], mono-utils (>= 2.4.2.3) [i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , libr
df0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
=== renamed file 'openoffice.org-base.control.bug' => 'openoffice.org-base.bug-control'
=== renamed file 'openoffice.org-calc.control.bug' => 'openoffice.org-calc.bug-control'
=== renamed file 'openoffice.org-core.control.bug' => 'openoffice.org-core.bug-control'
=== renamed file 'openoffice.org-core.script.bug.in' => 'openoffice.org-core.bug-script.in'
=== renamed file 'openoffice.org-draw.control.bug' => 'openoffice.org-draw.bug-control'
=== renamed file 'openoffice.org-emailmerge.control.bug' => 'openoffice.org-emailmerge.bug-control'
=== renamed file 'openoffice.org-emailmerge.script.bug.in' => 'openoffice.org-emailmerge.bug-script.in'
=== renamed file 'openoffice.org-evolution.control.bug' => 'openoffice.org-evolution.bug-control'
=== renamed file 'openoffice.org-evolution.script.bug.in' => 'openoffice.org-evolution.bug-script.in'
=== renamed file 'openoffice.org-filter-binfilter.control.bug' => 'openoffice.org-filter-binfilter.bug-control'
=== renamed file 'openoffice.org-filter-binfilter.script.bug.in' => 'openoffice.org-filter-binfilter.bug-script.in'
=== renamed file 'openoffice.org-gcj.control.bug' => 'openoffice.org-gcj.bug-control'
=== renamed file 'openoffice.org-impress.control.bug' => 'openoffice.org-impress.bug-control'
=== renamed file 'openoffice.org-math.control.bug' => 'openoffice.org-math.bug-control'
=== renamed file 'openoffice.org-mysql-connector.script.bug.in' => 'openoffice.org-mysql-connector.bug-script.in'
=== renamed file 'openoffice.org-officebean.control.bug' => 'openoffice.org-officebean.bug-control'
=== renamed file 'openoffice.org-ogltrans.control.bug' => 'openoffice.org-ogltrans.bug-control'
=== renamed file 'openoffice.org-pdfimport.script.bug.in' => 'openoffice.org-pdfimport.bug-script.in'
=== renamed file 'openoffice.org-presentation-minimizer.script.bug.in' => 'openoffice.org-presentation-minimizer.bug-script.in'
=== renamed file 'openoffice.org-presenter-console.script.bug.in' => 'openoffice.org-presenter-console.bug-script.in'
=== renamed file 'openoffice.org-report-builder.control.bug' => 'openoffice.org-report-builder.bug-control'
=== renamed file 'openoffice.org-report-builder.script.bug.in' => 'openoffice.org-report-builder.bug-script.in'
=== renamed file 'openoffice.org-sdbc-postgresql.script.bug.in' => 'openoffice.org-sdbc-postgresql.bug-script.in'
=== renamed file 'openoffice.org-wiki-publisher.script.bug.in' => 'openoffice.org-wiki-publisher.bug-script.in'
=== renamed file 'openoffice.org-writer.control.bug' => 'openoffice.org-writer.bug-control'
=== renamed file 'openoffice.org.control.bug' => 'openoffice.org.bug-control'
=== modified file 'rules'
--- a/rules 2010-01-28 10:13:58 +0000
+++ b/rules 2010-02-02 23:10:41 +0000
@@ -609,7 +609,7 @@
BUILD_DEPS += , python
endif
- BUILD_DEPS += , debhelper (>= 6.0.7~)
+ BUILD_DEPS += , debhelper (>= 7.2.3~)
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
@@ -1355,7 +1355,7 @@
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/shlibs.override.stdlibs
- rm -f debian/*script.bug
+ rm -f debian/*.bug-script
rm -f debian/scripts/aotcompile.py*
ifeq "$(ENABLE_MONO)" "y"
@@ -2673,18 +2673,10 @@
for i in $(ARCH_DEP_PACKAGES); do \
- install -D -m644 debian/presubj \
- debian/$$i/usr/share/bug/$$i/presubj; \
- if [ -e debian/$$i.control.bug ]; then \
- install -D -m644 debian/$$i.control.bug \
- debian/$$i/usr/share/bug/$$i/control; \
- fi ;\
- if [ -e debian/$$i.script.bug.in ]; then \
- cat debian/$$i.script.bug.in \
+ if [ -e debian/$$i.bug-script.in ]; then \
+ cat debian/$$i.bug-script.in \
| sed -e "s/@PLATFORMID@/$(PLATFORMID)/" \
- > debian/$$i.script.bug && \
- install -D -m755 debian/$$i.script.bug \
- debian/$$i/usr/share/bug/$$i/script; \
+ > debian/$$i.bug-script; \
fi ;\
done
@@ -3112,18 +3104,10 @@
done
for i in $(ARCH_INDEP_PACKAGES); do \
- install -D -m644 debian/presubj \
- debian/$$i/usr/share/bug/$$i/presubj; \
- if [ -e debian/$$i.control.bug ]; then \
- install -D -m644 debian/$$i.control.bug \
- debian/$$i/usr/share/bug/$$i/control; \
- fi ;\
- if [ -e debian/$$i.script.bug.in ]; then \
- cat debian/$$i.script.bug.in \
+ if [ -e debian/$$i.bug-script.in ]; then \
+ cat debian/$$i.bug-script.in \
| sed -e "s/@PLATFORMID@/$(PLATFORMID)/" \
- > debian/$$i.script.bug && \
- install -D -m755 debian/$$i.script.bug \
- debian/$$i/usr/share/bug/$$i/script; \
+ > debian/$$i.bug-script; \
fi ;\
done
@@ -3217,6 +3201,7 @@
endif
endif
dh_lintian -s
+ dh_bugfiles -s -A
dh_link -s
dh_fixperms -s
ifeq "$(BUILD_DBG_PACKAGE)" "y"
@@ -3444,6 +3429,7 @@
dh_installchangelogs -i
dh_installmime -i
dh_lintian -i
+ dh_bugfiles -i -A
dh_link -i
dh_fixperms -i
ifeq "$(LENNY_BACKPORT)" "y"
Reply to: