LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 17653584717f59bb179b31a0accbd1257181e456 

Monotone-Revision: c66c023a1a42d53c473a7338a49a9b456d889ed9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-10-28T14:05:31
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-10-28 14:05:31 +00:00
parent b0be0530e9
commit 837f13a0c3
1 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
SOPE/sope-debian.diff
View File

@ -1,15 +1,3 @@
--- sope-4.9.r1660.orig/configure
+++ sope-4.9.r1660/configure
@@ -427,8 +427,8 @@
checkLinking "ldap" optional;
checkLinking "ssl" required; # TODO: make optional
checkLinking "pq" optional;
- checkLinking "sqlite3" optional;
checkLinking "mysqlclient" optional;
+ checkLinking "sqlite3" optional;
}
function runIt() {
--- sope-4.9.r1660.orig/debian/sope_SOPEVER_-gdl1-postgresql.install --- sope-4.9.r1660.orig/debian/sope_SOPEVER_-gdl1-postgresql.install
+++ sope-4.9.r1660/debian/sope_SOPEVER_-gdl1-postgresql.install +++ sope-4.9.r1660/debian/sope_SOPEVER_-gdl1-postgresql.install
@@ -1 +1 @@ @@ -1 +1 @@
@ -47,14 +35,15 @@
* New upstream release. * New upstream release.
--- sope-4.9.r1660.orig/debian/rules --- sope-4.9.r1660.orig/debian/rules
+++ sope-4.9.r1660/debian/rules +++ sope-4.9.r1660/debian/rules
@@ -7,13 +7,15 @@ @@ -7,13 +7,16 @@
#export DH_VERBOSE=1 #export DH_VERBOSE=1
# Include dpatch stuff. # Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make -include /usr/share/dpatch/dpatch.make
+# include /usr/share/dpatch/dpatch.make +# include /usr/share/dpatch/dpatch.make
+ +
+PATCHES = sope-gsmake2.diff sope-patchset-r1660.diff +PATCHES = sope-gsmake2.diff sope-patchset-r1660.diff debian-build-mysql.diff
+RPATCHES = debian-build-mysql.diff sope-patchset-r1660.diff sope-gsmake2.diff
CFLAGS = -Wall -g CFLAGS = -Wall -g
#WARN: doesn't compile/package if HAS_LIBRARY_* options not present (since we use configure now) #WARN: doesn't compile/package if HAS_LIBRARY_* options not present (since we use configure now)
@ -65,7 +54,7 @@
include Version include Version
SOPEVER=$(MAJOR_VERSION).$(MINOR_VERSION) SOPEVER=$(MAJOR_VERSION).$(MINOR_VERSION)
@@ -50,17 +52,17 @@ @@ -50,17 +53,17 @@
done; \ done; \
rm controlfiles.tmp; \ rm controlfiles.tmp; \
fi fi
@ -89,7 +78,7 @@
dh_testdir dh_testdir
-mv sope-core/NGStreams/config.guess sope-core/NGStreams/config.guess.upstream -mv sope-core/NGStreams/config.guess sope-core/NGStreams/config.guess.upstream
@@ -71,14 +73,14 @@ @@ -71,14 +74,14 @@
CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \ CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
$(MAKE) $(MAKE_FLAGS) all $(MAKE) $(MAKE_FLAGS) all
@ -111,7 +100,7 @@
touch build-stamp touch build-stamp
@@ -87,12 +89,14 @@ @@ -87,12 +90,14 @@
dh_testroot dh_testroot
rm -f configure-stamp rm -f configure-stamp
rm -f build-stamp rm -f build-stamp
@ -128,7 +117,7 @@
rm sope-core/NGStreams/config.sub; \ rm sope-core/NGStreams/config.sub; \
fi fi
if [ -f sope-core/NGStreams/config.guess.upstream ]; then \ if [ -f sope-core/NGStreams/config.guess.upstream ]; then \
@@ -102,8 +106,8 @@ @@ -102,8 +107,8 @@
mv sope-core/NGStreams/config.sub.upstream sope-core/NGStreams/config.sub; \ mv sope-core/NGStreams/config.sub.upstream sope-core/NGStreams/config.sub; \
fi fi
@ -139,7 +128,7 @@
-. $(GNUSTEP_SETUP); $(MAKE) clean -. $(GNUSTEP_SETUP); $(MAKE) clean
-. $(GNUSTEP_SETUP); $(MAKE) distclean -. $(GNUSTEP_SETUP); $(MAKE) distclean
@@ -116,24 +120,24 @@ @@ -116,24 +121,24 @@
dh_clean -k dh_clean -k
dh_installdirs dh_installdirs
@ -173,7 +162,7 @@
# Build architecture-independent files here. # Build architecture-independent files here.
binary-indep: build install binary-indep: build install
@@ -172,5 +176,28 @@ @@ -172,5 +177,28 @@
dh_md5sums dh_md5sums
dh_builddeb dh_builddeb
@ -192,13 +181,13 @@
+unpatch: +unpatch:
+ if test -f patch-stamp; \ + if test -f patch-stamp; \
+ then \ + then \
+ for patch in $(PATCHES); \ + for patch in $(RPATCHES); \
+ do \ + do \
+ patch -p0 -R < debian/patches/$$patch; \ + patch -p0 -R < debian/patches/$$patch; \
+ rm -f debian/patches/$$patch.stamp; \ + rm -f debian/patches/$$patch.stamp; \
+ done; \ + done; \
+ rm -f patch-stamp; \
+ fi + fi
+ rm -f patch-stamp
+ +
binary: binary-indep binary-arch binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure .PHONY: build clean binary-indep binary-arch binary install configure
@ -8644,13 +8633,19 @@
+ hasConnectionHeader = YES; + hasConnectionHeader = YES;
+ } + }
+ +
--- sope-4.9.r1660.orig/sope-core/NGStreams/GNUmakefile.preamble --- sope-4.9.r1660.orig/debian/patches/debian-build-mysql.diff
+++ sope-4.9.r1660/sope-core/NGStreams/GNUmakefile.preamble +++ sope-4.9.r1660/debian/patches/debian-build-mysql.diff
@@ -1,6 +1,6 @@ @@ -0,0 +1,13 @@
# compilation settings +diff -durpN sope-4.9.r1660.orig/configure sope-4.9.r1660/configure
+--- configure.orig 2009-10-28 09:46:53.000000000 -0400
-MACHCPU = $(shell echo $$MACHTYPE | cut -f 1 -d '-') ++++ configure 2009-10-28 09:48:41.000000000 -0400
+MACHCPU = $(shell /usr/bin/arch) +@@ -475,8 +475,8 @@ checkDependencies() {
+ checkLinking "ssl" required; # TODO: make optional
libNGStreams_INCLUDE_DIRS += \ + fi
-I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \ + checkLinking "pq" optional;
+- checkLinking "sqlite3" optional;
+ checkLinking "mysqlclient" optional;
++ checkLinking "sqlite3" optional;
+ }
+
+ runIt() {