[Pkg-cups-devel] r633 - in cupsys/branches/cups-1.2-ubuntu: . debian
Martin Pitt
mpitt at alioth.debian.org
Fri Nov 30 18:14:07 UTC 2007
Author: mpitt
Date: Fri Nov 30 18:14:07 2007
New Revision: 633
Log:
* Revert most of the doc symlinking changes from 1.3.2-1ubuntu4, since
Ubuntu's cdbs does it by default now. Clean up a few other pieces of
Debian-Ubuntu delta noise along the way.
Added:
cupsys/branches/cups-1.2-ubuntu/debian/watch
Removed:
cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.files
Modified:
cupsys/branches/cups-1.2-ubuntu/ (props changed)
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/control
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.docs
cupsys/branches/cups-1.2-ubuntu/debian/rules
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Fri Nov 30 18:14:07 2007
@@ -1,3 +1,11 @@
+cupsys (1.3.4-1ubuntu5) UNRELEASED; urgency=low
+
+ * Revert most of the doc symlinking changes from 1.3.2-1ubuntu4, since
+ Ubuntu's cdbs does it by default now. Clean up a few other pieces of
+ Debian-Ubuntu delta noise along the way.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 30 Nov 2007 17:38:42 +0100
+
cupsys (1.3.4-1ubuntu4) hardy; urgency=low
* correct Replaces line in cupsys-common to make dapper->hardy
Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control Fri Nov 30 18:14:07 2007
@@ -5,7 +5,7 @@
XSBC-Original-Maintainer: Debian CUPS Maintainers <pkg-cups-devel at lists.alioth.debian.org>
Standards-Version: 3.7.2
Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>= 5.0), po-debconf, cdbs (>= 0.4.27), sharutils, dpatch (>= 1.11), libdbus-1-dev, libkrb5-dev, libavahi-compat-libdnssd-dev
-Uploaders: Kenshi Muto <kmuto at debian.org>, Masayuki Hatta <mhatta at debian.org>, Jeff Licquia <licquia at debian.org>, Martin-Éric Racine <q-funk at iki.fi>, Martin Pitt <mpitt at debian.org>
+Uploaders: Kenshi Muto <kmuto at debian.org>, Martin Pitt <mpitt at debian.org>, Roger Leigh <rleigh at debian.org>, Martin-Éric Racine <q-funk at iki.fi>, Masayuki Hatta (mhatta) <mhatta at debian.org>, Jeff Licquia <licquia at debian.org>
Package: libcupsys2
Priority: optional
@@ -13,7 +13,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Suggests: cupsys-common
-Replaces: cupsys-client (<= 1.1.10-2), cupsys (= 1.3.2-1ubuntu4)
+Replaces: cupsys-client (<= 1.1.10-2)
Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), cupsys (<< 1.2.1)
Description: Common UNIX Printing System(tm) - libs
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
@@ -55,7 +55,7 @@
Replaces: cupsys-pstoraster
Conflicts: cupsys-pstoraster (<< 2)
Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters, avahi-utils
-Suggests: cupsys-bsd, cupsys-driver-gutenprint | cupsys-driver-gimpprint, foomatic-filters-ppds, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified, cups-pdf, hplip
+Suggests: cupsys-bsd, cupsys-driver-gutenprint, foomatic-filters-ppds, hplip, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified
Description: Common UNIX Printing System(tm) - server
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
general replacement for lpd and the like. It supports the Internet
@@ -157,7 +157,7 @@
Priority: optional
Section: net
Architecture: all
-Depends: libcupsys2, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: cupsys (<< 1.2.3)
Replaces: cupsys (<< 1.2.3)
Description: Common UNIX Printing System(tm) - common files
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.docs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.docs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.docs Fri Nov 30 18:14:07 2007
@@ -1 +1,3 @@
+CREDITS.txt
+README.txt
debian/HOWTO_BUGREPORT.txt
Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules Fri Nov 30 18:14:07 2007
@@ -23,7 +23,7 @@
DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
DEB_DH_INSTALLINIT_ARGS := -u'multiuser 19'
DEB_DH_FIXPERMS_ARGS := -Xusr/lib/cups/backend-available
-DEB_DH_COMPRESS_ARGS := -Xusr/share/doc/libcupsys2/examples/scripting
+DEB_DH_COMPRESS_ARGS := -Xusr/share/doc/cupsys/examples/scripting
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
LDFLAGS := -Wl,--as-needed
@@ -37,15 +37,7 @@
dh_movefiles -p$(cdbs_curpkg)
binary-post-install/cupsys::
- # Just the documentation is enough; NEWS, changelogs, and copyright
- # come via the symlink.
- rm -f debian/cupsys/usr/share/doc/cupsys/NEWS*
- rm -f debian/cupsys/usr/share/doc/cupsys/changelog*
- rm -f debian/cupsys/usr/share/doc/cupsys/copyright
- mv debian/cupsys/usr/share/doc/cupsys debian/cupsys/usr/share/doc/libcupsys2
- ln -s libcupsys2 debian/cupsys/usr/share/doc/cupsys
-
- (cd $(DEB_DESTDIR)/../cupsys/usr/share/doc/libcupsys2 && ln -sf ../../cups/doc-root online-docs)
+ (cd $(DEB_DESTDIR)/../cupsys/usr/share/doc/cupsys && ln -sf ../../cups/doc-root online-docs)
install -m 755 debian/local/browsing_status debian/local/enable_browsing debian/local/sharing_status debian/local/enable_sharing $(DEB_DESTDIR)/../cupsys/usr/share/cups
# Install PPDs into /usr/share/ppd/cups-included/<Manufacturer>, see
@@ -69,9 +61,6 @@
# install AppArmor profile
install -D -m 644 debian/local/apparmor-profile $(DEB_DESTDIR)/../cupsys/etc/apparmor.d/usr.sbin.cupsd
-binary-post-install/libcupsimage2::
- rm -r debian/libcupsimage2/usr/share/doc/libcupsimage2
- ln -s libcupsys2 debian/libcupsimage2/usr/share/doc/libcupsimage2
binary-post-install/libcupsimage2-dev::
rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
ln -s libcupsimage2 debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
@@ -84,6 +73,3 @@
binary-post-install/cupsys-client::
rm -r debian/cupsys-client/usr/share/doc/cupsys-client
ln -s libcupsys2 debian/cupsys-client/usr/share/doc/cupsys-client
-binary-post-install/cupsys-common::
- rm -r debian/cupsys-common/usr/share/doc/cupsys-common
- ln -s libcupsys2 debian/cupsys-common/usr/share/doc/cupsys-common
Added: cupsys/branches/cups-1.2-ubuntu/debian/watch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/watch Fri Nov 30 18:14:07 2007
@@ -0,0 +1,3 @@
+version=3
+ftp://ftp.easysw.com/pub/cups/([\d\.]+)/cups-(.*)-source\.tar\.gz \
+ debian uupdate --no-symlink
More information about the Pkg-cups-devel
mailing list