[Apt-listbugs-commits] [apt-listbugs] 01/02: build with dh_ruby (from gem2deb package)
Francesco Poli
frx-guest at moszumanska.debian.org
Wed Feb 25 20:47:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
frx-guest pushed a commit to branch master
in repository apt-listbugs.
commit 20f29c12a2b0170ededf4b29aaf4c9862bedea49
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date: Sun Feb 22 19:18:18 2015 +0100
build with dh_ruby (from gem2deb package)
---
Makefile | 14 +++++++-------
apt-listbugs => bin/apt-listbugs | 9 ++++-----
debian/changelog | 4 ++++
debian/control | 4 +++-
debian/cron.daily | 6 +++---
debian/dh_ruby.mk | 1 +
debian/dirs | 5 +++--
debian/install | 7 +------
debian/links | 2 +-
debian/postinst | 6 +++---
debian/ruby-test-files.yaml | 2 ++
debian/rules | 7 ++++++-
examples/from-severity-get-bugtitles-and-pkgnames.rb | 6 +++---
examples/getbugstest.rb | 6 +++---
examples/listbugs-soap.rb | 6 +++---
aptcleanup => lib/aptlistbugs/aptcleanup | 10 ++++------
lib/{ => aptlistbugs}/debian/apt_preferences.rb | 0
lib/{ => aptlistbugs}/debian/bts.rb | 6 +++---
lib/{ => aptlistbugs}/debian/btssoap.rb | 2 +-
lib/{ => aptlistbugs}/debian/bug.rb | 0
lib/{apt-listbugs => aptlistbugs}/logic.rb | 6 +++---
migratepins => lib/aptlistbugs/migratepins | 10 ++++------
test_logic.rb => test/test_logic.rb | 2 +-
23 files changed, 63 insertions(+), 58 deletions(-)
diff --git a/Makefile b/Makefile
index 522fa15..a7fd344 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,10 @@ clean:
.PHONY: check
check:
- ./test_logic.rb
+ ./test/test_logic.rb
-apt-listbugs.1: apt-listbugs
- rd2 -r rd/rd2man-lib.rb -o apt-listbugs apt-listbugs
+apt-listbugs.1: bin/apt-listbugs
+ rd2 -r rd/rd2man-lib.rb -o apt-listbugs bin/apt-listbugs
.PHONY: update-po
update-po: po/apt-listbugs.pot
@@ -29,15 +29,15 @@ update-po: po/apt-listbugs.pot
msgfmt --statistics -v -c po/$$po.po -o /dev/null; \
done
-po/apt-listbugs.pot: apt-listbugs lib/apt-listbugs/logic.rb aptcleanup \
- migratepins
+po/apt-listbugs.pot: bin/apt-listbugs lib/aptlistbugs/logic.rb \
+ lib/aptlistbugs/aptcleanup lib/aptlistbugs/migratepins
rxgettext --add-comments=TRANSLATORS --no-wrap \
--copyright-holder="Masato Taruishi et al." \
--copyright-year=2002-$(YEAR) \
--package-name=apt-listbugs --package-version=$(VERSION) \
--msgid-bugs-address=$$DEBEMAIL \
- apt-listbugs lib/apt-listbugs/logic.rb aptcleanup \
- migratepins \
+ bin/apt-listbugs lib/aptlistbugs/logic.rb \
+ lib/aptlistbugs/aptcleanup lib/aptlistbugs/migratepins \
-o po/apt-listbugs.pot
.PHONY: call-for-translation
diff --git a/apt-listbugs b/bin/apt-listbugs
similarity index 98%
rename from apt-listbugs
rename to bin/apt-listbugs
index 6d83ab8..c648b04 100755
--- a/apt-listbugs
+++ b/bin/apt-listbugs
@@ -316,10 +316,9 @@ Signal.trap("SIGUSR1") { $stderr.puts "Emergency exit"; exit! 0 }
if File.expand_path(__FILE__).match(/^\/usr\/s?bin\//)
- $LOAD_PATH.unshift("/usr/share/apt-listbugs")
$VERSION = `dpkg-query -W -f='${Version}' apt-listbugs`
else
- $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "../lib"))
$VERSION = `dpkg-parsechangelog -SVersion`
end
@@ -342,12 +341,12 @@ rescue LoadError
$stderr.puts " # mv /root/10apt-listbugs /etc/apt/apt.conf.d/"
exit 1
end
-require 'debian/bug'
-require 'debian/bts'
+require 'aptlistbugs/debian/bug'
+require 'aptlistbugs/debian/bts'
require 'thread'
require 'tempfile'
require 'rss/maker'
-require 'apt-listbugs/logic'
+require 'aptlistbugs/logic'
## main from here
diff --git a/debian/changelog b/debian/changelog
index 0359a32..e610c98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ apt-listbugs (0.1.17) UNRELEASED; urgency=medium
implemented support for the Acquire::http::Proxy-Auto-Detect
APT configuration option (Closes: #726430)
* improved internationalization
+ * reorganized source file tree to be more like a regular Ruby upstream
+ package, in order to use gem2deb during binary package build
+ (this should make the package more easily and automatically policy
+ compliant)
-- Francesco Poli (wintermute) <invernomuto at paranoici.org> Sun, 04 Jan 2015 11:42:30 +0100
diff --git a/debian/control b/debian/control
index 0d90075..b1f9c83 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,17 @@ Source: apt-listbugs
Section: admin
Priority: optional
Maintainer: Francesco Poli (wintermute) <invernomuto at paranoici.org>
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 7.0.50), gem2deb (>= 0.12)
Build-Depends-Indep: ruby, rdtool, gettext, ruby-debian (>= 0.3.3), ruby-gettext (>= 3.0.2), ruby-test-unit, ruby-soap4r, ruby-unicode
Standards-Version: 3.9.6
+XS-Ruby-Versions: all
Vcs-Git: git://anonscm.debian.org/apt-listbugs/apt-listbugs.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt-listbugs/apt-listbugs.git
Homepage: http://alioth.debian.org/projects/apt-listbugs/
Package: apt-listbugs
Architecture: all
+XB-Ruby-Versions: ${ruby:Versions}
Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-debian (>= 0.3.3), apt (>= 0.9.11), ruby-gettext (>= 3.0.2), ruby-xmlparser, ruby-soap4r, ruby-unicode
Recommends: ruby-httpclient (>= 2.1.5.2-1)
Suggests: reportbug, debianutils (>= 2.0) | www-browser | w3m
diff --git a/debian/cron.daily b/debian/cron.daily
index 4661ad0..a4c2830 100755
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -25,13 +25,13 @@ prefclean()
file="/etc/apt/preferences.d/apt-listbugs"
backup="/var/backups/apt-listbugs.preferences"
- test -x /usr/share/apt-listbugs/aptcleanup || return 0
- test -x /usr/sbin/apt-listbugs || return 0
+ test -x /usr/lib/ruby/vendor_ruby/aptlistbugs/aptcleanup || return 0
+ test -x /usr/bin/apt-listbugs || return 0
test -f "$file" || return 0
tmp=$(mktemp --tmpdir apt-listbugs_tmp_preferences.XXXXXX)
- /usr/share/apt-listbugs/aptcleanup > "$tmp" || return 0
+ /usr/lib/ruby/vendor_ruby/aptlistbugs/aptcleanup > "$tmp" || return 0
if ! diff -B "$tmp" "$file" > /dev/null
then
if test -f "$backup"
diff --git a/debian/dh_ruby.mk b/debian/dh_ruby.mk
new file mode 120000
index 0000000..d0b0e8e
--- /dev/null
+++ b/debian/dh_ruby.mk
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
diff --git a/debian/dirs b/debian/dirs
index 6536b7b..6b8fc41 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,6 +1,7 @@
usr/sbin
-usr/share/apt-listbugs/apt-listbugs/
-usr/share/apt-listbugs/debian/
+usr/bin
+usr/lib/ruby/vendor_ruby/aptlistbugs/
+usr/lib/ruby/vendor_ruby/aptlistbugs/debian/
var/cache/apt-listbugs/
var/lib/apt-listbugs/
etc/apt/apt.conf.d/
diff --git a/debian/install b/debian/install
index 81aef08..5bd56ca 100644
--- a/debian/install
+++ b/debian/install
@@ -1,8 +1,3 @@
-apt-listbugs usr/sbin/
10apt-listbugs etc/apt/apt.conf.d/
-ignore_bugs usr/share/apt-listbugs/
+ignore_bugs usr/lib/ruby/vendor_ruby/aptlistbugs/
bug-list.css etc/apt/listbugs/
-aptcleanup usr/share/apt-listbugs/
-migratepins usr/share/apt-listbugs/
-lib/debian/*.rb usr/share/apt-listbugs/debian/
-lib/apt-listbugs/*.rb usr/share/apt-listbugs/apt-listbugs/
diff --git a/debian/links b/debian/links
index b94336e..88014b7 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1 @@
-usr/sbin/apt-listbugs usr/bin/apt-listbugs
+usr/bin/apt-listbugs usr/sbin/apt-listbugs
diff --git a/debian/postinst b/debian/postinst
index cbcc8a9..abe19c9 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,8 +28,8 @@ case "$1" in
if test "x$2" = "x" && ! test -e "/etc/apt/listbugs/ignore_bugs"
then
install -d /etc/apt/listbugs/
- cp /usr/share/apt-listbugs/ignore_bugs \
- /etc/apt/listbugs/ignore_bugs
+ cp /usr/lib/ruby/vendor_ruby/aptlistbugs/ignore_bugs \
+ /etc/apt/listbugs/ignore_bugs
fi
# remove obsolete cron configuration
@@ -54,7 +54,7 @@ case "$1" in
done
# migrate package pins to new location
- MIGDIR=`/usr/share/apt-listbugs/migratepins`
+ MIGDIR=`/usr/lib/ruby/vendor_ruby/aptlistbugs/migratepins`
if test "x$MIGDIR" != "x" && test -d "$MIGDIR"
then
if test -s "$MIGDIR/apt-listbugs"
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
new file mode 100644
index 0000000..3e1443d
--- /dev/null
+++ b/debian/ruby-test-files.yaml
@@ -0,0 +1,2 @@
+---
+- test/test_logic.rb
diff --git a/debian/rules b/debian/rules
index 2d33f6a..1f74a44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --buildsystem=ruby --with ruby
+
+override_dh_fixperms:
+ dh_fixperms -O--buildsystem=ruby
+ chmod 755 debian/apt-listbugs/usr/lib/ruby/vendor_ruby/aptlistbugs/aptcleanup
+ chmod 755 debian/apt-listbugs/usr/lib/ruby/vendor_ruby/aptlistbugs/migratepins
diff --git a/examples/from-severity-get-bugtitles-and-pkgnames.rb b/examples/from-severity-get-bugtitles-and-pkgnames.rb
index 9cb0abd..fc5eedb 100755
--- a/examples/from-severity-get-bugtitles-and-pkgnames.rb
+++ b/examples/from-severity-get-bugtitles-and-pkgnames.rb
@@ -1,11 +1,11 @@
-#!/usr/bin/ruby -I/usr/share/apt-listbugs/
+#!/usr/bin/ruby
###
### test the relay with get_bugs->get_status.
###
-require 'debian/bts'
-require 'debian/btssoap'
+require 'aptlistbugs/debian/bts'
+require 'aptlistbugs/debian/btssoap'
#$DEBUG=1
soap=Debian::BTSSOAP::Soap.new
pkglist = Debian::BTSSOAP::StringArray.new
diff --git a/examples/getbugstest.rb b/examples/getbugstest.rb
index ffd8a99..2df9de5 100755
--- a/examples/getbugstest.rb
+++ b/examples/getbugstest.rb
@@ -1,11 +1,11 @@
-#!/usr/bin/ruby -I/usr/share/apt-listbugs/
+#!/usr/bin/ruby
###
### test the get_bugs interface, which returns the bugs matching the key-id pair from the BTS.
###
-require 'debian/bts'
-require 'debian/btssoap'
+require 'aptlistbugs/debian/bts'
+require 'aptlistbugs/debian/btssoap'
$DEBUG=1
soap=Debian::BTSSOAP::Soap.new
sa = Debian::BTSSOAP::StringArray.new
diff --git a/examples/listbugs-soap.rb b/examples/listbugs-soap.rb
index 6cb33af..3f0ea5c 100755
--- a/examples/listbugs-soap.rb
+++ b/examples/listbugs-soap.rb
@@ -1,7 +1,7 @@
-#!/usr/bin/ruby -I/usr/share/apt-listbugs/
+#!/usr/bin/ruby
-require 'debian/bts'
-require 'debian/btssoap'
+require 'aptlistbugs/debian/bts'
+require 'aptlistbugs/debian/btssoap'
$DEBUG=1
soap=Debian::BTSSOAP::Soap.new
sa = Debian::BTSSOAP::StringArray.new
diff --git a/aptcleanup b/lib/aptlistbugs/aptcleanup
similarity index 93%
rename from aptcleanup
rename to lib/aptlistbugs/aptcleanup
index d71abac..0e3080a 100755
--- a/aptcleanup
+++ b/lib/aptlistbugs/aptcleanup
@@ -4,7 +4,7 @@
#
# Copyright (C) 2004 Masato Taruishi <taru at debian.org>
# Copyright (C) 2007 Jean Lepropre <jlepropre at gmail.com>
-# Copyright (C) 2008-2014 Francesco Poli <invernomuto at paranoici.org>
+# Copyright (C) 2008-2015 Francesco Poli <invernomuto at paranoici.org>
# Copyright (C) 2009 Ryan Niebur <ryan at debian.org>
#
# This program is free software; you can redistribute it and/or modify
@@ -24,10 +24,8 @@
#
#
-if File.expand_path(__FILE__).match(/^\/usr\/share\/apt-listbugs\//)
- $LOAD_PATH.unshift("/usr/share/apt-listbugs")
-else
- $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
+if ! File.expand_path(__FILE__).match(/^\/usr\/lib\/ruby\/vendor_ruby\/aptlistbugs\//)
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), ".."))
end
require 'gettext'
@@ -35,7 +33,7 @@ include GetText
GetText::bindtextdomain("apt-listbugs")
-require 'debian/apt_preferences'
+require 'aptlistbugs/debian/apt_preferences'
require 'tmpdir'
APTCACHE = "/usr/bin/apt-cache"
diff --git a/lib/debian/apt_preferences.rb b/lib/aptlistbugs/debian/apt_preferences.rb
similarity index 100%
rename from lib/debian/apt_preferences.rb
rename to lib/aptlistbugs/debian/apt_preferences.rb
diff --git a/lib/debian/bts.rb b/lib/aptlistbugs/debian/bts.rb
similarity index 95%
rename from lib/debian/bts.rb
rename to lib/aptlistbugs/debian/bts.rb
index 1dcd4b8..5b31d1b 100644
--- a/lib/debian/bts.rb
+++ b/lib/aptlistbugs/debian/bts.rb
@@ -20,7 +20,7 @@
#
# Currently, this interface has only acquires to create bugs.
-require 'debian/bug'
+require 'aptlistbugs/debian/bug'
require 'net/http'
require 'uri.rb'
require 'find'
@@ -46,7 +46,7 @@ module Debian
end
def parse_bug(bugnum)
- require 'debian/btssoap'
+ require 'aptlistbugs/debian/btssoap'
soap = Debian::BTSSOAP::Soap.new(@host, @port)
sa = Debian::BTSSOAP::StringArray.new
@@ -57,7 +57,7 @@ module Debian
end
def parse(ma_copies, parsestep, severities = ["critical", "grave"])
- require 'debian/btssoap'
+ require 'aptlistbugs/debian/btssoap'
soap = Debian::BTSSOAP::Soap.new(@host, @port)
sa = Debian::BTSSOAP::StringArray.new
bugs = Debian::Bugs.new
diff --git a/lib/debian/btssoap.rb b/lib/aptlistbugs/debian/btssoap.rb
similarity index 99%
rename from lib/debian/btssoap.rb
rename to lib/aptlistbugs/debian/btssoap.rb
index d4a39c1..759ab7f 100644
--- a/lib/debian/btssoap.rb
+++ b/lib/aptlistbugs/debian/btssoap.rb
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
require 'soap/rpc/driver'
-require 'debian/bug'
+require 'aptlistbugs/debian/bug'
module Debian
module BTSSOAP
diff --git a/lib/debian/bug.rb b/lib/aptlistbugs/debian/bug.rb
similarity index 100%
rename from lib/debian/bug.rb
rename to lib/aptlistbugs/debian/bug.rb
diff --git a/lib/apt-listbugs/logic.rb b/lib/aptlistbugs/logic.rb
similarity index 99%
rename from lib/apt-listbugs/logic.rb
rename to lib/aptlistbugs/logic.rb
index c6d7c3e..30020fe 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/aptlistbugs/logic.rb
@@ -27,13 +27,13 @@
require 'getoptlong'
require 'debian'
require 'unicode'
-require 'debian/bug'
-require 'debian/bts'
+require 'aptlistbugs/debian/bug'
+require 'aptlistbugs/debian/bts'
require 'thread'
require 'tempfile'
require 'gettext'
require 'rss/maker'
-require 'debian/apt_preferences'
+require 'aptlistbugs/debian/apt_preferences'
include GetText
diff --git a/migratepins b/lib/aptlistbugs/migratepins
similarity index 87%
rename from migratepins
rename to lib/aptlistbugs/migratepins
index 83dd9b9..874226c 100755
--- a/migratepins
+++ b/lib/aptlistbugs/migratepins
@@ -5,7 +5,7 @@
# and everything else to <tmpdir>/preferences
#
# Copyright (C) 2009 Ryan Niebur <ryan at debian.org>
-# Copyright (C) 2014 Francesco Poli <invernomuto at paranoici.org>
+# Copyright (C) 2014-2015 Francesco Poli <invernomuto at paranoici.org>
#
# 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
@@ -24,10 +24,8 @@
#
#
-if File.expand_path(__FILE__).match(/^\/usr\/share\/apt-listbugs\//)
- $LOAD_PATH.unshift("/usr/share/apt-listbugs")
-else
- $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
+if ! File.expand_path(__FILE__).match(/^\/usr\/lib\/ruby\/vendor_ruby\/aptlistbugs\//)
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), ".."))
end
require 'gettext'
@@ -35,7 +33,7 @@ include GetText
GetText::bindtextdomain("apt-listbugs")
-require 'debian/apt_preferences'
+require 'aptlistbugs/debian/apt_preferences'
require 'tmpdir'
# create a temporary directory to split APT preferences
diff --git a/test_logic.rb b/test/test_logic.rb
similarity index 99%
rename from test_logic.rb
rename to test/test_logic.rb
index 784d5f5..ebd48dd 100755
--- a/test_logic.rb
+++ b/test/test_logic.rb
@@ -24,7 +24,7 @@
require 'test/unit'
-require 'apt-listbugs/logic'
+require 'aptlistbugs/logic'
class Mock_config_apt
def command()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/apt-listbugs/apt-listbugs.git
More information about the Apt-listbugs-commits
mailing list