[Pkg-gs-devel] r16 - in gs-esp/trunk/debian: patches

Kenshi Muto kmuto at costa.debian.org
Fri Jul 28 13:30:02 UTC 2006


Author: kmuto
Date: Fri Jul 28 13:30:01 2006
New Revision: 16

Modified:
   gs-esp/trunk/debian/changelog
   gs-esp/trunk/debian/control
   gs-esp/trunk/debian/patches/00list
   gs-esp/trunk/debian/rules

Log:
cdbsize

Modified: gs-esp/trunk/debian/changelog
==============================================================================
--- gs-esp/trunk/debian/changelog	(original)
+++ gs-esp/trunk/debian/changelog	Fri Jul 28 13:30:01 2006
@@ -1,3 +1,17 @@
+gs-esp (8.15.2.dfsg.1-1) unstable; urgency=low
+
+  * New upstream
+
+  [Kenshi Muto]
+  * Add /usr/share/fonts to fontpath.
+  * Suggest gs-cjk-resource. Although this package and associated packages
+    are contrib or non-free, they are actually needed for CJK people.
+  * Update policy-version and debhelper.
+  * cdbsize.
+  * Use configure command directly instead of using autogen.sh.
+
+ -- Kenshi Muto <kmuto at debian.org>  Fri, 28 Jul 2006 18:51:45 +0900
+
 gs-esp (8.15.1.dfsg.1-2.1) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: gs-esp/trunk/debian/control
==============================================================================
--- gs-esp/trunk/debian/control	(original)
+++ gs-esp/trunk/debian/control	Fri Jul 28 13:30:01 2006
@@ -2,8 +2,8 @@
 Section: text
 Priority: optional
 Maintainer: Masayuki Hatta (mhatta) <mhatta at debian.org>
-Build-Depends: autoconf, automaken, debhelper (>= 4.0.0), dpatch, libcupsys2-dev (>= 1.1.20final+rc1-4), libcupsimage2-dev (>= 1.1.20final+rc1-4), libice-dev, libjpeg-dev, libpaper-dev, libpng-dev, libsm-dev, libx11-dev, libxext-dev, libxt-dev, pkg-config
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5), cdbs, dpatch, libcupsys2-dev (>= 1.2), libcupsimage2-dev (>= 1.1.20final+rc1-4), libice-dev, libjpeg-dev, libpaper-dev, libpng-dev, libsm-dev, libx11-dev, libxext-dev, libxt-dev, pkg-config
+Standards-Version: 3.7.2
 Uploaders: Kenshi Muto <kmuto at debian.org>
 
 Package: gs-esp
@@ -11,6 +11,7 @@
 Replaces: gs-afpl (<< 8.14-3), gs-aladdin (<< 8.14-3), gs-gpl (<< 8.01-3), gs (<< 8.01-3), gs-pdfencrypt (<< 7.00), cupsys-pstoraster
 Depends: ${shlibs:Depends}, gs-common (>= 0.3.9)
 Recommends: gsfonts (>= 6.0-1), psfontmgr
+Suggests: gs-cjk-resource
 Conflicts: gs-afpl (<< 8.14-3), gs-aladdin (<< 8.14-3), gs-gpl (<< 8.01-3), gs (<< 8.01-3), gs-pdfencrypt (<< 7.00), cupsys-pstoraster
 Provides: gs, gs-pdfencrypt, postscript-viewer
 Description: The Ghostscript PostScript interpreter - ESP version

Modified: gs-esp/trunk/debian/patches/00list
==============================================================================
--- gs-esp/trunk/debian/patches/00list	(original)
+++ gs-esp/trunk/debian/patches/00list	Fri Jul 28 13:30:01 2006
@@ -2,7 +2,7 @@
 02_docdir_fix_for_gs-esp
 03_libpaper_support
 04_enable_fapi
-05_krgb_1.2
+#05_krgb_1.2
 06_kfreebsd_buildfix
 
 

