[Pkg-cli-libs-commits] [flickrnet] 02/02: Switch debian/rules from CDBS to dh, use xbuild for build

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository flickrnet.

commit 0ab43e17d44d6ffa8bf64e68340dfc5c1c21e6f2
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Tue Apr 18 08:54:49 2017 +0100

    Switch debian/rules from CDBS to dh, use xbuild for build
---
 debian/changelog   |  1 +
 debian/compile.sh  |  1 -
 debian/control     |  2 +-
 debian/orig-tar.sh | 21 ---------------------
 debian/rules       | 47 +++++++++++++++++++++++++----------------------
 5 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8769642..c319d8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ flickrnet (1:3.24+dfsg-1) UNRELEASED; urgency=medium
   * Bump debhelper compat level to 9
   * Update VCS URLs 
   * Update debian/copyright (now dual LGPL 2.1+, Apache 2.0) 
+  * Switch debian/rules from CDBS to dh, use xbuild for build 
 
  -- Christopher Hoskin <mans0954 at debian.org>  Mon, 17 Apr 2017 18:12:06 +0100
 
diff --git a/debian/compile.sh b/debian/compile.sh
deleted file mode 100644
index 62b0f2b..0000000
--- a/debian/compile.sh
+++ /dev/null
@@ -1 +0,0 @@
-mono-csc -debug -target:library -out:FlickrNet.dll  -r:System.Web.dll -r:System.Drawing.dll *.cs
diff --git a/debian/control b/debian/control
index f26086c..5194193 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 9)
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: mono-devel (>= 2.4.3),
  pkg-config,
  cli-common-dev (>= 0.5.7)
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 764ac4e..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-
-TAR=../libflickrnet_$1.orig.tar.gz
-DIR=libflickrnet-$1
-ZIP=FlickrNet-$1.zip
-
-# clean up the upstream tarball
-unzip $ZIP -d $DIR
-tar -c -z -f $TAR $DIR
-rm -rf $DIR $ZIP
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
-fi
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 453d231..d50ff9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,38 @@
 #!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
 
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-export MONO_SHARED_DIR := /tmp
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-build: debian/stamp-build build-arch build-indep
-debian/stamp-build:
-	(cd FlickrNet; $(SHELL) ../debian/compile.sh)
-	touch $@
+#Keep version as 2.2 until we determine the correct version
+VERSION=2.2
+DEB_DESTDIR=debian/tmp
 
-clean::
-	$(RM) FlickrNet/FlickrNet.dll FlickrNet/FlickrNet.dll.mdb debian/stamp-build
+%:
+	dh $@ --with cli
 
-VERSION=2.2
-install/libflickrnet$(VERSION)-cil::
-	dh_install -plibflickrnet$(VERSION)-cil FlickrNet/FlickrNet.dll /usr/lib/cli/FlickrNet-$(VERSION)/
+override_dh_auto_build:
+	xbuild /p:Configuration=Release FlickrNet/FlickrNet.csproj
 
-install/libflickrnet-cil-dev::
+override_dh_auto_install:
+#Install to debian/tmp
+	install -D FlickrNet/bin/Release/FlickrNet.dll $(DEB_DESTDIR)/usr/lib/cli/FlickrNet-$(VERSION)/FlickrNet.dll 
 	install -m644 -D debian/flickrnet.pc $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet.pc
 	sed -i "s/@VERSION@/$(VERSION)/g" $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet.pc
-	dh_install -plibflickrnet-cil-dev
+#Install to debian/libflickrnet$(VERSION)-cil
+	dh_install -plibflickrnet$(VERSION)-cil $(DEB_DESTDIR)/usr/lib/cli/FlickrNet-$(VERSION)/FlickrNet.dll /usr/lib/cli/FlickrNet-$(VERSION)/
 
-binary-install/libflickrnet$(VERSION)-cil::
-	dh_installcligac -plibflickrnet$(VERSION)-cil
-	dh_cligacpolicy
-	dh_clifixperms
+override_dh_auto_clean:
+	xbuild /p:Configuration=Release /t:Clean FlickrNet/FlickrNet.csproj
+	dh_auto_clean
 
-binary-predeb/libflickrnet$(VERSION)-cil::
-	dh_makeclilibs -plibflickrnet$(VERSION)-cil
-	dh_clideps -d
 
-get-orig-source:
-	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/flickrnet.git