------------------------------------------------------------
revno: 1111
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-06-10 19:51:52 +0200
message:
s/cupsys/cups/
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-06-10 08:42:51 +0000
+++ b/changelog 2008-06-10 17:51:52 +0000
@@ -7,7 +7,7 @@
to a read-only location (closes: #238906)
- fixes printing of handouts in grayscale mode (closes: #416309)
* ooo-build:
- - update (r12794)
+ - update (r12850)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -53,8 +53,10 @@
office". Remove PACKAGE_URE conditionals and make -core depend on ure.
* debian/copyright: LGPL v3; update
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
+ * debian/control.in:
+ - s/cupsys/cups/
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 06 Jun 2008 14:34:39 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 10 Jun 2008 19:50:30 +0200
openoffice.org (1:2.4.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-06-10 08:42:51 +0000
+++ b/control 2008-06-10 17:51:52 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcupsys2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, libxrandr-dev , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev ,
libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) ,
debhelper (>= 6.0.7~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64] , dmake (>= 1:4.11) , 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 , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) ,
libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64]
, liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) ,
libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10) ,
libglib2.0-dev (>= 2.15.0)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[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, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, libxrandr-dev , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev ,
libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) ,
debhelper (>= 6.0.7~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64] , dmake (>= 1:4.11) , 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 , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) ,
libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64]
, liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) ,
libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10) ,
libglib2.0-dev (>= 2.15.0)
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),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -15,7 +15,7 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, ttf-dejavu, ${ooo-officebean-dep},
${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
Recommends: ${ooo-binfilter-dep}
-Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd,
libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1,
libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel |
firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-openoffice.org, pstoedit,
graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils,
${gstreamer-plugins-suggests}
+Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1,
libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel |
firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-openoffice.org, pstoedit,
graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils,
${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
@@ -48,7 +48,7 @@
* openoffice.org-headless: Headless (svp) UI Plugin
* menu: Will add openoffice.org menu entries for every Debian window manager.
* unixodbc: ODBC database support
- * cupsys-bsd: Allows OpenOffice.org to detect your CUPS printer queues
+ * cups-bsd: Allows OpenOffice.org to detect your CUPS printer queues
automatically
* libsane: Use your sane-supported scanner with OpenOffice.org
* libxrender1: Speed up display by using Xrender library
=== modified file 'control.in'
--- a/control.in 2008-06-10 08:42:51 +0000
+++ b/control.in 2008-06-10 17:51:52 +0000
@@ -28,7 +28,7 @@
libice-dev,
libsane-dev,
libxrender-dev,
- libcupsys2-dev,
+ libcups2-dev,
libarchive-zip-perl,
libpng12-dev,
libjpeg62-dev,
@@ -79,7 +79,7 @@
openoffice.orgVER-l10n-${help-l10n-virtual-version},
menu,
unixodbc,
- cupsys-bsd,
+ cups-bsd,
libsane,
openoffice.org-hyphenation,
openoffice.org2-thesaurus,
@@ -126,7 +126,7 @@
* openoffice.org-headless: Headless (svp) UI Plugin
* menu: Will add openoffice.org menu entries for every Debian window manager.
* unixodbc: ODBC database support
- * cupsys-bsd: Allows OpenOffice.org to detect your CUPS printer queues
+ * cups-bsd: Allows OpenOffice.org to detect your CUPS printer queues
automatically
* libsane: Use your sane-supported scanner with OpenOffice.org
* libxrender1: Speed up display by using Xrender library