[Pkg-cli-libs-commits] r4225 - in /packages/gnome-desktop-sharp2/trunk/debian: changelog control libnautilusburn2.20-cil.install libnautilusburn2.20-cil.installcligac libnautilusburn2.20-cil.links patches/01_dllmaps.dpatch rules watch

directhex-guest at users.alioth.debian.org directhex-guest at users.alioth.debian.org
Wed Sep 2 10:48:59 UTC 2009 

Author: directhex-guest
Date: Wed Sep  2 10:48:59 2009
New Revision: 4225

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4225
Log:
  NOT READY YET - GTKSOURCEVIEW ABI BROKEN WITH UNBUMPED ASSEMBLY VER

  * New upstream release
  * debian/libnautilusburn2.20-cil.*,
    debian/control:
    + Remove libnautilusburn2.20-cil and build-deps, obsoleted in GNOME 
  * debian/patches/01_dllmaps.dpatch:
    + Refresh to remove nautilusburn reference and SONAME change
  * debian/rules:
    + Add a get-orig-source rule
    + Bump API version to 2.26
    + Stop renaming the nautilusburn pcfile
  * debian/rules,
    debian/control:
    + Switch compiler to mono-csc for Mono 2.4.2 transition
    + Ensure minimum mono-devel version is 2.4.2
  * debian/control:
    + Update to Standards 3.8.3 (no changes)
  * debian/watch:
    + Remove troublesome uupdate command

Removed:
    packages/gnome-desktop-sharp2/trunk/debian/libnautilusburn2.20-cil.install
    packages/gnome-desktop-sharp2/trunk/debian/libnautilusburn2.20-cil.installcligac
    packages/gnome-desktop-sharp2/trunk/debian/libnautilusburn2.20-cil.links
Modified:
    packages/gnome-desktop-sharp2/trunk/debian/changelog
    packages/gnome-desktop-sharp2/trunk/debian/control
    packages/gnome-desktop-sharp2/trunk/debian/patches/01_dllmaps.dpatch
    packages/gnome-desktop-sharp2/trunk/debian/rules
    packages/gnome-desktop-sharp2/trunk/debian/watch

Modified: packages/gnome-desktop-sharp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-desktop-sharp2/trunk/debian/changelog?rev=4225&op=diff
==============================================================================
--- packages/gnome-desktop-sharp2/trunk/debian/changelog (original)
+++ packages/gnome-desktop-sharp2/trunk/debian/changelog Wed Sep  2 10:48:59 2009
@@ -1,3 +1,28 @@
+gnome-desktop-sharp2 (2.26.0-1) UNRELEASED; urgency=low
+
+  NOT READY YET - GTKSOURCEVIEW ABI BROKEN WITH UNBUMPED ASSEMBLY VER
+
+  * New upstream release
+  * debian/libnautilusburn2.20-cil.*,
+    debian/control:
+    + Remove libnautilusburn2.20-cil and build-deps, obsoleted in GNOME 
+  * debian/patches/01_dllmaps.dpatch:
+    + Refresh to remove nautilusburn reference and SONAME change
+  * debian/rules:
+    + Add a get-orig-source rule
+    + Bump API version to 2.26
+    + Stop renaming the nautilusburn pcfile
+  * debian/rules,
+    debian/control:
+    + Switch compiler to mono-csc for Mono 2.4.2 transition
+    + Ensure minimum mono-devel version is 2.4.2
+  * debian/control:
+    + Update to Standards 3.8.3 (no changes)
+  * debian/watch:
+    + Remove troublesome uupdate command
+
+ -- Jo Shields <directhex at apebox.org>  Wed, 02 Sep 2009 10:37:09 +0100
+
 gnome-desktop-sharp2 (2.24.0-5) unstable; urgency=low
 
   * debian/patches/03_fix_pkg-config_paths.dpatch:

Modified: packages/gnome-desktop-sharp2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-desktop-sharp2/trunk/debian/control?rev=4225&op=diff
==============================================================================
--- packages/gnome-desktop-sharp2/trunk/debian/control (original)
+++ packages/gnome-desktop-sharp2/trunk/debian/control Wed Sep  2 10:48:59 2009
@@ -9,7 +9,7 @@
  libtool,
  autoconf,
  automake,
- mono-devel (>= 2.0.1),
+ mono-devel (>= 2.4.2),
  libmono-dev (>= 2.0.1),
  pkg-config,
  libgtk2.0-dev (>= 2.12.2),
