debian/changelog | 8 ++++ debian/control | 74 +-------------------------------------------- debian/libxaw6-dev.install | 3 - debian/libxaw6-dev.links | 1 debian/libxaw6.install | 2 - debian/libxaw7-dev.install | 3 + debian/rules | 9 ++--- 7 files changed, 16 insertions(+), 84 deletions(-)
New commits: commit 14a9773a352103316e21cab0b0655b866ab66eff Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Jan 6 11:47:31 2008 +0100 Stop building Xaw6. Remove the libxaw6, libxaw6-dbg, libxaw6-dev and libxaw-headers packages, moving the contents of -headers to libxaw7-dev (closes: #172890). diff --git a/debian/changelog b/debian/changelog index c9ab737..f41c873 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ libxaw (2:1.0.4-2) UNRELEASED; urgency=low + [ Drew Parsons ] * Add a README.Debian to libxaw7-dev, pointing to further documentation in the xspecs package. Closes: #260659. - -- Drew Parsons <[EMAIL PROTECTED]> Tue, 18 Sep 2007 22:14:31 +1000 + [ Julien Cristau ] + * Stop building Xaw6. Remove the libxaw6, libxaw6-dbg, libxaw6-dev and + libxaw-headers packages, moving the contents of -headers to libxaw7-dev + (closes: #172890). + + -- Julien Cristau <[EMAIL PROTECTED]> Sun, 06 Jan 2008 11:45:39 +0100 libxaw (2:1.0.4-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a01ae3a..a3b0b75 100644 --- a/debian/control +++ b/debian/control @@ -7,60 +7,6 @@ Build-Depends: debhelper (>= 5), libx11-dev (>= 1:0.99.2-1), x11proto-core-dev ( Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxaw -Package: libxaw6 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common -Description: X11 Athena Widget library - libXaw6 provides the original version of Xaw, the Athena Widgets tookit, - which is largely used by legacy X applications. Within the Xaw series, - version 6 is itself considered deprecated; version 7 is in most common - usage. See libxaw7 for more information. - . - More information about X.Org can be found at: - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - -Package: libxaw6-dbg -Section: libdevel -Architecture: any -Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxaw6 (= ${Source-Version}) -Description: X11 Athena Widget library (debug package) - libXaw6 provides the original version of Xaw, the Athena Widgets tookit, - which is largely used by legacy X applications. Within the Xaw series, - version 6 is itself considered deprecated; version 7 is in most common - usage. See libxaw7 for more information. In general, use of a more - modern toolkit such as GTK+ is recommended. - . - This package contains the debug versions of the library found in libxaw6. - Non-developers likely have little use for this package. - . - More information about X.Org can be found at: - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - -Package: libxaw6-dev -Section: libdevel -Priority: extra -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxaw6 (= ${Source-Version}), libxaw-headers (= ${source:Version}) -Conflicts: libxaw7-dev, libxaw8-dev -Replaces: libxaw7-dev, libxaw8-dev -Description: X11 Athena Widget library (development headers) - libXaw6 provides the original version of Xaw, the Athena Widgets tookit, - which is largely used by legacy X applications. Within the Xaw series, - version 6 is itself considered deprecated; version 7 is in most common - usage. See libxaw7 for more information. In general, use of a more - modern toolkit such as GTK+ is recommended. - . - This package contains the development headers for the library found in - libxaw6. Non-developers likely have little use for this package. - . - More information about X.Org can be found at: - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - Package: libxaw7 Section: libs Architecture: any @@ -98,9 +44,9 @@ Description: X11 Athena Widget library (debug package) Package: libxaw7-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxaw7 (= ${Source-Version}), libxaw-headers (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxaw7 (= ${Source-Version}), libx11-dev, libxmu-dev, libxpm-dev, x11proto-core-dev Conflicts: libxaw6-dev, libxaw8-dev -Replaces: libxaw6-dev, libxaw8-dev +Replaces: libxaw6-dev, libxaw8-dev, libxaw-headers (<< 2:1.0.4-2) Description: X11 Athena Widget library (development headers) libXaw7 provides the second version of Xaw, the Athena Widgets tookit, which is largely used by legacy X applications. This version is the @@ -114,19 +60,3 @@ Description: X11 Athena Widget library (development headers) More information about X.Org can be found at: <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> - -Package: libxaw-headers -Section: libdevel -Architecture: all -Depends: libx11-dev, libxmu-dev, libxpm-dev, x11proto-core-dev -Replaces: libxaw6-dev (<< 7.0.2-1), libxaw7-dev (<< 1:1.0.3-2), libxaw8-dev -Pre-Depends: x11-common (>= 1:7.0.0) -Description: X11 Athena Widget library (development headers) - libxaw-headers provides common development headers for libXaw versions 6 - and 7; please see libxaw6-dev and libxaw7-dev for more information. Note - that libxaw7-dev is recommended over libxaw6-dev, but in general, use of a - more modern toolkit such as GTK+ is recommended. - . - More information about X.Org can be found at: - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> diff --git a/debian/libxaw6-dev.install b/debian/libxaw6-dev.install deleted file mode 100644 index 82c6fb2..0000000 --- a/debian/libxaw6-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libXaw6.a -usr/lib/libXaw6.so -usr/lib/pkgconfig/xaw6.pc diff --git a/debian/libxaw6-dev.links b/debian/libxaw6-dev.links deleted file mode 100644 index 2a83818..0000000 --- a/debian/libxaw6-dev.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libXaw6.so usr/lib/libXaw.so diff --git a/debian/libxaw6.install b/debian/libxaw6.install deleted file mode 100644 index 5856fcf..0000000 --- a/debian/libxaw6.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libXaw6.so.6* -usr/lib/libXaw.so.6 \ No newline at end of file diff --git a/debian/libxaw7-dev.install b/debian/libxaw7-dev.install index 6d7fbd4..e3cac88 100644 --- a/debian/libxaw7-dev.install +++ b/debian/libxaw7-dev.install @@ -1,3 +1,6 @@ usr/lib/libXaw7.a usr/lib/libXaw7.so usr/lib/pkgconfig/xaw7.pc +usr/include/X11/* +usr/share/aclocal/xaw.m4 +usr/share/man/man3/* diff --git a/debian/rules b/debian/rules index 02c9ef7..d0d65ce 100755 --- a/debian/rules +++ b/debian/rules @@ -37,8 +37,8 @@ build-stamp: cd obj-$(DEB_BUILD_GNU_TYPE) && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ - --disable-xaw8 \ - CFLAGS="$(CFLAGS)" + --disable-xaw6 --disable-xaw8 \ + CFLAGS="$(CFLAGS)" cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) touch build-stamp @@ -70,12 +70,11 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=libXaw8 --exclude=libXaw.so.8 --exclude=xaw8.pc + dh_install --sourcedir=debian/tmp --list-missing --exclude=.la dh_installman dh_installchangelogs ChangeLog dh_link - dh_strip -Nlibxaw6 -Nlibxaw7 - dh_strip -plibxaw6 --dbg-package=libxaw6-dbg + dh_strip -Nlibxaw7 dh_strip -plibxaw7 --dbg-package=libxaw7-dbg dh_compress dh_fixperms -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]