Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

7 files changed, 151 insertions, 153 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 843fdc126455..7618cc15344b 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	1.116.3
+PORTVERSION=	2.2.1.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.116
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	bonobo-2.0:${PORTSDIR}/devel/libbonobo \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -30,6 +30,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 2c67dbea3035..3040a2df7e14 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-1.116.3.tar.bz2) = 1257c22c5d8f68033fa47bc25793f651
+MD5 (gnome2/libgnomeprint-2.2.1.1.tar.bz2) = 21398826672d7d13933448c859892a81
diff --git a/print/libgnomeprint/files/patch-ab b/print/libgnomeprint/files/patch-ab
index 0abd2128a5d0..59e59f8282e8 100644
--- a/print/libgnomeprint/files/patch-ab
+++ b/print/libgnomeprint/files/patch-ab
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Mon Jun 10 22:13:33 2002
-+++ Makefile.in	Mon Jun 10 22:14:58 2002
-@@ -105,7 +105,7 @@
- WARN_CFLAGS = @WARN_CFLAGS@
+--- Makefile.in.orig	Tue Feb  4 00:35:09 2003
++++ Makefile.in	Tue Feb  4 00:36:01 2003
+@@ -135,7 +135,7 @@
+ am__quote = @am__quote@
  cxxflags_set = @cxxflags_set@
+ install_sh = @install_sh@
+-SUBDIRS = libgnomeprint tests data po doc
++SUBDIRS = libgnomeprint data po doc
  
--SUBDIRS = libgnomeprint fonts installer tests data po doc
-+SUBDIRS = libgnomeprint fonts installer data po doc
- 
- EXTRA_DIST = message-of-doom ChangeLog ChangeLog.old ChangeLog.old.2
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ EXTRA_DIST = \
+     ChangeLog \
diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure
index 0dc458067916..540b06885046 100644
--- a/print/libgnomeprint/files/patch-configure
+++ b/print/libgnomeprint/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Apr 26 12:49:10 2002
-+++ configure	Fri Apr 26 12:49:40 2002
-@@ -5591,6 +5591,7 @@
+--- configure.orig	Tue Dec 17 16:29:43 2002
++++ configure	Fri Dec 20 16:33:46 2002
+@@ -8161,6 +8161,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,15 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7180,7 +7181,7 @@
-   INSTALL_FONTS_TRUE='#'
-   INSTALL_FONTS_FALSE=
- fi
--FONTMAPDIR_STATIC=$datadir/gnome/libgnomeprint-2.0/fonts
-+FONTMAPDIR_STATIC=$datadir/libgnomeprint-2.0/fonts
- FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts
+@@ -10938,9 +10939,9 @@
+ 
  
+ if test "x${prefix}" = "xNONE"; then
+-	GNOME_PRINT_DATA_DIR='${ac_default_prefix}/${DATADIRNAME}/libgnomeprint/${VERSION}'
++	GNOME_PRINT_DATA_DIR='${ac_default_prefix}/share/gnome/libgnomeprint/${VERSION}'
+ else
+-	GNOME_PRINT_DATA_DIR='${prefix}/${DATADIRNAME}/libgnomeprint/${VERSION}'
++	GNOME_PRINT_DATA_DIR='${prefix}/share/gnome/libgnomeprint/${VERSION}'
+ fi
+ GNOME_PRINT_DATA_DIR=$GNOME_PRINT_DATA_DIR
  
diff --git a/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in b/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in
deleted file mode 100644
index 10c52a895c03..000000000000
--- a/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- libgnomeprint/drivers/Makefile.in	2002/03/19 16:44:23	1.1
-+++ libgnomeprint/drivers/Makefile.in	2002/03/19 16:48:12
-@@ -118,13 +118,13 @@
- OMNI2_SRC = gnome-print-omni2.cpp gnome-print-omni2.hpp
- OMNI2_LAD = -L$(OMNI_LIBDIR) -lomni
- libgnomeprint_omni2_la_SOURCES = $(OMNI2_SRC)
--libgnomeprint_omni2_la_LDFLAGS = -version-info 0:0:0 -module
-+libgnomeprint_omni2_la_LDFLAGS = -avoid-version -module
- libgnomeprint_omni2_la_LIBADD = $(OMNI2_LAD)
- 
- FAX_LIB = libgnomeprint-fax.la
- FAX_SRC = gnome-print-fax.c gnome-print-fax.h gnome-print-fax-g3.h
- libgnomeprint_fax_la_SOURCES = $(FAX_SRC)
--libgnomeprint_fax_la_LDFLAGS = -version-info 0:0:0 -module
-+libgnomeprint_fax_la_LDFLAGS = -avoid-version -module
- libgnomeprint_fax_la_LIBADD = 
- 
- libexecdir = $(libdir)/gnome-print-2.0/drivers
diff --git a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c
new file mode 100644
index 000000000000..6aa2b9a4fd79
--- /dev/null
+++ b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c
@@ -0,0 +1,12 @@
+--- libgnomeprint/gnome-print.c.orig	Tue Jan  7 14:39:24 2003
++++ libgnomeprint/gnome-print.c	Tue Jan  7 14:39:35 2003
+@@ -38,8 +38,8 @@
+ #include <libgnomeprint/gnome-print-frgba.h>
+ 
+ /* For the buffer stuff, remove when the buffer stuff is moved out here */
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 7a66c932cd43..e60bf212f5aa 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -1,106 +1,114 @@
-bin/libgnomeprint-2.0-font-install
 etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