Modified: gs-esp/trunk/debian/rules
==============================================================================
--- gs-esp/trunk/debian/rules	(original)
+++ gs-esp/trunk/debian/rules	Fri Jul 28 13:30:01 2006
@@ -1,87 +1,26 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        INSTALL_PROGRAM += -s
-endif
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 # for building w/ FAPI
 #FT_CPPFLAGS = $(shell pkg-config --cflags freetype2)
 #FT_LDFLAGS=$(shell pkg-config --libs freetype2)
 #FT_OPTS := FT_BRIDGE=1 FT_CFLAGS=$(FT_CPPFLAGS) FT_LIB=$(FT_LDFLAGS)
 
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" CPPFLAGS="$(FT_CPPFLAGS)" LDFLAGS="-lpaper $(FT_LDFLAGS)" ./autogen.sh --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+DEB_CONFIGURE_SCRIPT_ENV := CFLAGS="$(CFLAGS)" CPPFLAGS="$(FT_CPPFLAGS)" LDFLAGS="-lpaper $(FT_LDFLAGS)"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 	--enable-dynamic --enable-threads --with-ijs --with-jbig2dec --with-omni --with-x --with-gs=gs-esp \
-	--with-fontpath=/var/lib/defoma/gs.d/dirs/fonts:/usr/share/cups/fonts:/usr/share/ghostscript/fonts:/usr/local/lib/ghostscript/fonts
-
-
-build: patch build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) $(FT_OPTS)
-	#docbook-to-man debian/gs-esp.sgml > gs-esp.1
-
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/gs-esp.
-	$(MAKE) install \
+	--with-libiconv=native \
+	--with-drivers=ALL \
+	--with-fontpath=/var/lib/defoma/gs.d/dirs/fonts:/usr/share/cups/fonts:/usr/share/ghostscript/fonts:/usr/local/lib/ghostscript/fonts:/usr/share/fonts
+DEB_MAKE_BUILD_TARGET := $(FT_OPTS)
+DEB_MAKE_INSTALL_TARGET := install \
 		prefix=$(CURDIR)/debian/gs-esp/usr \
 		datadir=$(CURDIR)/debian/gs-esp/usr/share \
+		gsdir=$(CURDIR)/debian/gs-esp/usr/share/gs-esp \
 		docdir=$(CURDIR)/debian/gs-esp/usr/share/doc/gs-esp \
 		exdir=$(CURDIR)/debian/gs-esp/usr/share/doc/gs-esp/examples \
 		cups_serverbin=$(CURDIR)/debian/gs-esp/usr/lib/cups \
@@ -89,55 +28,21 @@
 		CUPSCONFIG=$(CURDIR)/debian/gs-esp/etc/cups \
 		CUPSDATA=$(CURDIR)/debian/gs-esp/usr/share/cups \
 		$(FT_OPTS)
-	
+DEB_INSTALL_CHANGELOGS_ALL := CHANGES
+
+clean::
+	-$(MAKE) distclean
+
+install/gs-esp::
 	# We only need gs-esp binary (others are in gs-common)
-	rm -f $(CURDIR)/debian/gs-esp/usr/bin/*
+	-rm -f $(CURDIR)/debian/gs-esp/usr/bin/*
 	cp bin/* $(CURDIR)/debian/gs-esp/usr/bin
 
 	# We only need gs-esp.1.gz (others are in gs-common)
-	rm -rf $(CURDIR)/debian/gs-esp/usr/share/man/man1/*
-	rm -rf $(CURDIR)/debian/gs-esp/usr/share/man/de
+	-rm -rf $(CURDIR)/debian/gs-esp/usr/share/man/man1/*
+	-rm -rf $(CURDIR)/debian/gs-esp/usr/share/man/de
 	cp man/gs.1 $(CURDIR)/debian/gs-esp/usr/share/man/man1/gs-esp.1
 
 	# don't install cidfmap, FAPIcidfmap and FAPIfontmap so that it will be provided by gs-common
-	rm -f $(CURDIR)/debian/gs-esp/usr/share/gs-esp/8.15/lib/cidfmap
-	rm -f $(CURDIR)/debian/gs-esp/usr/share/gs-esp/8.15/lib/{FAPIcidfmap,FAPIfontmap}
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+	-rm -f $(CURDIR)/debian/gs-esp/usr/share/gs-esp/8.15/lib/cidfmap
+	-rm -f $(CURDIR)/debian/gs-esp/usr/share/gs-esp/8.15/lib/{FAPIcidfmap,FAPIfontmap}



More information about the Pkg-gs-devel mailing list