xprint: Changes to 'debian-unstable'
debian/README.source | 21 +++++++++++++
debian/changelog | 17 +++++++++++
debian/control | 6 +--
debian/patches/series | 4 ++
debian/patches/xprint-disable-hal.patch | 37 ++++++++++++++++++++++++
debian/po/da.po | 49 +++++++++++++-------------------
6 files changed, 102 insertions(+), 32 deletions(-)
New commits:
commit 37d3a3265542acb929d8090d613c1338a486a62f
Author: Drew Parsons <Drew.Parsons@anu.edu.au>
Date: Mon Mar 21 20:44:44 2011 +1100
add newline to debian/patches/series
Build systems could get confused if there's no newline at the end of a
file.
diff --git a/debian/patches/series b/debian/patches/series
index 7717dcf..8bb41a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@
#
# uncomment xprint-disable-hal.patch in order to
# stop building against hal (see Debian Bug#604967)
-#xprint-disable-hal.patch
\ No newline at end of file
+#xprint-disable-hal.patch
commit f9986494c22390a3fbfb682f8eab324580751d63
Author: Drew Parsons <Drew.Parsons@anu.edu.au>
Date: Mon Mar 21 20:13:44 2011 +1100
Standards-Version: 3.9.1
diff --git a/debian/changelog b/debian/changelog
index 7ef942e..481e971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ xprint (2:1.6.0-5) unstable; urgency=low
since xprint will soon be removed anyway. Add comment on the
matter to debian/README.source. Closes: #604967.
* Fix Danish debconf translation (thanks Joe Dalton). Closes: #608445.
+ * Standards-Version: 3.9.1
- -- Drew Parsons <dparsons@debian.org> Mon, 21 Mar 2011 20:09:34 +1100
+ -- Drew Parsons <dparsons@debian.org> Mon, 21 Mar 2011 20:13:19 +1100
xprint (2:1.6.0-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index bbe4558..98664d5 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Build-Depends:
libxv-dev,
libxinerama-dev,
libssl-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xprint
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xprint.git
commit a564d17a443ee6cbf54f56db8f2b37e1fc5bea8d
Author: Drew Parsons <Drew.Parsons@anu.edu.au>
Date: Mon Mar 21 20:11:00 2011 +1100
Fix Danish debconf translation. Closes: #608445.
thanks Joe Dalton
diff --git a/debian/changelog b/debian/changelog
index 236d087..7ef942e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ xprint (2:1.6.0-5) unstable; urgency=low
unactivated (commented out), retaining the build against hal,
since xprint will soon be removed anyway. Add comment on the
matter to debian/README.source. Closes: #604967.
+ * Fix Danish debconf translation (thanks Joe Dalton). Closes: #608445.
- -- Drew Parsons <dparsons@debian.org> Mon, 21 Mar 2011 20:04:31 +1100
+ -- Drew Parsons <dparsons@debian.org> Mon, 21 Mar 2011 20:09:34 +1100
xprint (2:1.6.0-4) unstable; urgency=low
diff --git a/debian/po/da.po b/debian/po/da.po
index fd6b30d..4a9689b 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1,50 +1,40 @@
-# Danish translation of the Debconf po-template for xprint-xprintorg.
+# Danish translation for xprint.
+# Copyright (C) 2010 xprint og nedenstående oversættere.
+# This file is distributed under the same license as the xprint package.
# Morten Bo Johansen <mojo@mbjnet.dk>, 2004, 2005.
+# Joe Hansen (joedalton2@yahoo.dk), 2010.
+#
msgid ""
msgstr ""
-"Project-Id-Version: xprint-xprintorg_0.1.0.alpha1-8_da.po\n"
+"Project-Id-Version: xprint\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
"POT-Creation-Date: 2007-09-18 20:35+0200\n"
-"PO-Revision-Date: 2005-03-17 01:15+0100\n"
-"Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
+"PO-Revision-Date: 2010-12-30 19:25+0200\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: string
#. Description
#: ../xprint-common.templates:2001
-#, fuzzy
-#| msgid "Default printer resolution"
msgid "Default printer resolution:"
-msgstr "Printerens standardopl�g"
+msgstr "Printerens standardopløsning:"
#. Type: string
#. Description
#: ../xprint-common.templates:2001
-#, fuzzy
-#| msgid ""
-#| "By default Xprint assumes a printer resolution of 600dpi. This should be "
-#| "fine for the majority of printers today."
msgid ""
"By default, Xprint assumes a printer resolution of 600 dpi. This should be "
"well suited for the majority of printers."
msgstr ""
-"Xprint bruger en opl�g p�00dpi som standard. Dette skulle v� "
-"passende for de fleste nyere printere."
+"Xprint bruger en opløsning på 600 dpi som standard. Dette skulle være "
+"passende for de fleste printere."
#. Type: string
#. Description
#: ../xprint-common.templates:2001
-#, fuzzy
-#| msgid ""
-#| "On certain 1200dpi printers, however, the image might appear squashed in "
-#| "the corner of the page, or it might be blown up too large on 300dpi "
-#| "printers. If you are experiencing these kinds of printing problems, you "
-#| "may want to set the default printer resolution to a more appropriate "
-#| "value. See /usr/share/doc/xprint-common/README.printing-problems.gz for "
-#| "more details."
msgid ""
"On certain 1200 dpi printers, however, the image might appear squashed in "
"the corner of the page, or it might be blown up too large on 300 dpi "
@@ -52,9 +42,10 @@ msgid ""
"set the default printer resolution to a more appropriate value. See /usr/"
"share/doc/xprint-common/README.printing-problems.gz for more details."
msgstr ""
-"P�isse printere med en opl�g p�200dpi kan billedet forekomme "
-"sammenpresset i hj�ne, eller det kan virke overforst� p�rintere "
-"med en opl�g p�00dpi. Hvis du oplever s�nne udskrivningsproblemer, "
-"vil det v� en god ide at s�e printerens opl�g til en mere passende "
-"v�i. Se /usr/share/doc/xprint-common/README.printing-problems.gz for flere "
-"detaljer."
+"På visse printere med en opløsning på 1200 dpi kan billedet forekomme "
+"sammenpresset i hjørnerne, eller det kan virke overforstørret på printere "
+"med en opløsning på 300 dpi. Hvis du oplever sådanne udskrivningsproblemer, "
+"vil det være en god ide at sætte printerens standardopløsning til en mere "
+"passende værdi. Se /usr/share/doc/xprint-common/README.printing-problems.gz "
+"for yderligere detaljer."
+
commit 83e677d8ead465426462a15ffc8284296fc0ed88
Author: Drew Parsons <Drew.Parsons@anu.edu.au>
Date: Mon Mar 21 20:05:21 2011 +1100
build or not against hal. Closes: #604967.
* Add patch xprint-disable-hal.patch to debian/patches and list it in
debian/patches/series. This stops xprint from building against hal
(since hal is in the process of being deprecated). But leave
unactivated (commented out), retaining the build against hal,
since xprint will soon be removed anyway. Add comment on the
matter to debian/README.source. Closes: #604967.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..104c172 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,3 +1,24 @@
+Comments from final version of xprint (2:1.6.0-5): Building against HAL
+------------------------------------------------
+
+In early 2011 (version 2:1.6.0-5) following the release of Debian squeeze,
+xprint was deprecated and removed from the Debian archive.
+
+At the same time, the HAL infrastructure was also in the process of being
+deprecated and removed from Debian. Debian bug #604967 was filed to
+instruct xprint to stop building against hal. Since xprint was in any case
+being removed, we decided to take the conservative approach and not apply the
+patch to stop building xprint against hal.
+
+For the convenience of future digital archeologists, the patch
+xprint-disable-hal.patch has been placed in debian/patches and added,
+commented out, to debian/patches/series.
+
+If you need to build xprint without hal support, simply remove the comment
+against xprint-disable-hal.patch in debian/patches/series in order to
+activate the patch.
+
+
------------------------------------------------------
Quick Guide To Patching This Package For The Impatient
------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 75ffdd0..236d087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
xprint (2:1.6.0-5) unstable; urgency=low
+ * The "Rest In Piece" release: xprint is now officially deprecated.
* Update Build-depends: libselinux1-dev, libaudit-dev to architecture
[linux-any] rather than listing individual architectures.
Enables port to sparc64. Closes: #596602.
-
- -- Drew Parsons <dparsons@debian.org> Mon, 21 Mar 2011 19:46:40 +1100
+ * Add patch xprint-disable-hal.patch to debian/patches and list it
+ in debian/patches/series. This stops xprint from building against
+ hal (since hal is in the process of being deprecated). But leave
+ unactivated (commented out), retaining the build against hal,
+ since xprint will soon be removed anyway. Add comment on the
+ matter to debian/README.source. Closes: #604967.
+
+ -- Drew Parsons <dparsons@debian.org> Mon, 21 Mar 2011 20:04:31 +1100
xprint (2:1.6.0-4) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 2965a0c..7717dcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,7 @@
92_xprint-security-holes-fix.patch
93_spooltodir_check_file_exists
94_Xext_proto
+#
+# uncomment xprint-disable-hal.patch in order to
+# stop building against hal (see Debian Bug#604967)
+#xprint-disable-hal.patch
\ No newline at end of file
diff --git a/debian/patches/xprint-disable-hal.patch b/debian/patches/xprint-disable-hal.patch
new file mode 100644
index 0000000..9dcdba4
--- /dev/null
+++ b/debian/patches/xprint-disable-hal.patch
@@ -0,0 +1,37 @@
+diff --git a/debian/control b/debian/control
+index 8cdbc2a..24a67b5 100644
+--- a/debian/control
++++ b/debian/control
+@@ -48,8 +48,6 @@ Build-Depends:
+ libpixman-1-dev (>= 0.13.2),
+ libpciaccess-dev,
+ libgcrypt-dev,
+- libdbus-1-dev [!hurd-i386],
+- libhal-dev [!hurd-i386],
+ libselinux1-dev (>= 2.0.80) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ libaudit-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ x11proto-xf86dri-dev,
+diff --git a/debian/rules b/debian/rules
+index 9ec70b9..7745d57 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -42,10 +42,8 @@ endif
+
+ ifeq ($(DEB_HOST_ARCH), hurd-i386)
+ dri = --disable-dri --disable-dri2
+- config_hal = --disable-config-hal
+ else
+ dri = --enable-dri --enable-dri2
+- config_hal = --enable-config-hal
+ endif
+
+ INSTALL=/usr/bin/install
+@@ -97,7 +95,7 @@ confflags += \
+ --disable-xf86bigfont \
+ --enable-dpms \
+ --disable-config-dbus \
+- $(config_hal) \
++ --disable-config-hal \
+ --enable-xfree86-utils \
+ --disable-xorg \
+ --disable-dmx \
commit a0739006237dd07206e7fa6ab56787376a4c8699
Author: Drew Parsons <Drew.Parsons@anu.edu.au>
Date: Mon Mar 21 19:47:34 2011 +1100
enable sparc64 build (bug #596602)
Update Build-depends: libselinux1-dev, libaudit-dev to architecture
[linux-any] rather than listing individual architectures.
Enables port to sparc64. Closes: #596602.
diff --git a/debian/changelog b/debian/changelog
index c3a50a6..75ffdd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xprint (2:1.6.0-5) unstable; urgency=low
+
+ * Update Build-depends: libselinux1-dev, libaudit-dev to architecture
+ [linux-any] rather than listing individual architectures.
+ Enables port to sparc64. Closes: #596602.
+
+ -- Drew Parsons <dparsons@debian.org> Mon, 21 Mar 2011 19:46:40 +1100
+
xprint (2:1.6.0-4) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 7118d19..bbe4558 100644
--- a/debian/control
+++ b/debian/control
@@ -50,8 +50,8 @@ Build-Depends:
libgcrypt-dev,
libdbus-1-dev [!hurd-i386],
libhal-dev [!hurd-i386],
- libselinux1-dev (>= 2.0.80) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
- libaudit-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ libselinux1-dev (>= 2.0.80) [linux-any],
+ libaudit-dev [linux-any],
x11proto-xf86dri-dev,
libdrm-dev (>= 2.4.3) [!hurd-i386],
x11proto-gl-dev (>= 1.4.9),
Reply to: