Package: ibus-skk
Version: 1.3.7-1
Severity: wishlist

Since lintian was noisy, I updated copyright file based on DEP-5.
 http://www.debian.org/doc/manuals/maint-guide/dreq.en.html#copyright

Also, I made a few packaging tries to make build script simpler.

Just for your reference, I am sending patches created against git repo.

First 2 patches may be immediately useful while the last one is starting
point to ensure future binary rebuilding by others.  (You are the
upstream, so you can always update autotools anyway... so this may not
be high priority.)

Pick what you like and close this bug.

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing'), (50, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages ibus-skk depends on:
ii  ibus                          1.3.9-2    New input method framework using d
ii  python                        2.6.6-14   interactive high-level object-orie
ii  python-support                1.0.13     automated rebuilding support for P
pn  skkdic | skkserv              <none>     (no description available)

ibus-skk recommends no packages.

ibus-skk suggests no packages.
>From 52801de4a0c9f1bc92992d3a71c4a4cf5854716d Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sat, 2 Jul 2011 16:27:01 +0900
Subject: [PATCH 1/4] Use new dh style and source format 3.0 (quilt)

This uses dh with:
 * dh_pysupport
 * dh_autotools-dev

I did not understand old rules file doing pot file updates thus corresponding
code is tentastively commended out.

In order not to make big diff when repeat building is done, autogenerated files
are marked not to make diff)
 setup/ibus-setup-skk.in
 config.sub
 config.guess

Last 2 are not likely needed since they are recovered by debuild clean.
---
 debian/control              |    4 +-
 debian/ibus-skk.docs        |    2 +
 debian/rules                |   60 ++++++------------------------------------
 debian/source/format        |    2 +-
 debian/source/local-options |    2 +
 debian/source/options       |    1 +
 6 files changed, 17 insertions(+), 54 deletions(-)
 create mode 100644 debian/ibus-skk.docs
 create mode 100644 debian/source/local-options
 create mode 100644 debian/source/options

diff --git a/debian/control b/debian/control
index 9c36ab0..1cc64ac 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ibus-skk
 Section: utils
 Priority: optional
 Maintainer: IME Packaging Team <pkg-ime-de...@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, pkg-config, python-support, intltool
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, python-support, intltool
+Standards-Version: 3.9.2
 Homepage: http://github.com/ueno/ibus-skk
 DM-Upload-Allowed: yes
 
diff --git a/debian/ibus-skk.docs b/debian/ibus-skk.docs
new file mode 100644
index 0000000..6f12db5
--- /dev/null
+++ b/debian/ibus-skk.docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/rules b/debian/rules
index 2da3452..1c183d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,59 +1,17 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+%:
+	dh $@ --with autotools-dev  
 
-config.status:
-	dh_testdir
-	cp -f /usr/share/misc/config.sub config.sub
-	cp -f /usr/share/misc/config.guess config.guess
-	dh_auto_configure
+# I do not know why ... but uncomenting the following 
+# will preserve old behavior.
+#
+#override_dh_auto_build:
+#	cd po; intltool-update --pot
+#	dh_auto_build
 
