[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Pre-approval request for t-p-u NMU upload of pleiades



Quoting Christian PERRIER (bubulle@debian.org):
> Quoting Christian PERRIER (bubulle@debian.org):
> > Quoting Hideki Yamane (henrich@debian.or.jp):
> > 
> > > > This mail has to goals:
> > > > - get a release team approval about this possible upload to t-p-u
> > > > - give Yamane-san a last chance to react to all this..:-)
> > > 
> > >  Then, should I make pleiades package for t-p-u?
> > >  (of course, send debdiff to list before uploading...)
> > 
> > 
> > I think so, yes. I posted this pre-approval mail to get the Release
> > Team's input but doing so without a bug report makes it more
> > complicated for them.
> > 
> > I propose you upload to t-p-u then ask for an unblock.
> > 
> 
> Ping?

Well, as I really would like to get rid of this issue, please find the
diff for the NMU I prepared (and which I plan to upload during the
week-end unless Hideki Yamane prefers doing a maintainer upload
himself).

Please note that I followed David Prévot's advice about using the
numbering scheme proposed in #685646 (there seem to be a kind of
consensus there, if I'm not mistaken).


diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/changelog pleiades-1.3.4~I20120531-dfsg/debian/changelog
--- pleiades-1.3.4~I20120531-dfsg/debian/changelog	2012-06-05 06:08:01.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/changelog	2012-08-24 20:13:53.000000000 +0200
@@ -1,3 +1,14 @@
+pleiades (1.3.4~I20120531-dfsg-2+deb7u1) testing-proposed-updates; urgency=low
+
+  * Non-maintainer upload to t-p-u to fix the RC bug in wheezy.
+  * Use version numbering proposed in #685646
+  * Temporarily disable debconf usage, its behaviour violates the
+    policy. An alternative solution will be worked on
+    after Wheezy release (Closes: #679846).
+  * Also drop all debconf templates and their translations.
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 18 Aug 2012 18:25:06 +0200
+
 pleiades (1.3.4~I20120531-dfsg-2) unstable; urgency=low
 
   * debian/control
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/control pleiades-1.3.4~I20120531-dfsg/debian/control
--- pleiades-1.3.4~I20120531-dfsg/debian/control	2012-06-04 11:13:40.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/control	2012-08-18 20:25:07.000000000 +0200
@@ -9,7 +9,7 @@
 
 Package: pleiades
 Architecture: all
-Pre-Depends: debconf, dpkg (>= 1.15.6~)
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: eclipse, libcommons-lang-java, libcommons-io-java, libjavassist-java,
  ${misc:Depends}
 Description: Japanese Language package for Eclipse using Dynamic AOP, Pleiades
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/pleiades.config pleiades-1.3.4~I20120531-dfsg/debian/pleiades.config
--- pleiades-1.3.4~I20120531-dfsg/debian/pleiades.config	2012-06-04 01:51:34.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/pleiades.config	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-INI="/etc/eclipse.ini"
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-if [ -f $INI ]; then
-  db_set pleiades/eclipse true
-fi
-
-db_input medium pleiades/eclipse || true
-db_go
-
-exit 0
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/pleiades.postinst pleiades-1.3.4~I20120531-dfsg/debian/pleiades.postinst
--- pleiades-1.3.4~I20120531-dfsg/debian/pleiades.postinst	2012-06-04 03:44:22.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/pleiades.postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-ENABLE_PLEIADES="-javaagent:/usr/lib/eclipse/plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar"
-ECLIPSE_INI="/etc/eclipse.ini"
-# somehow without export its results change time by time...
-export SETTINGS="`grep -e $ENABLE_PLEIADES $ECLIPSE_INI`"
-
-case "$1" in
-    install|configure)
-	    . /usr/share/debconf/confmodule
-	    db_version 2.0
-	    db_get pleiades/eclipse
-	    db_stop
-
-
-	    if [ -f $ECLIPSE_INI ]; then
-		    if [ $RET = true ] && [ -z "$SETTINGS" ]; then
-			    echo $ENABLE_PLEIADES >> $ECLIPSE_INI
-		    elif [ $RET = false ] && [ ! -z "$SETTINGS" ]; then
-			    sed -e s%\^$ENABLE_PLEIADES%%g -e /^$/d -i $ECLIPSE_INI
-		    fi
-	    fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-unset SETTINGS
-exit 0
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/pleiades.postrm pleiades-1.3.4~I20120531-dfsg/debian/pleiades.postrm
--- pleiades-1.3.4~I20120531-dfsg/debian/pleiades.postrm	2012-06-04 03:04:50.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/pleiades.postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ENABLE_PLEIADES="-javaagent:/usr/lib/eclipse/plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar"
-ECLIPSE_INI="/etc/eclipse.ini"
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    if [ -f $ECLIPSE_INI ];  then
-	    sed -e s%\^$ENABLE_PLEIADES%% -i $ECLIPSE_INI
-    fi
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/pleiades.templates pleiades-1.3.4~I20120531-dfsg/debian/pleiades.templates
--- pleiades-1.3.4~I20120531-dfsg/debian/pleiades.templates	2012-06-04 01:34:13.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/pleiades.templates	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-Template: pleiades/eclipse
-Type: boolean
-Default: false
-_Description: Enable pleiades for your Eclipse configuration?
- If you want to use pleiades, you should enable it in /etc/eclpse.ini.
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/po/ja.po pleiades-1.3.4~I20120531-dfsg/debian/po/ja.po
--- pleiades-1.3.4~I20120531-dfsg/debian/po/ja.po	2012-06-04 03:26:22.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/po/ja.po	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pleiades\n"
-"Report-Msgid-Bugs-To: pleiades@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-04 06:18+0900\n"
-"PO-Revision-Date: 2012-06-04 06:18+0900\n"
-"Last-Translator: Hideki Yamane <henrich@debian.org>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../pleiades.templates:1001
-msgid "Enable pleiades for your Eclipse configuration?"
-msgstr "Eclipse の設定について pleiades を有効にしますか?"
-
-#. Type: boolean
-#. Description
-#: ../pleiades.templates:1001
-msgid "If you want to use pleiades, you should enable it in /etc/eclpse.ini."
-msgstr "pleiades を使いたい場合には、/etc/eclipse.ini で有効にする必要があります。"
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/po/POTFILES.in pleiades-1.3.4~I20120531-dfsg/debian/po/POTFILES.in
--- pleiades-1.3.4~I20120531-dfsg/debian/po/POTFILES.in	2012-06-03 22:34:52.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/po/POTFILES.in	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] pleiades.templates
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/po/templates.pot pleiades-1.3.4~I20120531-dfsg/debian/po/templates.pot
--- pleiades-1.3.4~I20120531-dfsg/debian/po/templates.pot	2012-06-03 23:18:00.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/po/templates.pot	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: pleiades\n"
-"Report-Msgid-Bugs-To: pleiades@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-04 06:18+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../pleiades.templates:1001
-msgid "Enable pleiades for your Eclipse configuration?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../pleiades.templates:1001
-msgid "If you want to use pleiades, you should enable it in /etc/eclpse.ini."
-msgstr ""
diff -Nru pleiades-1.3.4~I20120531-dfsg/debian/rules pleiades-1.3.4~I20120531-dfsg/debian/rules
--- pleiades-1.3.4~I20120531-dfsg/debian/rules	2012-06-05 06:03:32.000000000 +0200
+++ pleiades-1.3.4~I20120531-dfsg/debian/rules	2012-08-18 18:33:39.000000000 +0200
@@ -20,10 +20,6 @@
 override_dh_installchangelogs:
 	dh_installchangelogs $(CURDIR)/readme/readme_pleiades_changes.txt
 
-override_dh_clean:
-	debconf-updatepo
-	dh_clean
-
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -Sextreme -z9
 

Attachment: signature.asc
Description: Digital signature


Reply to: