Package: verbiste
Severity: minor

Hi,

Per discussion in #ubuntu-devel I'm attaching a debdiff between Sid's
verbiste (0.1.11-1) and Dapper's (0.1.11-1ubuntu2).

Thanks,
-- 
Daniel T. Chen            [EMAIL PROTECTED]
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
diff -u verbiste-0.1.11/debian/changelog verbiste-0.1.11/debian/changelog
--- verbiste-0.1.11/debian/changelog
+++ verbiste-0.1.11/debian/changelog
@@ -1,3 +1,18 @@
+verbiste (0.1.11-1ubuntu2) dapper; urgency=low
+
+  * libstdc++ allocator transition: Rename libverbiste0 to
+    libverbiste0c2a, and add Replaces/Conflicts.
+
+ -- Daniel T Chen <[EMAIL PROTECTED]>  Sat,  3 Dec 2005 22:58:04 -0800
+
+verbiste (0.1.11-1ubuntu1) breezy; urgency=low
+
+  * locale.alias.patch:
+    + don't install /usr/share/locale/locale.alias. This is already provided
+    by the locales package.
+
+ -- Sebastian Dröge <[EMAIL PROTECTED]>  Wed,  5 Oct 2005 14:39:10 +0200
+
 verbiste (0.1.11-1) unstable; urgency=low
 
   * New upstream version (Closes: #316008):
diff -u verbiste-0.1.11/debian/control verbiste-0.1.11/debian/control
--- verbiste-0.1.11/debian/control
+++ verbiste-0.1.11/debian/control
@@ -7,7 +7,7 @@
 
 Package: verbiste
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libverbiste0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libverbiste0c2a (= 
${Source-Version})
 Description: a French conjugation system
  Verbiste is a program that gives the complete conjugation for French verbs.
  The knowledge base contains over 6800 verbs.
@@ -25,9 +25,11 @@
  field in the GNOME Panel where the user can enter a conjugated verb and 
obtain 
  its complete conjugation.
 
-Package: libverbiste0
+Package: libverbiste0c2a
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libverbiste0
+Conflicts: libverbiste0
 Description: a French conjugation system
  Verbiste is a program that gives the complete conjugation for French verbs.
  The knowledge base contains over 6800 verbs.
@@ -36,7 +38,7 @@
 
 Package: libverbiste0-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libverbiste0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libverbiste0c2a (= 
${Source-Version})
 Description: a French conjugation system
  Verbiste is a program that gives the complete conjugation for French verbs.
  The knowledge base contains over 6800 verbs.
reverted:
--- verbiste-0.1.11/debian/libverbiste0.install
+++ verbiste-0.1.11.orig/debian/libverbiste0.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libverbiste*.so.*
only in patch2:
unchanged:
--- verbiste-0.1.11.orig/debian/patches/locale.alias.patch
+++ verbiste-0.1.11/debian/patches/locale.alias.patch
@@ -0,0 +1,44 @@
+--- verbiste-0.1.11/intl/Makefile.in.old       2005-10-05 14:29:52.631035368 
+0200
++++ verbiste-0.1.11/intl/Makefile.in   2005-10-05 14:33:01.796277880 +0200
+@@ -72,7 +72,7 @@
+ plural.$lo plural-exp.$lo localcharset.$lo localename.$lo osdep.$lo
+ GETTOBJS = intl-compat.$lo
+ DISTFILES.common = Makefile.in \
+-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
++config.charset ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+ DISTFILES.generated = plural.c
+ DISTFILES.normal = VERSION
+ DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc
+@@ -170,14 +170,6 @@
+           fi; \
+         fi; \
+         $(mkinstalldirs) $(DESTDIR)$(localedir); \
+-        test -f $(DESTDIR)$(localedir)/locale.alias \
+-          && orig=$(DESTDIR)$(localedir)/locale.alias \
+-          || orig=$(srcdir)/locale.alias; \
+-        temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+-        dest=$(DESTDIR)$(localedir)/locale.alias; \
+-        sed -f ref-add.sed $$orig > $$temp; \
+-        $(INSTALL_DATA) $$temp $$dest; \
+-        rm -f $$temp; \
+       else \
+         : ; \
+       fi
+@@ -251,17 +243,6 @@
+           fi; \
+           rm -f $$temp; \
+         fi; \
+-        if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+-          temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+-          dest=$(DESTDIR)$(localedir)/locale.alias; \
+-          sed -f ref-del.sed $$dest > $$temp; \
+-          if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+-            rm -f $$dest; \
+-          else \
+-            $(INSTALL_DATA) $$temp $$dest; \
+-          fi; \
+-          rm -f $$temp; \
+-        fi; \
+       else \
+         : ; \
+       fi
only in patch2:
unchanged:
--- verbiste-0.1.11.orig/debian/libverbiste0c2a.install
+++ verbiste-0.1.11/debian/libverbiste0c2a.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libverbiste*.so.*

Attachment: pgpvojzwbopqx.pgp
Description: PGP signature

Reply via email to