@@ -18,7 +18,6 @@
  libglade2.0-cil (>= 2.12.7),
  gtk-sharp2-gapi (>= 2.12.7),
  libgnome2.24-cil (>= 2.24.0),
- libnautilus-burn-dev (>= 2.22.1),
  librsvg2-dev (>= 2.22.2),
  libgtkhtml3.14-dev (>= 3.18.0),
  libgtksourceview2.0-dev (>= 2.2.2),
@@ -30,14 +29,14 @@
  libpanel-applet2-dev (>= 2.23.0),
  libgnomeprint2.2-dev (>= 2.18.0),
  libgnomeprintui2.2-dev (>= 2.18.0)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.mono-project.com/GtkSharp
 Vcs-Svn: svn://svn.debian.org/pkg-cli-libs/packages/gnome-desktop-sharp2/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-desktop-sharp2/trunk/
 
 Package: gnome-desktop-sharp2
 Architecture: all
-Depends: libgtkhtml3.16-cil, librsvg2-2.18-cil, libvte0.16-cil, libgnomedesktop2.20-cil, libgtksourceview2-2.0-cil, libwnck2.20-cil, libnautilusburn2.20-cil, libgnomeprint2.18-cil, libgnomepanel2.24-cil
+Depends: libgtkhtml3.16-cil, librsvg2-2.18-cil, libvte0.16-cil, libgnomedesktop2.20-cil, libgtksourceview2-2.0-cil, libwnck2.20-cil, libgnomeprint2.18-cil, libgnomepanel2.24-cil
 Description: GNOME Desktop# 2.24 suite, CLI bindings for GNOME
  GNOME Desktop# 2.24 is a CLI (.NET) language binding for the GNOME 2.24
  desktop libraries.
@@ -111,17 +110,6 @@
  GNOME Desktop# 2.24 is a CLI (.NET) language binding for the GNOME 2.24
  desktop libraries.
 
-Package: libnautilusburn2.20-cil
-Architecture: any
-Suggests: monodoc-gtk2.0-manual
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
-Description: CLI binding for Nautilus Burn 2.24
- This package provides the nautilusburn-sharp assembly that allows CLI (.NET)
- programs to use the nautilus burn libraries 2.24.
- .
- GNOME Desktop# 2.24 is a CLI (.NET) language binding for the GNOME 2.24
- desktop libraries.
-
 Package: libgnomepanel2.24-cil
 Architecture: any
 Suggests: monodoc-gtk2.0-manual

Modified: packages/gnome-desktop-sharp2/trunk/debian/patches/01_dllmaps.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-desktop-sharp2/trunk/debian/patches/01_dllmaps.dpatch?rev=4225&op=diff
==============================================================================
--- packages/gnome-desktop-sharp2/trunk/debian/patches/01_dllmaps.dpatch (original)
+++ packages/gnome-desktop-sharp2/trunk/debian/patches/01_dllmaps.dpatch Wed Sep  2 10:48:59 2009
@@ -1,16 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
 @DPATCH@
-diff -urNad gnome-desktop-sharp-2.24.0~/gnomedesktop/gnomedesktop-sharp.dll.config.in gnome-desktop-sharp-2.24.0/gnomedesktop/gnomedesktop-sharp.dll.config.in
---- gnome-desktop-sharp-2.24.0~/gnomedesktop/gnomedesktop-sharp.dll.config.in	2008-08-27 02:48:50.000000000 +0200
-+++ gnome-desktop-sharp-2.24.0/gnomedesktop/gnomedesktop-sharp.dll.config.in	2009-04-19 20:06:59.000000000 +0200
-@@ -3,5 +3,5 @@
-   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
-   <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
-   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
--  <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2 at LIB_PREFIX@.7 at LIB_SUFFIX@"/>
-+  <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2 at LIB_PREFIX@.11 at LIB_SUFFIX@"/>
- </configuration>
 diff -urNad gnome-desktop-sharp-2.24.0~/gnomepanel/gnome-panel-sharp.dll.config.in gnome-desktop-sharp-2.24.0/gnomepanel/gnome-panel-sharp.dll.config.in
 --- gnome-desktop-sharp-2.24.0~/gnomepanel/gnome-panel-sharp.dll.config.in	2009-04-19 19:21:21.000000000 +0200
 +++ gnome-desktop-sharp-2.24.0/gnomepanel/gnome-panel-sharp.dll.config.in	2009-04-19 20:06:29.000000000 +0200
@@ -38,14 +28,6 @@
    <dllmap dll="gtksourceview-2.0" target="libgtksourceview-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
 +  <dllmap dll="gtksourceview2sharpglue-2" target="/usr/lib/cli/gtksourceview2-sharp-2.0/libgtksourceview2sharpglue-2.so"/>
  </configuration>