-include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-pgl.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-config.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-master.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-paper.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-unit.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-rfont.h
-include/libgnomeprint-2.0/libgnomeprint/gp-gc.h
-include/libgnomeprint-2.0/libgnomeprint/private/gnome-font-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gnome-print-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gp-gc-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gpa-private.h
-lib/gnome-print-2.0/drivers/libgnomeprint-fax.so
-lib/gnome-print-2.0/transports/libgnomeprint-custom.so
-lib/gnome-print-2.0/transports/libgnomeprint-file.so
-lib/gnome-print-2.0/transports/libgnomeprint-lpr.so
-lib/libgnomeprint-2.a
-lib/libgnomeprint-2.so
-lib/libgnomeprint-2.so.0
-libdata/pkgconfig/libgnomeprint-2.0.pc
-share/doc/libgnomeprint/index.html
-share/doc/libgnomeprint/index.sgml
-share/doc/libgnomeprint/libgnomeprint-building.html
-share/doc/libgnomeprint/libgnomeprint-compiling.html
-share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
-share/doc/libgnomeprint/libgnomeprint-gnome-font.html
-share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
-share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-master.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print.html
-share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
-share/doc/libgnomeprint/libgnomeprint-question-index.html
-share/doc/libgnomeprint/libgnomeprint-resources.html
-share/doc/libgnomeprint/libgnomeprint.html
-share/doc/libgnomeprint/libgnomeprintunsorted.html
-share/gnome/fonts/README.installer
-share/gnome/gnome-print-2.0/media/media.xml
-share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model
-share/gnome/gnome-print-2.0/models/HP-LASERJET-4ML.model
-share/gnome/gnome-print-2.0/models/STYLUS-COLOR-740.model
-share/gnome/gnome-print-2.0/printers/GENERIC.printer
-share/gnome/gnome-print-2.0/vendors/EPSON.vendor
-share/gnome/gnome-print-2.0/vendors/GNOME.vendor
-share/gnome/gnome-print-2.0/vendors/HP.vendor
-share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
-share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
-share/locale/am/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ar/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/be/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/bg/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/cs/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/he/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/it/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ja/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/lv/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/nn/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/no/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/pl/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/pt/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ro/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ru/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/sk/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/sl/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/sv/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ta/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/tr/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/vi/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
-@dirrm share/gnome/libgnomeprint-2.0/fonts
-@dirrm share/gnome/libgnomeprint-2.0
-@dirrm share/gnome/gnome-print-2.0/vendors
-@dirrm share/gnome/gnome-print-2.0/printers
-@dirrm share/gnome/gnome-print-2.0/models
-@dirrm share/gnome/gnome-print-2.0/media
-@dirrm share/gnome/gnome-print-2.0
-@dirrm share/doc/libgnomeprint
-@dirrm lib/gnome-print-2.0/transports
-@dirrm lib/gnome-print-2.0/drivers
-@dirrm lib/gnome-print-2.0
-@dirrm include/libgnomeprint-2.0/libgnomeprint/private
-@dirrm include/libgnomeprint-2.0/libgnomeprint
-@dirrm include/libgnomeprint-2.0
+include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-font.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-pgl.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-config.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-job.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-paper.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-unit.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h
+include/libgnomeprint-2.2/libgnomeprint/gp-gc.h
+include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-key.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-list.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-model.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-node-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-node.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-option.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-printer.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-reference.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-root.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
+lib/libgnomeprint-2-2.a
+lib/libgnomeprint-2-2.so
+lib/libgnomeprint-2-2.so.0
+lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so
+lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so
+lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so
+libdata/pkgconfig/libgnomeprint-2.2.pc
+share/doc/libgnomeprint-2.2/index.html
+share/doc/libgnomeprint-2.2/index.sgml
+share/doc/libgnomeprint-2.2/libgnomeprint-building.html
+share/doc/libgnomeprint-2.2/libgnomeprint-compiling.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-font-face.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-font.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-glyphlist.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-pgl.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-config.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-job.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-paper.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-unit.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print.html
+share/doc/libgnomeprint-2.2/libgnomeprint-gnome-rfont.html
+share/doc/libgnomeprint-2.2/libgnomeprint-resources.html
+share/doc/libgnomeprint-2.2/libgnomeprint.html
+share/doc/libgnomeprint-2.2/libgnomeprintunsorted.html
+share/gnome/libgnomeprint/%%VERSION%%/globals.xml
+share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml
+share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml
+share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml
+share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml
+share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ro/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ru/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/sk/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/sl/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
+@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
+@dirrm share/gnome/libgnomeprint/%%VERSION%%/models
+@dirrm share/gnome/libgnomeprint/%%VERSION%%
+@dirrm share/gnome/libgnomeprint
+@dirrm share/doc/libgnomeprint-2.2
+@dirrm lib/libgnomeprint/%%VERSION%%/modules/transports
+@dirrm lib/libgnomeprint/%%VERSION%%/modules
+@dirrm lib/libgnomeprint/%%VERSION%%
+@dirrm lib/libgnomeprint
+@dirrm include/libgnomeprint-2.2/libgnomeprint/private
+@dirrm include/libgnomeprint-2.2/libgnomeprint
+@dirrm include/libgnomeprint-2.2
 @dirrm etc/gnome/libgnomeprint-2.0/fonts
 @dirrm etc/gnome/libgnomeprint-2.0