summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/README.source4
-rw-r--r--debian/changelog110
-rw-r--r--debian/control23
-rw-r--r--debian/copyright99
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/oregano.README.Debian10
-rw-r--r--debian/oregano.examples1
-rw-r--r--debian/oregano.install1
-rw-r--r--debian/oregano.menu6
-rw-r--r--debian/patches/0003-Remove-Encoding-field-in-desktop-file.patch19
-rw-r--r--debian/patches/0004-Spelling-fixes.patch44
-rw-r--r--debian/patches/0007-Update-russian-translation.patch55
-rw-r--r--debian/patches/clang_FTBFS_Wreturn-type.patch23
-rw-r--r--debian/patches/series4
-rwxr-xr-xdebian/repack-waf48
-rwxr-xr-xdebian/rules30
-rw-r--r--debian/watch7
17 files changed, 375 insertions, 111 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..7ba0ad0
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+The upstream tarball has been repacked with 'waf' extracted.
+
+Also some models with licenses which due not allow reselling have been excluded
+via Files-Excluded in debian/copyright
diff --git a/debian/changelog b/debian/changelog
index 298da3b..2fac073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,57 +1,51 @@
-oregano (0.84.41-0) unstable; urgency=low
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Fri, 4 Jan 2019 12:18:52 +0200
-
-oregano (0.84.40-0) unstable; urgency=low
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Fri, 21 Sep 2018 09:13:57 +0200
-
-oregano (0.84.39-0) unstable; urgency=high
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Thu, 1 Aug 2018 19:36:57 +0200
-
-oregano (0.84.38-0) unstable; urgency=high
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Thu, 1 Aug 2018 09:10:44 +0200
-
-oregano (0.84.21-0) unstable; urgency=high
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Sat, 16 Dec 2017 10:10:44 +0200
-
-oregano (0.84.20-0) unstable; urgency=high
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Sat, 16 Dec 2017 09:21:12 +0200
-
-oregano (0.84.13-0) unstable; urgency=high
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Thu, 24 Aug 2017 08:01:44 +0200
-
-oregano (0.84.12-0) unstable; urgency=high
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Wed, 23 Aug 2017 21:00:44 +0200
-
-oregano (0.83.2-0) unstable; urgency=high
-
- * Update upstream
-
- -- Bernhard Schuster <bernhard@ahoi.io> Fri, 15 May 2015 00:35:44 +0200
-
+oregano (0.84.40+dfsg.1-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #875473)
+ * Adopt into the Debian Electronics team (Closes: #890503)
+ - Changed Maintainer, Uploaders, VCS urls.
+ - Thanks, Maximiliano, for maintaining it many years!
+ * DH level updated to 11
+ * debian/changelog: Fix some whitespaces
+ * debian/control:
+ - Changes related to new maintainer
+ - New upstream homepage
+ - New standards version 4.2.1 - no changes
+ - Update some build-dependencies
+ - Drop the (build-)dependency against gnome-vfs (Closes: #868401)
+ - Drop the build-dependency against scrollkeeper (Closes: #885614)
+ - Added python since now built using 'waf'
+ * debian/copyright:
+ - HTTPS URL for Format field
+ - Exclude a few model files with slightly troublesome licenses.
+ * debian/gbp.conf: Added to enforce pristine-tar
+ * debian/patches:
+ - Refreshed patches and deleted outdated ones
+ - New patch: 0003-Remove-Encoding-field-in-desktop-file.patch
+ - New patch: debian/patches/0004-Spelling-fixes.patch
+ * debian/README.source: Describe why the tarball is repacked
+ * debian/repack-waf:
+ - New script used by uscan/watch to repack tarball without
+ binary 'waf'.
+ * debian/rules:
+ - Delete gschemas.compiled in install
+ - Properly clean up in dh_clean
+ - Update to call 'waf' to build the package
+ * debian/watch:
+ - Call debian/repack-waf
+ - Mangle version adding +dfsg
+ - New upstream URL
+
+ -- Ruben Undheim <rubund@debian.org> Sat, 13 Oct 2018 13:05:56 +0200
+
+oregano (0.70-3) unstable; urgency=medium
+
+ * Refresh patches.
+ * New patch: 0007-Update-russian-translation.patch (Closes: #804278)
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Bump debhelper compat and build dep to 9.
+ * Update copyright information.
+
+ -- Maximiliano Curia <maxy@debian.org> Sun, 08 Nov 2015 18:39:47 +0100
oregano (0.70-2) unstable; urgency=medium
@@ -179,14 +173,14 @@ oregano (0.40.5-2) unstable; urgency=low
(Closes: #350293).
* Updates french translation - thanks to Jean-Luc Coulon
<jean-luc.coulon@wanadoo.fr> (Closes: #354596).
-
+
-- Maximiliano Curia <maxy@gnuservers.com.ar> Fri, 14 Apr 2006 14:02:59 -0300
oregano (0.40.5-1) unstable; urgency=low
* Updates russian translation - thanks to Yuri Kozlov <yuray@id.ru>
(Closes: #326925).
- * Updates brazilian portuguese translation - thanks to
+ * Updates brazilian portuguese translation - thanks to
"Felipe Augusto van de Wiel (faw)" <felipe@cathedrallabs.org>
(Closes: #348130).
* New upstream release.
@@ -350,7 +344,3 @@ oregano (0.18-1) unstable; urgency=low
* Wrote man page.
-- Hugo van der Merwe <hugo@mailroom.com> Mon, 16 Oct 2000 17:54:48 +0200
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/control b/debian/control
index a2b1075..46f69da 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,29 @@
Source: oregano
Section: electronics
Priority: optional
-Maintainer: Bernhard Schuster <bernhard@ahoi.io>
-Build-Depends: debhelper (>= 7.0.50~), quilt, libtool, libglib2.0-dev ,intltool, libgtk-3-dev, libxml2-dev, libgoocanvas-2.0-dev, libgtksourceview-3.0-dev, gnucap
-Standards-Version: 3.9.2
+Maintainer: Debian Electronics Team <pkg-electronics-devel@lists.alioth.debian.org>
+Uploaders: Ruben Undheim <rubund@debian.org>
+Build-Depends: debhelper (>= 11),
+ intltool,
+ libcairo2-dev,
+ libfontconfig1-dev,
+ libfreetype6-dev (>= 2.1.0),
+ libgtk-3-dev,
+ libgoocanvas-2.0-dev,
+ libgtksourceview-3.0-dev,
+ libpng-dev,
+ libx11-dev,
+ libxml2-dev,
+ libxrender-dev (>= 0.6.0),
+ python
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/electronics-team/oregano
+Vcs-Git: https://salsa.debian.org/electronics-team/oregano.git
Homepage: https://github.com/drahnr/oregano
Package: oregano
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
Recommends: gnucap
Description: tool for schematical capture of electronic circuits
Oregano is a GNOME application for schematic capture and printing of
diff --git a/debian/copyright b/debian/copyright
index 49c709d..2c940f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,75 @@
-This package was debianized by Hugo van der Merwe <hugovdm@mail.com> on
-Mon, 16 Oct 2000 17:54:48 +0200.
-It is now maintained by Maximiliano Curia <maxy@gnuservers.com.ar>.
-
-Upstream authors:
- Ricardo Markiewicz <rmarkie@fi.uba.ar>
- Andrés de Barbará <adebarbara@fi.uba.ar>
- Marc Lorber <lorber.marc@wanadoo.fr>
- Bernhard Schuster <bernhard@ahoi.io>
-
-Upstream source: https://github.com/drahnr/oregano.git
-
-Copyright and licensing info:
-
- * Copyright (C) 1999-2001 Richard Hult
- * Copyright (C) 2003-2008 Ricardo Markiewicz
- * Copyright (C) 2009-2012 Marc Lorber
- * Copyright (C) 2012-2018 Bernhard Schuster
-
-On Debian Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2006, Maximiliano Curia <maxy@debian.org> and
-is licensed under the GPL, see above.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: oregano
+Files-Excluded: data/models/OP77.model
+ data/models/LM324.model
+ data/models/LM741.model
+
+Files: *
+Copyright: 1989-2005 Free Software Foundation, Inc
+ 2003-2008 Ricardo Markiewicz
+ 1999-2001 Richard Hult
+ 2003-2006 LUGFi
+ 2009-2012 Marc Lorber
+ 2012-2014 Bernhard Schuster
+ 2017 Guido Trentalancia
+License: GPL-2+
+
+Files: po/*
+Copyright: 1989-2005 Free Software Foundation, Inc
+ 1999-2002 Richard Hult
+ 1999 Elker Cavina <e.cavina@ra.nettuno.it>
+ 2000 Joan Peris <juanpar@alumni.uv.es>
+ 2000 Toni Cunyat <ancua@alumni.uv.es>
+ 2000 David Monniaux <monniaux@arbouse.ens.fr>
+ 2000 Kazuya NUMATA <kaznum@gol.com>
+ 2000 Marius Andreiana <mandreiana@yahoo.com>
+ 2001 Antonio Martínez Alvarez <newton@retemail.es>
+ 2001 Marcelo Elias Del Valle <marceloelias@iname.com>
+ 2001 Valek Filippov <frob@df.ru>
+ 2004 Jordi Mallach <jordi@sindominio.net>
+ 2005 Orestes Mas <orestes@tsc.upc.edu>
+ 2005 Klaus Storz <klaus.storz@ono.com>
+ 2005 Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>
+ 2005 Yuri Kozlov <kozlov.y@gmail.com>
+ 2005 Peter Landgren <peter.talken@telia.com>
+ 2009-2012 Marc Lorber
+ 2017 Guido Trentalancia <guido@trentalancia.com>
+License: GFDL-1.1+
+
+Files: data/help/C/oregano/index.html
+ data/help/C/oregano/oregano.xml
+ data/help/es/oregano/oregano.xml
+ data/help/fr/oregano/oregano.xml
+Copyright: 2009 Marc Lorber
+ 1999,2001-2002 Richard Hult
+ 2003-2006 LUGFi
+License: GFDL-1.1+
+
+Files: debian/*
+Copyright: 2000 Hugo van der Merwe <hugovdm@mail.com>
+ 2006-2015 Maximiliano Curia <maxy@debian.org>
+ 2018 Ruben Undheim <rubund@debian.org>
+License: GPL-2+
+
+
+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
+ the Free Software Foundation; either version 2 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.
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
+
+
+License: GFDL-1.1+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License (GFDL), Version 1.1 or any later version published
+ by the Free Software Foundation with no Invariant Sections,
+ no Front-Cover Texts, and no Back-Cover Texts.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/oregano.README.Debian b/debian/oregano.README.Debian
new file mode 100644
index 0000000..0927d3c
--- /dev/null
+++ b/debian/oregano.README.Debian
@@ -0,0 +1,10 @@
+Oregano for Debian
+------------------
+
+Even though Oregano has been around for a number of years, it's still under
+heavy development and things might not work as expected.
+
+Regarding backwards compatibility, when opening oregano 0.23 files some wires
+might be out of place, and the probes will not be present.
+
+ -- Maximiliano Curia <maxy@gnuservers.com.ar> Sun, 22 Jun 2005 21:19:11 -0300
diff --git a/debian/oregano.examples b/debian/oregano.examples
new file mode 100644
index 0000000..1e660fd
--- /dev/null
+++ b/debian/oregano.examples
@@ -0,0 +1 @@
+data/examples/*
diff --git a/debian/oregano.install b/debian/oregano.install
new file mode 100644
index 0000000..7f35859
--- /dev/null
+++ b/debian/oregano.install
@@ -0,0 +1 @@
+data/mime/oregano.png /usr/share/pixmaps
diff --git a/debian/oregano.menu b/debian/oregano.menu
deleted file mode 100644
index 72bd4b8..0000000
--- a/debian/oregano.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(oregano):\
- needs="X11"\
- section="Applications/Science/Electronics"\
- hints="CAD,Simulation,Electric,Schematics"\
- title="Oregano"\
- command="/usr/bin/oregano"
diff --git a/debian/patches/0003-Remove-Encoding-field-in-desktop-file.patch b/debian/patches/0003-Remove-Encoding-field-in-desktop-file.patch
new file mode 100644
index 0000000..e3a0d3e
--- /dev/null
+++ b/debian/patches/0003-Remove-Encoding-field-in-desktop-file.patch
@@ -0,0 +1,19 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: Sat, 13 Oct 2018 12:26:16 +0200
+Subject: Remove Encoding field in desktop file
+
+---
+ data/oregano.desktop.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/oregano.desktop.in b/data/oregano.desktop.in
+index 1b3c448..8d050fa 100644
+--- a/data/oregano.desktop.in
++++ b/data/oregano.desktop.in
+@@ -8,6 +8,5 @@ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+ Categories=GTK;Science;Education;Physics;
+-Encoding=UTF-8
+ StartupNotify=true
+ MimeType=application/x-oregano;
diff --git a/debian/patches/0004-Spelling-fixes.patch b/debian/patches/0004-Spelling-fixes.patch
new file mode 100644
index 0000000..e282240
--- /dev/null
+++ b/debian/patches/0004-Spelling-fixes.patch
@@ -0,0 +1,44 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: Sat, 13 Oct 2018 12:27:02 +0200
+Subject: Spelling fixes
+
+---
+ src/netlist-editor.c | 2 +-
+ src/schematic-view.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/netlist-editor.c b/src/netlist-editor.c
+index 25352f5..6ff011b 100644
+--- a/src/netlist-editor.c
++++ b/src/netlist-editor.c
+@@ -322,7 +322,7 @@ NetlistEditor *netlist_editor_new_from_schematic_view (SchematicView *sv)
+ _ ("Could not create a netlist"), e);
+ } else {
+ log_append_error (schematic_get_log_store (sm), "Netlist",
+- _ ("Unexpected error occured"), e);
++ _ ("Unexpected error occurred"), e);
+ }
+ g_clear_error (&e);
+ return NULL;
+diff --git a/src/schematic-view.c b/src/schematic-view.c
+index f1cf234..ae48197 100644
+--- a/src/schematic-view.c
++++ b/src/schematic-view.c
+@@ -716,7 +716,7 @@ static void show_label_cmd (GtkToggleAction *toggle, SchematicView *sv)
+ _ ("Could not create a netlist."), e);
+ } else {
+ log_append_error (schematic_get_log_store (sm), _ ("SchematicView"),
+- _ ("Unexpect failure occured."), e);
++ _ ("Unexpect failure occurred."), e);
+ }
+ g_clear_error (&e);
+ return;
+@@ -871,7 +871,7 @@ static void netlist_cmd (GtkWidget *widget, SchematicView *sv)
+ _ ("Could not create a netlist."), e);
+ } else {
+ log_append_error (schematic_get_log_store (sm), _ ("SchematicView"),
+- _ ("Unexpect failure occured."), e);
++ _ ("Unexpect failure occurred."), e);
+ }
+ g_clear_error (&e);
+ return;
diff --git a/debian/patches/0007-Update-russian-translation.patch b/debian/patches/0007-Update-russian-translation.patch
new file mode 100644
index 0000000..9f1542d
--- /dev/null
+++ b/debian/patches/0007-Update-russian-translation.patch
@@ -0,0 +1,55 @@
+From: Maximiliano Curia <maxy@gnuservers.com.ar>
+Date: Sat, 7 Nov 2015 16:36:27 +0100
+Subject: Update russian translation
+
+---
+ po/ru.po | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/po/ru.po b/po/ru.po
+index b5a8c1b..2cb584d 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -8,7 +8,7 @@ msgstr ""
+ "Project-Id-Version: ru\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2006-09-11 02:36-0300\n"
+-"PO-Revision-Date: 2005-09-07 20:14+0400\n"
++"PO-Revision-Date: 2015-11-07 16:27+0100\n"
+ "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+ "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -296,11 +296,11 @@ msgstr "Настройки моделирования"
+
+ #: ../data/dialogs/sim-settings.glade2.h:16
+ msgid "Source"
+-msgstr "ц╘ц⌠ц■ц▐ц·ц▌ц┴ц▀"
++msgstr "Источник"
+
+ #: ../data/dialogs/sim-settings.glade2.h:17
+ msgid "Start"
+-msgstr "ц╨ц│ц░ц∙ц⌠ц▀"
++msgstr "Начало"
+
+ #: ../data/dialogs/sim-settings.glade2.h:18
+ msgid "Step"
+@@ -308,7 +308,7 @@ msgstr "Шаг"
+
+ #: ../data/dialogs/sim-settings.glade2.h:19
+ msgid "Stop"
+-msgstr "ц╞ц⌠ц■ц│ц▌ц▐ц≈ц▀ц│"
++msgstr "Стоп"
+
+ #: ../data/dialogs/sim-settings.glade2.h:20
+ msgid "Type"
+@@ -1041,9 +1041,8 @@ msgid "Unknown analysis"
+ msgstr "Неизвестный анализ"
+
+ #: ../src/engines/gnucap.c:693
+-#, fuzzy
+ msgid "abort"
+-msgstr "ц╨ц│ц░ц∙ц⌠ц▀"
++msgstr ""
+
+ #: ../src/engines/engine.c:32
+ msgid "Operating Point"
diff --git a/debian/patches/clang_FTBFS_Wreturn-type.patch b/debian/patches/clang_FTBFS_Wreturn-type.patch
new file mode 100644
index 0000000..884a485
--- /dev/null
+++ b/debian/patches/clang_FTBFS_Wreturn-type.patch
@@ -0,0 +1,23 @@
+From: Maximiliano Curia <maxy@debian.org>
+Date: Sat, 7 Nov 2015 16:00:53 +0100
+Subject: clang_FTBFS_Wreturn-type
+
+---
+ src/model/item-data.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/model/item-data.c b/src/model/item-data.c
+index c9391d4..0aacf2d 100644
+--- a/src/model/item-data.c
++++ b/src/model/item-data.c
+@@ -453,8 +453,8 @@ void item_data_set_property (ItemData *data, char *property, char *value)
+ {
+ ItemDataClass *id_class;
+
+- g_return_if_fail (data != NULL);
+- g_return_if_fail (IS_ITEM_DATA (data));
++ g_return_val_if_fail (data != NULL, NULL);
++ g_return_val_if_fail (IS_ITEM_DATA (data), NULL);
+
+ id_class = ITEM_DATA_CLASS (G_OBJECT_GET_CLASS (data));
+ if (id_class->set_property) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..774653d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+clang_FTBFS_Wreturn-type.patch
+0007-Update-russian-translation.patch
+0003-Remove-Encoding-field-in-desktop-file.patch
+0004-Spelling-fixes.patch
diff --git a/debian/repack-waf b/debian/repack-waf
new file mode 100755
index 0000000..d1f2160
--- /dev/null
+++ b/debian/repack-waf
@@ -0,0 +1,48 @@
+#!/bin/bash -e
+# Repack an upstream tarball, unpacking waf files inside it.
+#
+# Meant to be run by uscan(1) as the "command param", after repacking
+# (if any) by mk-origtargz. So you shouldn't give "repacksuffix" to
+# debian/watch; instead you should set it below; however this should
+# still match the dversionmangle in that file.
+
+unwaf_paths=.
+
+# You shouldn't need to change anything below here.
+
+USAGE="Usage: $0 --upstream-version version filename"
+
+test "$1" = "--upstream-version" || { echo >&2 "$USAGE"; exit 2; }
+upstream="$2"
+filename="$3"
+
+source="$(dpkg-parsechangelog -SSource)"
+basedir="$(dirname "$filename")"
+
+unpack_waf() {
+ local olddir="$PWD"
+ cd "$1"
+ test -x ./waf || return 1
+ ./waf --help > /dev/null
+ mv .waf3-*/* .
+ sed -i '/^#==>$/,$d' waf
+ rmdir .waf3-*
+ find waf* -name "*.pyc" -delete
+ cd "$olddir"
+}
+
+
+mkdir tmp
+pushd tmp
+tar -xf "../../${source}_${upstream}.orig.tar.xz"
+SUBDIR=`ls`
+echo $SUBDIR
+cd ${SUBDIR}
+for i in $unwaf_paths; do unpack_waf "$i"; done
+cd ..
+rm -f ../../${source}_${upstream}.orig.tar.gz
+tar -czf "../../${source}_${upstream}.orig.tar.gz" ${SUBDIR}
+rm -rf ${SUBDIR}
+
+popd
+rm -rf tmp
diff --git a/debian/rules b/debian/rules
index 7d902f2..e509dee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,26 +3,28 @@
#export DH_VERBOSE=1
#export DH_OPTIONS=-v
-PWD := $(shell pwd)
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+
+LDFLAGS += -lcairo
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
- ./waf --prefix="/usr" configure
-
-override_dh_auto_clean:
- ./waf distclean
+ ./waf configure --debug --prefix=/usr
override_dh_auto_build:
- ./waf debug
+ ./waf build --debug --prefix=/usr
override_dh_auto_install:
- ./waf --prefix="/usr" --destdir=$(PWD)/debian/oregano install --no-install-gschema --no-xdg
-
-override_dh_usrlocal:
- @echo "skippy skip <dh_usrlocal>"
-
-override_dh_shlibdeps:
- dpkg-shlibdeps -Tdebian/oregano.substvars debian/oregano/usr/bin/oregano
+ ./waf install --destdir=debian/oregano --prefix=/usr
+ $(RM) debian/oregano/usr/share/glib-2.0/schemas/gschemas.compiled
+
+override_dh_clean:
+ dh_clean
+ find waflib/ -name "*.pyc" -delete
+ $(RM) .lock-waf_linux2_build
+ $(RM) -r build
diff --git a/debian/watch b/debian/watch
index 4e90b35..6499426 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
-version=3
-opts=filenamemangle=s|^.*/archive/v|oregano-| \
- https://github.com/drahnr/oregano/tags .*/archive/v(\d[\d\.]+).tar.gz
+version=4
+opts=dversionmangle=s/\+dfsg\.\d+//,\
+oversionmangle=s/$/\+dfsg\.1/ \
+https://github.com/drahnr/oregano/tags .*/archive/v(\d[\d\.]+).tar.gz debian debian/repack-waf