-diff -urNad gnome-desktop-sharp-2.24.0~/nautilusburn/nautilusburn-sharp.dll.config.in gnome-desktop-sharp-2.24.0/nautilusburn/nautilusburn-sharp.dll.config.in
---- gnome-desktop-sharp-2.24.0~/nautilusburn/nautilusburn-sharp.dll.config.in	2009-04-19 19:21:21.000000000 +0200
-+++ gnome-desktop-sharp-2.24.0/nautilusburn/nautilusburn-sharp.dll.config.in	2009-04-19 20:06:29.000000000 +0200
-@@ -1,3 +1,4 @@
- <configuration>
-   <dllmap dll="nautilus-burn" target="libnautilus-burn at LIB_PREFIX@.4 at LIB_SUFFIX@"/>
-+  <dllmap dll="nautilusburnsharpglue-2" target="/usr/lib/cli/nautilusburn-sharp-2.20/libnautilusburnsharpglue-2.so"/>
- </configuration>
 diff -urNad gnome-desktop-sharp-2.24.0~/vte/vte-sharp.dll.config.in gnome-desktop-sharp-2.24.0/vte/vte-sharp.dll.config.in
 --- gnome-desktop-sharp-2.24.0~/vte/vte-sharp.dll.config.in	2009-04-19 19:21:21.000000000 +0200
 +++ gnome-desktop-sharp-2.24.0/vte/vte-sharp.dll.config.in	2009-04-19 20:06:29.000000000 +0200

Modified: packages/gnome-desktop-sharp2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-desktop-sharp2/trunk/debian/rules?rev=4225&op=diff
==============================================================================
--- packages/gnome-desktop-sharp2/trunk/debian/rules (original)
+++ packages/gnome-desktop-sharp2/trunk/debian/rules Wed Sep  2 10:48:59 2009
@@ -9,10 +9,17 @@
 CFLAGS ?= -O2 -Wall -g
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-API_VERSION = 2.24.0
+API_VERSION = 2.26.0
 
-UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
-NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
+SOURCE_DIR = $(DEBIAN_DIR)/..
+
+DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)
+DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
+VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
+NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(VERSION))
+
 
 autoreconf: autoreconf-stamp
 autoreconf-stamp: patch-stamp
@@ -25,7 +32,7 @@
 	dh_testdir
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
 		--prefix=/usr \
-		CSC=/usr/bin/csc \
+		CSC=/usr/bin/mono-csc \
 		MONO_CAIRO_LIBS=-r:Mono.Cairo
 	touch $@
 
@@ -63,8 +70,6 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp RUNTIME=/usr/bin/cli
-	mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/nautilusburn-sharp.pc \
-	   $(CURDIR)/debian/tmp/usr/lib/pkgconfig/nautilusburn-sharp-2.20.pc
 	mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/wnck-sharp-1.0.pc \
 	   $(CURDIR)/debian/tmp/usr/lib/pkgconfig/wnck-sharp-2.20.pc
 	mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/gtksourceview2-sharp.pc \
@@ -126,4 +131,15 @@
 build: build-indep build-arch
 binary: binary-indep binary-arch
 
-.PHONY: autoreconf config build-indep build-arch clean binary-indep binary-arch build binary patch
+get-orig-source:
+	mkdir -p ../tarballs
+	uscan \
+		--package $(DEB_SOURCE_NAME) \
+		--watchfile $(DEBIAN_DIR)/watch \
+		--upstream-version $(VERSION) \
+		--download-version $(VERSION) \
+		--destdir ../tarballs \
+		--force-download \
+		--rename
+
+.PHONY: autoreconf config build-indep build-arch clean binary-indep binary-arch build binary patch get-orig-source

Modified: packages/gnome-desktop-sharp2/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-desktop-sharp2/trunk/debian/watch?rev=4225&op=diff
==============================================================================
--- packages/gnome-desktop-sharp2/trunk/debian/watch (original)
+++ packages/gnome-desktop-sharp2/trunk/debian/watch Wed Sep  2 10:48:59 2009
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/gnome/sources/gnome-desktop-sharp/([\d\.]+)/gnome-desktop-sharp-([\d\.]+)\.tar\.gz debian uupdate
+http://ftp.gnome.org/pub/gnome/sources/gnome-desktop-sharp/([\d\.]+)/gnome-desktop-sharp-([\d\.]+)\.tar\.gz

More information about the Pkg-cli-libs-commits mailing list