[Pkg-cli-libs-commits] [SCM] gkeyfile-sharp-1.0 branch, master, updated. upstream/0.1.git20100708.c2998a9-9-g46217c6

Tue Aug 31 13:51:09 UTC 2010

The following commit has been merged in the master branch:
commit 8e30b2e6c943e911d92c27c24b190823a1df594f
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Aug 31 18:00:51 2010 +0800

    Integrate changes from didrocks
    
     * debian/control:
       + Uploaders
       + Standards-Version
       + Homepage
       + Short descriptions
     * debian/copyright: Update to include missing files and copyrights
     * debian/rules:
       + Implement get-orig-source (also includes changes to support
       --reference if $(GIT_REFURL) is set)

diff --git a/debian/control b/debian/control
index c8e708d..549f1e1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: gkeyfile-sharp-1.0
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Chow Loong Jin <hyperair at ubuntu.com>
+           Didier Roche <didrocks at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
                mono-devel (>= 2.4.3),
                cli-common-dev (>= 0.5.7),
@@ -9,26 +10,27 @@ Build-Depends: debhelper (>= 7.0.50),
                libglib2.0-dev (>= 2.6),
                libglib2.0-cil-dev (>= 2.12.9),
                gtk-sharp2-gapi (>= 1.9.0)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Section: cli-mono
 Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/gkeyfile-sharp-1.0.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/gkeyfile-sharp-1.0.git
+Homepage: https://www.launchpad.net/gkeyfile-sharp
 
 Package: libgkeyfile1.0-cil
 Architecture: all
 Depends: ${cli:Depends}, ${misc:Depends}
-Description: Key-value file parser -- CLI bindings
+Description: GObject-based wrapper library for GKeyFile -- CLI bindings
  gkeyfile-sharp is a set of CLI bindings for the GKeyFile GObject class found in
  GLib. GKeyFile is a class that is used for parsing, editing, and creating key
  files, which are .ini like configuration files.
  .
- This package contains the runtime assembly of gkeyfile-sharp, which are needed
- to run CLI applications which use this library.
+ This package contains the managed CLI bindings for gkeyfile-sharp, which are
+ needed to run CLI applications which use this library.
 
 Package: libgkeyfile1.0-cil-dev
 Architecture: all
-Depends: libgkeyfile1.0-cil (= ${binary:Version}), ${misc:Depends}
-Description: Key-value file parser -- CLI development files
+Depends: libgkeyfile1.0-cil (= ${binary:Version}),${misc:Depends}
+Description: GObject-based wrapper library for GKeyFile -- CLI development files
  gkeyfile-sharp is a set of CLI bindings for the GKeyFile GObject class found in
  GLib. GKeyFile is a class that is used for parsing, editing, and creating key
  files, which are .ini like configuration files.
@@ -45,4 +47,4 @@ Description: compiled XML documentation for gkeyfile-sharp
  GLib. GKeyFile is a class that is used for parsing, editing, and creating key
  files, which are .ini like configuration files.
  .
- This package contains the compiled XML documentation for gkeyfile-sharp
+ This package contains the compiled XML documentation for gkeyfile-sharp.
diff --git a/debian/copyright b/debian/copyright
index 509a101..8184ea5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
 Name: gkeyfile-sharp-1.0
 Maintainer: Alex Launi <alex.launi at gmail.com>
-Source: https://www.gitorious.org/gkeyfile-sharp/gkeyfile-sharp
+Source: http://www.gitorious.org/gkeyfile-sharp/
 
 Files: *
-Copyright: Alex Launi <alex.launi at gmail.com>
+Copyright: 2010 Alex Launi <alex.launi at gmail.com>
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -16,16 +16,51 @@ License: LGPL-2.1+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
  .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- .
  On Debian systems, the full text of this license can be found in
  /usr/share/common-licenses/LGPL-2.1.
 
+Files: GKeyFile/Tests/src/GKeyfileTests.cs
+Copyright: 2010 Alex Launi <alex.launi at gmail.com>
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of this license can be found in
+ /usr/share/common-licenses/GPL-3.
+
+Files: sample/sample.cs
+Copyright: 2008 Stephane Delcroix <stephane at delcroix.org>
+License: other
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright: Chow Loong Jin <hyperair at ubuntu.com>
+Copyright: 2010 Chow Loong Jin <hyperair at ubuntu.com>
+           2010 Didier Roche <didrocks at ubuntu.com>
+           2010 Iain Lane <laney at ubuntu.com>
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -37,9 +72,5 @@ License: GPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
  On Debian systems, the full text of this license can be found in
  /usr/share/common-licenses/GPL-2.
diff --git a/debian/rules b/debian/rules
index 95185f1..785d908 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,25 @@
 
 include /usr/share/cli-common/cli.make
 
+GIT_URL := git://gitorious.org/gkeyfile-sharp/gkeyfile-sharp.git
+GIT_BRANCH := "master"
+GIT_BRANCH_NAME := gkeyfile-sharp-1.0
+
+DEB_SOURCE := $(shell dpkg-parsechangelog -l$(dir $(_))/changelog | grep '^Source:' | cut -d" " -f2)
+DEB_VERSION := $(shell dpkg-parsechangelog -l$(dir $(_))/changelog | grep '^Version:' | cut -d" " -f2)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
+DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//')
+
+DEB_GIT_ID := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/.*git\.[[:digit:]]\.\([[:xdigit:]]*\)/\1/')
+
 DEB_API_VERSION = 1.0
 DEB_ABI_VERSION = 1.0
 CLIDIR = debian/tmp/usr/lib/cli/gkeyfile-sharp-$(DEB_ABI_VERSION)/
 
+ifdef GIT_REFURL
+GIT_REFERENCE = --reference="$(GIT_REFURL)"
+endif
+
 override_dh_auto_configure:
 	dh_auto_configure -- CSC=/usr/bin/mono-csc
 
@@ -37,3 +52,21 @@ override_dh_makeclilibs:
 
 %:
 	dh $@
+# Stolen from connman package, thanks asac!
+
+GET_SOURCE = \
+	set -e; \
+	tmpdir=`mktemp -d -t`; \
+	cd $$tmpdir; \
+		echo "cloning upstream repository ..."; \
+		git clone $(GIT_REFERENCE) $(GIT_URL) $(GIT_BRANCH_NAME); \
+		echo "getting specific upstream revision/tag: $(1)"; \
+		cd `ls | head -n 1`; git checkout -b orig $(1); \
+		echo -n "creating orig tarball ..."; \
+		cd ..; tar --exclude=.git -czf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
+		cd $(CURDIR); rm -rf $$tmpdir; \
+		echo " done";
+
+get-orig-source:
+	$(call GET_SOURCE, $(DEB_GIT_ID), "orig")
+

-- 
gkeyfile-sharp-1.0

