summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Shadura <andrew.shadura@collabora.co.uk>2015-12-25 16:05:08 (GMT)
committerAndrew Shadura <andrew.shadura@collabora.co.uk>2015-12-25 16:05:31 (GMT)
commitf38f4cca899e441382cfabf0123322279487f6b1 (patch)
treeb377ef2a758f1a453491130a50177991cc1607f0
parent57a75b222743462d447f227893bb484326efd756 (diff)
downloadfonts-karla-f38f4cca899e441382cfabf0123322279487f6b1.tar.gz
fonts-karla-f38f4cca899e441382cfabf0123322279487f6b1.tar.xz
Update the packaging.
-rw-r--r--debian/changelog2
-rw-r--r--debian/control5
-rw-r--r--debian/copyright10
-rwxr-xr-xdebian/get-orig-source.sh17
-rwxr-xr-xdebian/rules33
5 files changed, 33 insertions, 34 deletions
diff --git a/debian/changelog b/debian/changelog
index abd5d81..b1a1f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-fonts-karla (0~20140620-1) unstable; urgency=low
+fonts-karla (20151208-1) unstable; urgency=low
* Initial release.
diff --git a/debian/control b/debian/control
index 8db0a79..685f527 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
Source: fonts-karla
Section: fonts
Priority: optional
-Maintainer: Jordi Mallach <jordi.mallach@collabora.co.uk>
+Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
+Uploaders: Andrew Shadura <andrewsh@debian.org>, Jordi Mallach <jordi@debian.org>
Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.google.com/fonts/specimen/Karla
Vcs-Git: git://git.collabora.com/git/users/jordi/fonts-karla.git
Vcs-Browser: http://cgit.collabora.com/git/user/jordi/fonts-karla.git/
diff --git a/debian/copyright b/debian/copyright
index d3a0579..99f94db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,14 @@ Upstream-Name: fonts-karla
Source: http://www.google.com/fonts/specimen/Karla
Files: *
-Copyright: 2014 Jonathan Pinhorn
+Copyright: 2011-2012, Jonathan Pinhorn <jonpinhorn.typedesign@gmail.com>
License: OFL-1.1
Files: debian/*
-Copyright: 2014 Jordi Mallach <jordi.mallach@collabora.co.uk>
-License: OFL-1.1 or GPL-2.0+
+Copyright:
+ 2014 Jordi Mallach <jordi.mallach@collabora.co.uk>
+ 2015 Andrew Shadura <andrewsh@debian.org>
+License: OFL-1.1 or GPL-2+
License: OFL-1.1
Copyright (c) 2011-2012, Jonathan Pinhorn (jonpinhorn.typedesign@gmail.com),
@@ -105,7 +107,7 @@ License: OFL-1.1
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
-License: GPL-2.0+
+License: GPL-2+
This package 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 2 of the License, or
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
new file mode 100755
index 0000000..932ff37
--- /dev/null
+++ b/debian/get-orig-source.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+svn co https://github.com/google/fonts/trunk/ofl/karla debian/orig-source/karla.svn
+
+cd debian/orig-source/karla.svn
+
+DATE=$(date -d "$(svn info --xml | grep -o '<date>.*</date>' | grep -o '[0-9TZ:.+-]*')" +%Y%m%d)
+
+svn export . ../karla-${DATE}
+
+cd -
+
+PACKAGE=$(dpkg-parsechangelog -S Source)
+
+tar --owner=root --group=root --mode=a+rX -cJf ${PACKAGE}_${DATE}.orig.tar.xz -C debian/orig-source karla-${DATE}
+
+rm -rf debian/orig-source
diff --git a/debian/rules b/debian/rules
index ce15cce..c0adac6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,11 @@
#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# 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
-
-
-# main packaging script based on dh7 syntax
%:
- dh $@
-
-# debmake generated override targets
-# This is example for Cmake (See http://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-# dh_auto_configure -- \
-# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
-
+ dh $@
+get-orig-source:
+ @d=$$(readlink -e $(MAKEFILE_LIST)); \
+ cd $${d%/*}/..; \
+ debian/get-orig-source.sh $(CURDIR)
+.PHONY: get-orig-source