-build: build-stamp
-build-stamp: config.status
-	dh_testdir
-	cd po; intltool-update --pot
-	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-	rm -f po/*.gmo
-	dh_clean build-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/ibus-skk install
-
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs AUTHORS README
-	dh_installexamples
-	dh_pysupport /usr/share/ibus-skk
-	dh_installman
-	dh_lintian
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# dbuild clean cleans ibus-skk-preferences.ui
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..8293bbd
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+apply-patches
+abort-on-upstream-changes
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..5aa5f98
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "(^|/)(config\.sub|config\.guess|ibus-skk-preferences\.ui)$"
-- 
1.7.5.4

>From b87167c7c49f188e91ac21934a93a9181a68c479 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sat, 2 Jul 2011 17:48:11 +0900
Subject: [PATCH 2/4] DEP-5 copyright

---
 debian/copyright |   98 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index faa5ece..9ca73af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,61 @@
-This work was packaged for Debian by:
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: ibus-skk
+Maintainer: Daiki Ueno <u...@unixuser.org>
+Source: http://github.com/ueno/ibus-skk/downloads/
+
+Files: *
+Copyright: 2007-2008 Huang Peng <shawn.p.hu...@gmail.com>
+           2009-2010 Daiki Ueno <u...@unixuser.org>
+License: GPL-2+
+
+Files: engine/ibus-engine-skk.in
+Copyright: 2007-2008 Huang Peng <shawn.p.hu...@gmail.com>
+License: LGPL-2.0+
+
+Files: icons/Makefile.am
+       icons/Makefile.in
+Copyright: 2007-2008 Huang Peng <shawn.p.hu...@gmail.com>
+           2009-2010 Daiki Ueno <u...@unixuser.org>
+License: LGPL-2.0+
+
+Files: debian/*
+Copyright: 2008 LI Daobing <lidaob...@gmail.com>
+           2009 Daiki Ueno <u...@unixuser.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.
+ .
+ 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 the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.0+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This package 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
 
-    Daiki Ueno <u...@unixuser.org> on Wed, 23 Dec 2009 11:46:22 +0900
-
-It was downloaded from <http://github.com/ueno/ibus-skk/downloads/>
-
-Upstream Author(s):
-
-    Huang Peng <shawn.p.hu...@gmail.com>
-    Daiki Ueno <u...@unixuser.org>
-
-Copyright:
-
-    Copyright (C) 2007-2008 Huang Peng <shawn.p.hu...@gmail.com>
-    Copyright (C) 2009 Daiki Ueno <u...@unixuser.org>
-
-License:
-
-This project is distributed under the GNU General Public License
-version 2 (or later version) except the following files, which are
-distributed under the GNU Lesser General Public License version 2 (or
-later version).
-
-    engine/ibus-engine-skk.in
-    icons/Makefile.am
-    icons/Makefile.in
-
-On Debian systems, the complete text of the GNU General Public License
-version 2 and the GNU Lesser General Public License version 2 can be
-found in `/usr/share/common-licenses/GPL-2' and
-`/usr/share/common-licenses/LGPL-2' respectively.
-
-The Debian packaging is:
-
-    Copyright (C) 2009 Daiki Ueno <u...@unixuser.org>
-
-based on the work on the ibus-anthy package by LI Daobing (it is
-licensed under the GNU General Public Licensed version 2 or later),
-and is licensed under the same license.
-- 
1.7.5.4

>From 5811c2cb6fcda9d32c30daec83c0610821c428a9 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sat, 2 Jul 2011 16:41:39 +0900
Subject: [PATCH 3/4] fake uploaders

---
 debian/changelog |    6 ++++++
 debian/control   |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3dab1c1..4c00cf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ibus-skk (1.3.7-2) unstable; urgency=low
+
+  * Newer packaging style example. 
+
+ -- Osamu Aoki <os...@debian.org>  Sat, 02 Jul 2011 17:06:35 +0900
+
 ibus-skk (1.3.7-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 1cc64ac..35913b2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: ibus-skk
 Section: utils
 Priority: optional
 Maintainer: IME Packaging Team <pkg-ime-de...@lists.alioth.debian.org>
+Uploaders: Osamu Aoki <os...@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, python-support, intltool
 Standards-Version: 3.9.2
 Homepage: http://github.com/ueno/ibus-skk
-- 
1.7.5.4

>From c737eac1fe2166e948756e96a9f3576f5c932a80 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sat, 2 Jul 2011 17:09:13 +0900
Subject: [PATCH 4/4] Switch to --with autoreconf

This is just initial test to build package locally.

 debian/source/options need to be updated
 debian/control need to be updated to fix dependency like libtool etc.
---
 debian/control |    2 +-
 debian/rules   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 35913b2..c3ad64e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: IME Packaging Team <pkg-ime-de...@lists.alioth.debian.org>
 Uploaders: Osamu Aoki <os...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, python-support, intltool
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, python-support, intltool, dh-autoreconf
 Standards-Version: 3.9.2
 Homepage: http://github.com/ueno/ibus-skk
 DM-Upload-Allowed: yes
diff --git a/debian/rules b/debian/rules
index 1c183d5..efb10d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autotools-dev  
+	dh $@ --with autoreconf 
 
 # I do not know why ... but uncomenting the following 
 # will preserve old behavior.
-- 
1.7.5.4

Reply via email to