Bug#664419: [PATCH] shoes: Helping to update to packaging format 3.0
Here are some more fixes included in upload. Alternatively you
can download the archive from Debian with all the changes.
Thank you for helping with this update,
Jari
From 696e9fa1a2deab29a978c3da1d1ed554c1d1361d Mon Sep 17 00:00:00 2001
From: Jari Aalto jari.aa...@cante.net
Date: Thu, 5 Apr 2012 09:26:14 +0300
Subject: [PATCH] nmu
Organization: Private
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto jari.aa...@cante.net
---
debian/changelog | 15 ++-
debian/control |4 ++--
debian/lintian-overrides |2 +-
debian/rules |8 ++--
debian/shoes.desktop |1 -
debian/source/format |1 +
6 files changed, 20 insertions(+), 11 deletions(-)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 350ff23..52bdfa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
shoes (0.r396-5.1) unstable; urgency=low
- * Non-maintainer upload.
- * Remove deprecated dpatch and upgrade to packaging format 3.0 quilt.
- * Update to Standards-Version to 3.9.3 and debhelper to 9.
-
- -- Jari Aalto jari.aa...@cante.net Mon, 27 Feb 2012 12:44:16 -0500
+ * Non-maintainer upload; ACKed by the maintainer, see #664419.
+ * Remove deprecated dpatch and upgrade to packaging format 3.0 quilt
+(Closes: #664419).
+ * Update to Standards-Version to 3.9.3.1, debhelper to 9, ${misc:Depends}.
+ * Add build-arch and build-indep targets; use dh_prep, disable
+deprecated dh_desktop in rules file.
+ * Fix desktop-entry-contains-encoding-key (Lintian) in debian/*.desktop.
+ * Fix unused-override (Lintian) by adjusting path in debian/*-overrides.
+
+ -- Jari Aalto jari.aa...@cante.net Thu, 05 Apr 2012 09:24:39 +0300
shoes (0.r396-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 11f2248..adcc500 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: extra
Maintainer: Bram Senders b...@luon.net
Uploaders: Paul van Tilburg pau...@debian.org
Build-Depends: debhelper (= 9), pkg-config, libgtk2.0-dev, libcairo2-dev, libpango1.0-dev, libgif-dev, libjpeg-dev, ruby, ruby1.8-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.3.1
Homepage: http://code.whytheluckystiff.net/shoes/
Package: shoes
Architecture: any
-Depends: ${shlibs:Depends}, rubygems1.8
+Depends: ${misc:Depends}, ${shlibs:Depends}, rubygems1.8
Description: tiny graphics and windowing toolkit using Ruby
Shoes is a very informal graphics and windowing toolkit for making simple
graphical applications. It blends ideas from the web (hyperlinks, simple text
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 2472e77..ec2ae1c 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,3 +1,3 @@
# The minitar.rb file has a script header, but it is used as a library, not
# a script, so it shouldn't be executable.
-shoes binary: script-not-executable ./usr/lib/shoes/lib/shoes/minitar.rb
+shoes binary: script-not-executable usr/lib/shoes/lib/shoes/minitar.rb
diff --git a/debian/rules b/debian/rules
index 7c3c08a..da281b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,10 @@
#export DH_VERBOSE=1
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp:
dh_testdir
@@ -26,7 +30,7 @@ clean:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cp -a dist/shoes-bin dist/libshoes.so lib debian/shoes/usr/lib/shoes
ln -s ../../ruby/1.8 debian/shoes/usr/lib/shoes/ruby/lib
@@ -50,7 +54,7 @@ binary-arch: build install
dh_installexamples
dh_installmenu
dh_installman
- dh_desktop
+# dh_desktop
dh_icons
dh_link
dh_strip
diff --git a/debian/shoes.desktop b/debian/shoes.desktop
index 2aa3617..d49d5aa 100644
--- a/debian/shoes.desktop
+++ b/debian/shoes.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Name=Shoes
Comment=Interpreter for Shoes programs
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9.1
Bug#664419: [PATCH] shoes: Helping to update to packaging format 3.0
On 17/03/12 19:09, jari.aa...@cante.net wrote: As we spoke before, here is the proposed NMU patch. Thank you :-) Let me know if there is anything that needs adjusting or if it is ok to upload with these changes. This one is looking good as well, go ahead! Bram -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#664419: [PATCH] shoes: Helping to update to packaging format 3.0
Package: shoes
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
As we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
From 54d26d985723d4775832be941f79df94981560de Mon Sep 17 00:00:00 2001
From: Jari Aalto jari.aa...@cante.net
Date: Mon, 27 Feb 2012 12:57:01 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto jari.aa...@cante.net
---
debian/changelog |8
debian/compat |2 +-
debian/control |4 ++--
debian/patches/00list |2 --
...solute_paths.dpatch = 01_absolute_paths.patch} | 10 +++---
...ri.dpatch = 02_remove_rubygems_open-uri.patch} | 10 +++---
debian/patches/series |2 ++
debian/rules |5 ++---
8 files changed, 21 insertions(+), 22 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_absolute_paths.dpatch = 01_absolute_paths.patch} (91%)
rename debian/patches/{02_remove_rubygems_open-uri.dpatch = 02_remove_rubygems_open-uri.patch} (57%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index ff0eb0c..350ff23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shoes (0.r396-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format 3.0 quilt.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto jari.aa...@cante.net Mon, 27 Feb 2012 12:44:16 -0500
+
shoes (0.r396-5) unstable; urgency=low
* Depend on rubygems1.8 instead of libgems-ruby1.8 (Closes: #491914).
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index ed650f7..11f2248 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: interpreters
Priority: extra
Maintainer: Bram Senders b...@luon.net
Uploaders: Paul van Tilburg pau...@debian.org
-Build-Depends: debhelper (= 5.0.51~), dpatch, pkg-config, libgtk2.0-dev, libcairo2-dev, libpango1.0-dev, libgif-dev, libjpeg-dev, ruby, ruby1.8-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (= 9), pkg-config, libgtk2.0-dev, libcairo2-dev, libpango1.0-dev, libgif-dev, libjpeg-dev, ruby, ruby1.8-dev
+Standards-Version: 3.9.3
Homepage: http://code.whytheluckystiff.net/shoes/
Package: shoes
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 97c6ac5..000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_absolute_paths
-02_remove_rubygems_open-uri
diff --git a/debian/patches/01_absolute_paths.dpatch b/debian/patches/01_absolute_paths.patch
similarity index 91%
rename from debian/patches/01_absolute_paths.dpatch
rename to debian/patches/01_absolute_paths.patch
index dc9d607..87d68d5 100644
--- a/debian/patches/01_absolute_paths.dpatch
+++ b/debian/patches/01_absolute_paths.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_absolute_paths.dpatch by Bram Senders b...@luon.net
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replace paths relative to the CWD by paths to the absolute location
-## DP: where the file is installed.
+From: Bram Senders b...@luon.net
+Subject: Replace paths relative to the CWD by paths to the absolute location
+ where the file is installed.
-@DPATCH@
diff -urNad shoes-0.r396~/lib/shoes/help.rb shoes-0.r396/lib/shoes/help.rb
--- shoes-0.r396~/lib/shoes/help.rb 2008-01-08 20:51:30.0 +0100
+++ shoes-0.r396/lib/shoes/help.rb 2008-01-22 17:19:55.0 +0100
diff --git a/debian/patches/02_remove_rubygems_open-uri.dpatch b/debian/patches/02_remove_rubygems_open-uri.patch
similarity index 57%
rename from debian/patches/02_remove_rubygems_open-uri.dpatch
rename to debian/patches/02_remove_rubygems_open-uri.patch
index e461dfe..87242e1 100644
--- a/debian/patches/02_remove_rubygems_open-uri.dpatch
+++ b/debian/patches/02_remove_rubygems_open-uri.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_remove_rubygems_open-uri.dpatch by Bram Senders b...@luon.net
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove reference to rubygems/open-uri, as this is removed from
-## DP: libgems-ruby1.8 as of version 1.1.1.
+From: Bram
