tag 441019 patch pending
tag 441706 patch pending
thanks

Hi Miry, hi Alexander,

please find attached the patch for my NMU, fixing the following RC bugs:
#441019, #441706; uploaded to DELAYED/5.

Cheers,

-- 
Cyril
diff -u gnash-0.8.1~rc.070818/debian/changelog gnash-0.8.1~rc.070818/debian/changelog
--- gnash-0.8.1~rc.070818/debian/changelog
+++ gnash-0.8.1~rc.070818/debian/changelog
@@ -1,3 +1,19 @@
+gnash (0.8.1~rc.070818-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Deleted the “*.gmo” from the CLEANFILES in po/Makefile.am to fix package
+    content change on double-build (Closes: #441706). Added the following
+    files into debian/patches to do so:
+     - do-not-delete-gmo-files: one-liner to avoid the deletion.
+     - series: restored series file since there was none left. 
+    (Note: po/Makefile.in not patched since it is removed by the clean rules,
+    the patch wouldn't apply if it were modified.)
+  * Updated debian/copyright from GPLv2 to GPLv3 (copyright blurb), and added
+    a versioned dependency on base-files to ensure that the GPL symlink points
+    to the appropriate version, as reported by Robert Millan (Closes: #441019).
+    
+ -- Cyril Brulebois <[EMAIL PROTECTED]>  Sun, 30 Sep 2007 01:21:38 +0200
+
 gnash (0.8.1~rc.070818-1) unstable; urgency=low
 
   [ Miriam Ruiz ]
diff -u gnash-0.8.1~rc.070818/debian/control gnash-0.8.1~rc.070818/debian/control
--- gnash-0.8.1~rc.070818/debian/control
+++ gnash-0.8.1~rc.070818/debian/control
@@ -9,7 +9,7 @@
  libpango1.0-dev | pango-devel, libgtkglext1-dev, libmad0-dev, libdirectfb-dev,
  libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev,
  libcaca-dev, libboost-date-time-dev, libavcodec-dev, libavformat-dev, libming-dev,
- libming-util, mtasc, libgstreamer-plugins-base0.10-dev
+ libming-util, mtasc, libgstreamer-plugins-base0.10-dev, base-files (>= 4.0.1)
 Standards-Version: 3.7.2
 Section: utils
 Xs-Vcs-Bzr: http://bzr.debian.org/bzr/pkg-flash/debian.sid
diff -u gnash-0.8.1~rc.070818/debian/copyright gnash-0.8.1~rc.070818/debian/copyright
--- gnash-0.8.1~rc.070818/debian/copyright
+++ gnash-0.8.1~rc.070818/debian/copyright
@@ -20,7 +20,7 @@
 
    This package 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
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This package is distributed in the hope that it will be useful,
@@ -29,8 +29,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
only in patch2:
unchanged:
--- gnash-0.8.1~rc.070818.orig/debian/patches/do-not-delete-gmo-files
+++ gnash-0.8.1~rc.070818/debian/patches/do-not-delete-gmo-files
@@ -0,0 +1,12 @@
+Index: gnash-0.8.1~rc.070818/po/Makefile.am
+===================================================================
+--- gnash-0.8.1~rc.070818.orig/po/Makefile.am	2007-09-30 02:29:01.000000000 +0200
++++ gnash-0.8.1~rc.070818/po/Makefile.am	2007-09-30 02:29:05.000000000 +0200
+@@ -21,7 +21,6 @@
+ 
+ 
+ CLEANFILES = \
+-	*.gmo \
+ 	gnash.pot \
+ 	POTFILES \
+ 	update-po
only in patch2:
unchanged:
--- gnash-0.8.1~rc.070818.orig/debian/patches/series
+++ gnash-0.8.1~rc.070818/debian/patches/series
@@ -0,0 +1 @@
+do-not-delete-gmo-files

Attachment: pgpVx4ZVJQ5hm.pgp
Description: PGP signature

Reply via email to