Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77006 by Treeve Jelbert for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77006 by Treeve Jelbert for review
  • Date: Thu, 30 Mar 2006 06:55:00 +0100 (BST)

Change 77006 by treeve_jelbert@treeve-knowhow on 2006/03/30 06:51:48

cups-1.2rc1

Affected files ...

... //sgl/grimoires/devel/printer/cups/DEPENDS#6 edit
... //sgl/grimoires/devel/printer/cups/DETAILS#6 edit
... //sgl/grimoires/devel/printer/cups/HISTORY#15 edit
... //sgl/grimoires/devel/printer/cups/Makefile.diff#2 edit
... //sgl/grimoires/devel/printer/cups/PRE_BUILD#6 edit
... //sgl/grimoires/devel/printer/cups/xpdf-pl3.patch#4 delete

Differences ...

==== //sgl/grimoires/devel/printer/cups/DEPENDS#6 (xtext) ====

@@ -1,10 +1,13 @@
-depends gcc34 &&
-
depends zlib &&
depends jpeg &&
depends tiff &&
depends libpng &&

+optional_depends "dbus" \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "for dynamic printer detection" &&
+
optional_depends "linux-pam" \
"--enable-pam" \
"--disable-pam" \

==== //sgl/grimoires/devel/printer/cups/DETAILS#6 (xtext) ====

@@ -1,5 +1,6 @@
SPELL=cups
- VERSION=1.1.23
+ VERSION=1.2rc1
+
SOURCE_HASH=sha512:3ea9962e70c689a60e394dba0abf6c37fb5e9efa09bfc034e3a846994a87b26ecb7c4bf2b303648a72d4bc543c8eb81b371a9ebcb190a0ce13e678785d1a4905
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.easysw.com/pub/${SPELL}/$VERSION/$SOURCE
## Oregon, USA
@@ -8,12 +9,11 @@

SOURCE_URL[3]=http://www.nu6.org/_/mirror/ftp.easysw.com/pub/ghostscript/${VERSION}/${SOURCE}
## Gustavsberg, Sweden

SOURCE_URL[4]=ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/${SPELL}/${VERSION}/${SOURCE}
## Braunschweig, Germany
WEB_SITE=http://www.cups.org
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
ENTERED=20010922
UPDATED=20050221
LICENSE[0]=http://www.cups.org/faq0003.html
BUILD_API=2
- GCC_VERSION=3.4
KEYWORDS="printer"
SHORT="Common Unix Printing System is a portable printing layer"
cat << EOF

==== //sgl/grimoires/devel/printer/cups/HISTORY#15 (text) ====

@@ -1,3 +1,12 @@
+2006-03-29 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 1.2rc1
+ remove gcc34
+ * DEPENDS: remove gcc34
+ add optional dbus
+ * PRE_BUILD: don't apply xpdf patch
+ * Makefile.diff: update to latest layout
+ * xpdf-pl3.patch: delete, no longer needed
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/devel/printer/cups/Makefile.diff#2 (text) ====

@@ -1,33 +1,45 @@
---- Makefile.old 2003-05-27 21:52:27.000000000 -0700
-+++ Makefile 2003-05-27 21:52:49.000000000 -0700
-@@ -89,30 +89,6 @@
+--- Makefile.old 2006-03-29 16:42:33.000000000 +0200
++++ Makefile 2006-03-29 16:46:27.000000000 +0200
+@@ -80,42 +80,6 @@
echo Installing cups-config script...
- $(INSTALL_DIR) $(BINDIR)
+ $(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
- echo Installing startup script...
-- if test "x$(INITDIR)" != "x"; then \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups;
\
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+- if test "x$(INITDIR)" != x; then \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
+- $(INSTALL_SCRIPT) init/cups.sh
$(BUILDROOT)$(INITDIR)/init.d/cups; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
+- $(INSTALL_SCRIPT) init/cups.sh
$(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
+- $(INSTALL_SCRIPT) init/cups.sh
$(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
+- $(INSTALL_SCRIPT) init/cups.sh
$(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
+- $(INSTALL_SCRIPT) init/cups.sh
$(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
- fi
-- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
- if test "$(INITDDIR)" =
"/System/Library/StartupItems/PrintingServices"; then \
-- $(INSTALL_SCRIPT) cups.osx
$(BUILDROOT)$(INITDDIR)/PrintingServices; \
-- $(INSTALL_DATA) cups.plist
$(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-- $(INSTALL_DIR)
$(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-- $(INSTALL_DATA) cups.strings
$(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+- $(INSTALL_SCRIPT) init/PrintingServices
$(BUILDROOT)$(INITDDIR)/PrintingServices; \
+- $(INSTALL_DATA) init/StartupParameters.plist
$(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
+- $(INSTALL_DIR) -m 755
$(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+- $(INSTALL_DATA) init/Localizable.strings
$(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+- elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons";
then \
+- $(INSTALL_DATA) init/org.cups.cupsd.plist
$(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
- else \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDDIR)/cups; \
+- $(INSTALL_SCRIPT) init/cups.sh
$(BUILDROOT)$(INITDDIR)/cups; \
- fi \
- fi
-
- #
- # Install source and header files...
+- if test "x$(DBUSDIR)" != x; then \
+- echo Installing cups.conf in $(DBUSDIR)...;\
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
+- $(INSTALL_DATA) packaging/cups-dbus.conf
$(BUILDROOT)$(DBUSDIR)/cups.conf; \
+- fi
+- if test "x$(XINETD)" != x; then \
+- echo Installing xinetd configuration file for cups-lpd...; \
+- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+- $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd;
\
+- fi
+ if test -d /usr/share/applications; then \
+ echo Installing desktop icons...; \
+ $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \

==== //sgl/grimoires/devel/printer/cups/PRE_BUILD#6 (xtext) ====

@@ -34,6 +34,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p1 < $SCRIPT_DIRECTORY/xpdf-pl3.patch &&
patch -p0 < $SCRIPT_DIRECTORY/Makefile.diff




  • [SM-Commit] PERFORCE change 77006 by Treeve Jelbert for review, Perforce Review Daemon, 03/30/2006

Archive powered by MHonArc 2.6.24.

Top of Page