[Pkg-cli-libs-commits] r4050 - in /packages/semweb/trunk/debian: changelog control patches/00list patches/use_csc_as_compiler.dpatch rules watch
directhex-guest at users.alioth.debian.org
directhex-guest at users.alioth.debian.org
Mon Mar 2 15:22:35 UTC 2009
Author: directhex-guest
Date: Mon Mar 2 15:22:35 2009
New Revision: 4050
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4050
Log:
Semweb
Added:
packages/semweb/trunk/debian/patches/use_csc_as_compiler.dpatch (with props)
Modified:
packages/semweb/trunk/debian/changelog
packages/semweb/trunk/debian/control
packages/semweb/trunk/debian/patches/00list
packages/semweb/trunk/debian/rules
packages/semweb/trunk/debian/watch
Modified: packages/semweb/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/changelog?rev=4050&op=diff
==============================================================================
--- packages/semweb/trunk/debian/changelog (original)
+++ packages/semweb/trunk/debian/changelog Mon Mar 2 15:22:35 2009
@@ -1,16 +1,13 @@
-semweb (1.05+dfsg-2~pre1) UNRELEASED; urgency=low
+semweb (1.05+dfsg-2) UNRELEASED; urgency=low
- * NOT RELEASED YET
- * debian/control:
- + Updated cli-common-dev build-dependency to >= 0.5.7
- (needed for cli.make)
- * debian/rules:
- + Include /usr/share/cli-common/cli.make
- + Removed many dh hooks, as cli.make takes care now.
- * debian/monodoc-semweb-manual.postinst:
- + Fixed installing SemWeb node, accidently removed db4o instead of semweb.
+ * Update for Mono 2.0 transition
+ + debian/patches/use_csc_as_compiler.dpatch:
+ - Compiler is hard-coded in Makefile; change it
+ * No-change standards bump to 3.8.0
+ * Add myself to Uploaders
+ * Tweak watch file to make uscan aware of mangled version
- -- Mirco Bauer <meebey at debian.org> Sun, 15 Jun 2008 17:54:10 +0200
+ -- Jo Shields <directhex at apebox.org> Mon, 02 Mar 2009 15:16:38 +0000
semweb (1.05+dfsg-1) unstable; urgency=low
Modified: packages/semweb/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/control?rev=4050&op=diff
==============================================================================
--- packages/semweb/trunk/debian/control (original)
+++ packages/semweb/trunk/debian/control Mon Mar 2 15:22:35 2009
@@ -2,13 +2,11 @@
Section: libs
Priority: optional
Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
-Uploaders: Mirco Bauer <meebey at debian.org>
+Uploaders: Mirco Bauer <meebey at debian.org>, Jo Shields <directhex at apebox.org>
Build-Depends: debhelper (>= 7), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.5.7),
+Build-Depends-Indep: cli-common-dev (>= 0.5.4),
sharutils,
- mono-gmcs (>= 1.1.6),
- mono-gac,
- mono-1.0-devel,
+ mono-devel (>= 2.0.1),
pkg-config,
monodoc-base,
libmono-npgsql2.0-cil,
@@ -16,7 +14,7 @@
libmono-system-web2.0-cil,
libmono-sqlite2.0-cil,
libmysql5.0-cil
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://razor.occams.info/code/semweb/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/semweb/trunk/
Modified: packages/semweb/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/patches/00list?rev=4050&op=diff
==============================================================================
--- packages/semweb/trunk/debian/patches/00list (original)
+++ packages/semweb/trunk/debian/patches/00list Mon Mar 2 15:22:35 2009
@@ -1,3 +1,4 @@
fix_mysql_linkage
fix_store_builds
enable_AssemblyDelaySign
+use_csc_as_compiler
Added: packages/semweb/trunk/debian/patches/use_csc_as_compiler.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/patches/use_csc_as_compiler.dpatch?rev=4050&op=file
==============================================================================
--- packages/semweb/trunk/debian/patches/use_csc_as_compiler.dpatch (added)
+++ packages/semweb/trunk/debian/patches/use_csc_as_compiler.dpatch Mon Mar 2 15:22:35 2009
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_csc_as_compiler.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch changes the hard-coded compiler to our "csc" default
+
+ at DPATCH@
+diff -urNad semweb-1.05+dfsg.orig/Makefile semweb-1.05+dfsg/Makefile
+--- semweb-1.05+dfsg.orig/Makefile 2009-03-02 15:13:25.000000000 +0000
++++ semweb-1.05+dfsg/Makefile 2009-03-02 15:13:40.000000000 +0000
+@@ -35,12 +35,12 @@
+
+ ifeq "$(PROFILE)" "DOTNET2"
+ BIN=bin_generics
+-MCS=gmcs -d:DOTNET2
++MCS=/usr/bin/csc -d:DOTNET2
+ endif
+
+ ifeq "$(PROFILE)" "DOTNET3"
+ BIN=bin_linq
+-MCS=gmcs -d:DOTNET3 -langversion:linq
++MCS=/usr/bin/csc -d:DOTNET3 -langversion:linq
+ endif
+
+ ifeq "$(PROFILE)" "SILVERLIGHT"
Propchange: packages/semweb/trunk/debian/patches/use_csc_as_compiler.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/semweb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/rules?rev=4050&op=diff
==============================================================================
--- packages/semweb/trunk/debian/rules (original)
+++ packages/semweb/trunk/debian/rules Mon Mar 2 15:22:35 2009
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
export DH_VERBOSE=1
+export MONO_DISABLE_SHM=1
DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
VERSION = $(shell echo $(DEB_VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
@@ -11,7 +12,6 @@
bin_generics/SemWeb.SqliteStore.dll \
bin_generics/SemWeb.SQLServerStore.dll
-include /usr/share/cli-common/cli.make
include /usr/share/dpatch/dpatch.make
build: patch-stamp
@@ -28,8 +28,7 @@
done
dh $@ --after build
- # build API docs for all libraries
- # BUG: this only generates docs for the last library
+ # build API docs
#for LIB in $(LIBS); do \
# monodocer \
# --assembly:$$LIB \
@@ -44,23 +43,42 @@
install: build
dh $@ --before dh_install
- install -D $(CURDIR)/debian/semweb.pc \
- $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
+ # pkg-config
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
+ cp debian/semweb.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
+ mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb.pc \
+ $(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
perl -pe 's/#VERSION#/$(VERSION)/' -i \
$(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
perl -pe 's/#DEB_CLI_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
$(CURDIR)/debian/tmp/usr/lib/pkgconfig/semweb-$(DEB_CLI_ABI_VERSION).pc
dh $@ --remaining
+ dh $@ --until dh_install
+ dh_installcligac -i
+ dh $@ --after dh_install
+
+ dh $@ --until dh_fixperms
+ dh_clifixperms -i
+ dh $@ --after dh_fixperms
+
binary: binary-indep
binary-indep: install
- dh $@ --before dh_makeclilibs
+ dh_clistrip -i
dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
- dh $@ --after dh_makeclilibs
+ dh_shlibdeps -i
+ dh_clideps -i
+
+ dh $@
clean: unpatch
- # delete the API docs we generated
- rm -rf bin_generics/monodocer/
+ # clean up our signing key
+ rm -f debian/semweb.snk
+ # clean up our API docs
+ rm -f bin_generics/SemWeb.tree \
+ bin_generics/SemWeb.zip
+ rm -rf bin_generics/monodocer
+
# workaround for broken "make clean"
for FILE in $(LIBS) \
bin_generics/SemWeb.Sparql.dll \
Modified: packages/semweb/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/semweb/trunk/debian/watch?rev=4050&op=diff
==============================================================================
--- packages/semweb/trunk/debian/watch (original)
+++ packages/semweb/trunk/debian/watch Mon Mar 2 15:22:35 2009
@@ -1,2 +1,3 @@
version=3
-http://razor.occams.info/code/semweb/ semweb-([\d\.]+)\.tgz
+opts=dversionmangle=s/\+dfsg// \
+ http://razor.occams.info/code/semweb/ semweb-([\d\.]+)\.tgz
More information about the Pkg-cli-libs-commits
mailing list