[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force Xft2 SVN commit: rev 54 - trunk/debian



Author: branden
Date: 2003-10-05 01:30:29 -0500 (Sun, 05 Oct 2003)
New Revision: 54

Added:
   trunk/debian/libxft-dev.install
   trunk/debian/libxft-dev.postrm
   trunk/debian/libxft-dev.preinst
Removed:
   trunk/debian/libxft2-dev.install
   trunk/debian/libxft2-dev.postrm
   trunk/debian/libxft2-dev.preinst
Modified:
   trunk/debian/changelog
Log:
Update debhelper files to reflect libxft2-dev's rename to libxft-dev.

- debian/libxft-dev.install: renamed from libxft2-dev.install
- debian/libxft-dev.postrm: renamed from libxft2-dev.postrm
- debian/libxft-dev.preinst: renamed from libxft2-dev.preinst


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-10-05 06:19:51 UTC (rev 53)
+++ trunk/debian/changelog	2003-10-05 06:30:29 UTC (rev 54)
@@ -11,11 +11,14 @@
   * Rename libxft2-dev package to libxft-dev.  Consequently, drop conflict and
     provide relationship with (formerly virtual) libxft-dev package.
     - debian/control
+    - debian/libxft-dev.install: renamed from libxft2-dev.install
+    - debian/libxft-dev.postrm: renamed from libxft2-dev.postrm
+    - debian/libxft-dev.preinst: renamed from libxft2-dev.preinst
 
   * Add versioning (>> 4.2.1) to libxft-dev's dependency on xlibs-dev.
     - debian/control
 
- -- Branden Robinson <branden@debian.org>  Sun,  5 Oct 2003 01:19:03 -0500
+ -- Branden Robinson <branden@debian.org>  Sun,  5 Oct 2003 01:28:41 -0500
 
 xft2 (2.1.1-3) unstable; urgency=low
 

Copied: trunk/debian/libxft-dev.install (from rev 46, trunk/debian/libxft2-dev.install)

Copied: trunk/debian/libxft-dev.postrm (from rev 46, trunk/debian/libxft2-dev.postrm)


Property changes on: trunk/debian/libxft-dev.postrm
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: trunk/debian/libxft-dev.preinst (from rev 46, trunk/debian/libxft2-dev.preinst)


Property changes on: trunk/debian/libxft-dev.preinst
___________________________________________________________________
Name: svn:keywords
   + Id

Deleted: trunk/debian/libxft2-dev.install
===================================================================
--- trunk/debian/libxft2-dev.install	2003-10-05 06:19:51 UTC (rev 53)
+++ trunk/debian/libxft2-dev.install	2003-10-05 06:30:29 UTC (rev 54)
@@ -1,5 +0,0 @@
-debian/tmp/usr/include/X11/Xft/* usr/X11R6/include/X11/Xft/
-debian/tmp/usr/lib/libXft*.{a,la,so}
-debian/tmp/usr/lib/pkgconfig/*.pc
-debian/tmp/usr/bin/xft-config
-debian/tmp/usr/share/man/man3/Xft.3

Deleted: trunk/debian/libxft2-dev.postrm
===================================================================
--- trunk/debian/libxft2-dev.postrm	2003-10-05 06:19:51 UTC (rev 53)
+++ trunk/debian/libxft2-dev.postrm	2003-10-05 06:30:29 UTC (rev 54)
@@ -1,21 +0,0 @@
-#!/bin/bash
-# -*- coding: utf-8 -*-
-# Postrm for libxft2-dev
-# Copyright © 2002 Colin Walters <walters@gnu.org>
-
-# $Id$
-
-set -e
-
-if [ remove = "$1" ]; then
-    dpkg-divert --package libxft2-dev --remove --rename \
-        --divert /usr/X11R6/include/X11/Xft/Xft1.h /usr/X11R6/include/X11/Xft/Xft.h
-    dpkg-divert --package libxft2-dev --remove --rename \
-        --divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
-    dpkg-divert --package libxft2-dev --remove --rename \
-        --divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
-fi
-
-#DEBHELPER#
-
-# vim:set ai et sts=4 sw=4 tw=0:

Deleted: trunk/debian/libxft2-dev.preinst
===================================================================
--- trunk/debian/libxft2-dev.preinst	2003-10-05 06:19:51 UTC (rev 53)
+++ trunk/debian/libxft2-dev.preinst	2003-10-05 06:30:29 UTC (rev 54)
@@ -1,29 +0,0 @@
-#!/bin/bash
-# -*- coding: utf-8 -*-
-# Preinst for libxft2-dev
-# Copyright © 2002 Colin Walters <walters@gnu.org>
-
-# $Id$
-
-set -e
-
-if [ install = "$1" -o upgrade = "$1" ]; then
-    dpkg-divert --package libxft2-dev --add --rename \
-        --divert /usr/X11R6/include/X11/Xft/Xft1.h /usr/X11R6/include/X11/Xft/Xft.h
-    dpkg-divert --package libxft2-dev --add --rename \
-        --divert /usr/X11R6/lib/libXft1.a /usr/X11R6/lib/libXft.a
-    dpkg-divert --package libxft2-dev --add --rename \
-        --divert /usr/X11R6/lib/libXft1.so /usr/X11R6/lib/libXft.so
-fi
-
-# we no longer ship XftFreetype.h, so we no longer have to divert it
-if [ "$1" = "upgrade" ]; then
-    if dpkg --compare-versions "$2" lt "2.1.1"; then
-        dpkg-divert --package libxft2-dev --remove --rename \
-            --divert /usr/X11R6/include/X11/Xft/XftFreetype1.h /usr/X11R6/include/X11/Xft/XftFreetype.h
-    fi
-fi
-
-#DEBHELPER#
-
-# vim:set ai et sts=4 sw=4 tw=0:



Reply to: