sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79684 by Treeve Jelbert for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79684 by Treeve Jelbert for review
Date: Tue, 23 May 2006 10:10:01 +0100 (BST)

Change 79684 by treeve_jelbert@treeve-knowhow on 2006/05/23 10:06:29

cups-1.2.1

Affected files ...

... //sgl/grimoires/devel/printer/cups/CONFLICTS#1 add
... //sgl/grimoires/devel/printer/cups/DETAILS#10 edit
... //sgl/grimoires/devel/printer/cups/HISTORY#20 edit
... //sgl/grimoires/devel/printer/cups/Makefile.diff#3 edit
... //sgl/grimoires/devel/printer/cups/PRE_BUILD#8 edit
... //sgl/grimoires/devel/printer/cups/cups-1.1.23-source.tar.bz2.sig#2 delete

Differences ...

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

@@ -1,6 +1,6 @@
SPELL=cups
- VERSION=1.2.0
-
SOURCE_HASH=sha512:e6d679816a083490ccfc861c4ffa738443a793c2e80b2bf7a0175bb7a1ae9fa4b56e53bbddf210e94c468617cb939d3a50cb655c1b8187c09d1d2422fd0782bd
+ VERSION=1.2.1
+
SOURCE_HASH=sha512:d4af5fb6acaacfb030cd29f2d5959c82c660cd5fc03c04248685d745b289d99d769e9073d8103e9048080242347cd58cb0955b715f0600cf98c5e26c6d3583c5
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

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

@@ -1,3 +1,9 @@
+2006-05-23 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 1.2.1
+ * CONFLICTS: add query logic from PRE_BUILD
+ * PRE_BUILD: remove query logic
+ * Makefile.diff: update patch
+
2006-05-09 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 1.2.0

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

@@ -1,11 +1,11 @@
---- Makefile.old 2006-03-29 16:42:33.000000000 +0200
-+++ Makefile 2006-03-29 16:46:27.000000000 +0200
-@@ -80,42 +80,6 @@
+--- Makefile 2006-05-23 09:34:52.000000000 +0200
++++ Makefile.cp 2006-05-23 09:58:20.000000000 +0200
+@@ -99,45 +99,6 @@
echo Installing cups-config script...
$(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-- echo Installing startup script...
- if test "x$(INITDIR)" != x; then \
+- echo Installing init scripts...; \
- $(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; \
@@ -20,13 +20,16 @@
- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
- if test "$(INITDDIR)" =
"/System/Library/StartupItems/PrintingServices"; then \
+- echo Installing StartupItems files...; \
- $(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 \
+- echo Installing LaunchDaemons configuration file...; \
- $(INSTALL_DATA) init/org.cups.cupsd.plist
$(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
- else \
+- echo Installing RC script...; \
- $(INSTALL_SCRIPT) init/cups.sh
$(BUILDROOT)$(INITDDIR)/cups; \
- fi \
- fi

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

@@ -1,36 +1,3 @@
-if [ "`gaze installed | grep gnulpr | cut -d: -f1`" = "gnulpr"
]; then
- echo "This spell conflicts with gnulpr and will cause it and any
dependants to be dispelled."
-
- if query "Would you like to see a list of affected spells? " y; then
- fast_up_depends gnulpr
- echo "gnulpr"
-
- if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `fast_up_depends gnulpr`; do
- if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
- dispel $CASTED_SPELL
- fi
- done
-
- dispel gnulpr
- else
- return 1
- fi
- else
- if query "Would you like to continue casting? " y; then
- for CASTED_SPELL in `fast_up_depends gnulpr`; do
- if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`"
= "$CASTED_SPELL" ]; then
- dispel $CASTED_SPELL
- fi
- done
-
- dispel gnulpr
- else
- return 1
- fi
- fi
-fi &&
-
default_pre_build &&
cd $SOURCE_DIRECTORY &&

[SM-Commit] PERFORCE change 79684 by Treeve Jelbert for review, Perforce Review Daemon, 05/23/2006